problem_id
stringlengths 18
22
| source
stringclasses 1
value | task_type
stringclasses 1
value | in_source_id
stringlengths 13
58
| prompt
stringlengths 1.71k
18.9k
| golden_diff
stringlengths 145
5.13k
| verification_info
stringlengths 465
23.6k
| num_tokens_prompt
int64 556
4.1k
| num_tokens_diff
int64 47
1.02k
|
|---|---|---|---|---|---|---|---|---|
gh_patches_debug_15434
|
rasdani/github-patches
|
git_diff
|
meltano__meltano-6710
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Run Pytest tests in parallel
https://meltano.slack.com/archives/CKHP6G5V4/p1653508630941889
Looks like pytest doesn't take 45 minutes, not sure why I though it was taking that long before? Maybe on gitlab CI updated the title to reflect that it takes ~5-10 minutes to run pytest today.
1. Be sure https://github.com/meltano/meltano/pull/6155/files#diff-65c008e1065903299dfa0da25e1f18d0f87f387867ccbbf2b0888eb138bdb255L242 is implemented (This uses a seperate folder for each Test in your temp directory instead of the same folder over and over again)
1. `poetry add -D pytest-xdist==1.*`
1. `poetry run pytest -n 20`
1. Watch tests run extremely quickly
There's still a large number of failures here as some tests depend on the other I believe? Not exactly sure what causes the failures, but it's clear they weren't all designed with parallel testing in mind. The gain is big enough it may be worth the time to figure out what causes the failures.
</issue>
<code>
[start of noxfile.py]
1 """Nox configuration."""
2
3 from __future__ import annotations
4
5 import os
6 import sys
7 from pathlib import Path
8 from random import randint
9 from textwrap import dedent
10
11 try:
12 from nox_poetry import Session
13 from nox_poetry import session as nox_session
14 except ImportError:
15 message = f"""\
16 Nox failed to import the 'nox-poetry' package.
17 Please install it using the following command:
18 {sys.executable} -m pip install nox-poetry"""
19 raise SystemExit(dedent(message)) from None
20
21
22 package = "meltano"
23 python_versions = ["3.10", "3.9", "3.8", "3.7"]
24 main_python_version = "3.9"
25 locations = "src", "tests", "noxfile.py"
26
27
28 @nox_session(python=python_versions)
29 def tests(session: Session) -> None:
30 """Execute pytest tests and compute coverage.
31
32 Args:
33 session: Nox session.
34 """
35 backend_db = os.environ.get("PYTEST_BACKEND", "sqlite")
36
37 if backend_db == "mssql":
38 session.install(".[mssql]")
39 else:
40 session.install(".")
41
42 session.install(
43 "coverage[toml]",
44 "freezegun",
45 "mock",
46 "pytest",
47 "pytest-asyncio",
48 "pytest-docker",
49 "pytest-order",
50 "pytest-randomly",
51 "requests-mock",
52 )
53
54 try:
55 session.run(
56 "coverage",
57 "run",
58 "--parallel",
59 "-m",
60 "pytest",
61 f"--randomly-seed={randint(0, 2**32-1)}", # noqa: S311, WPS432
62 *session.posargs,
63 env={"NOX_CURRENT_SESSION": "tests"},
64 )
65 finally:
66 if session.interactive:
67 session.notify("coverage", posargs=[])
68
69
70 @nox_session(python=main_python_version)
71 def coverage(session: Session) -> None:
72 """Upload coverage data.
73
74 Args:
75 session: Nox session.
76 """
77 args = session.posargs or ["report"]
78
79 session.install("coverage[toml]")
80
81 if not session.posargs and any(Path().glob(".coverage.*")):
82 session.run("coverage", "combine")
83
84 session.run("coverage", *args)
85
86
87 @nox_session(python=main_python_version)
88 def mypy(session: Session) -> None:
89 """Run mypy type checking.
90
91 Args:
92 session: Nox session.
93 """
94 args = session.posargs or ["src/meltano"]
95
96 session.install(".")
97 session.install(
98 "mypy",
99 "sqlalchemy2-stubs",
100 "types-requests",
101 )
102 session.run("mypy", *args)
103
[end of noxfile.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/noxfile.py b/noxfile.py
--- a/noxfile.py
+++ b/noxfile.py
@@ -40,23 +40,20 @@
session.install(".")
session.install(
- "coverage[toml]",
"freezegun",
"mock",
"pytest",
"pytest-asyncio",
+ "pytest-cov",
"pytest-docker",
"pytest-order",
"pytest-randomly",
+ "pytest-xdist",
"requests-mock",
)
try:
session.run(
- "coverage",
- "run",
- "--parallel",
- "-m",
"pytest",
f"--randomly-seed={randint(0, 2**32-1)}", # noqa: S311, WPS432
*session.posargs,
|
{"golden_diff": "diff --git a/noxfile.py b/noxfile.py\n--- a/noxfile.py\n+++ b/noxfile.py\n@@ -40,23 +40,20 @@\n session.install(\".\")\n \n session.install(\n- \"coverage[toml]\",\n \"freezegun\",\n \"mock\",\n \"pytest\",\n \"pytest-asyncio\",\n+ \"pytest-cov\",\n \"pytest-docker\",\n \"pytest-order\",\n \"pytest-randomly\",\n+ \"pytest-xdist\",\n \"requests-mock\",\n )\n \n try:\n session.run(\n- \"coverage\",\n- \"run\",\n- \"--parallel\",\n- \"-m\",\n \"pytest\",\n f\"--randomly-seed={randint(0, 2**32-1)}\", # noqa: S311, WPS432\n *session.posargs,\n", "issue": "Run Pytest tests in parallel\nhttps://meltano.slack.com/archives/CKHP6G5V4/p1653508630941889\r\n\r\nLooks like pytest doesn't take 45 minutes, not sure why I though it was taking that long before? Maybe on gitlab CI updated the title to reflect that it takes ~5-10 minutes to run pytest today. \r\n\r\n1. Be sure https://github.com/meltano/meltano/pull/6155/files#diff-65c008e1065903299dfa0da25e1f18d0f87f387867ccbbf2b0888eb138bdb255L242 is implemented (This uses a seperate folder for each Test in your temp directory instead of the same folder over and over again)\r\n1. `poetry add -D pytest-xdist==1.*`\r\n1. `poetry run pytest -n 20` \r\n1. Watch tests run extremely quickly\r\n\r\nThere's still a large number of failures here as some tests depend on the other I believe? Not exactly sure what causes the failures, but it's clear they weren't all designed with parallel testing in mind. The gain is big enough it may be worth the time to figure out what causes the failures. \r\n\r\n\n", "before_files": [{"content": "\"\"\"Nox configuration.\"\"\"\n\nfrom __future__ import annotations\n\nimport os\nimport sys\nfrom pathlib import Path\nfrom random import randint\nfrom textwrap import dedent\n\ntry:\n from nox_poetry import Session\n from nox_poetry import session as nox_session\nexcept ImportError:\n message = f\"\"\"\\\n Nox failed to import the 'nox-poetry' package.\n Please install it using the following command:\n {sys.executable} -m pip install nox-poetry\"\"\"\n raise SystemExit(dedent(message)) from None\n\n\npackage = \"meltano\"\npython_versions = [\"3.10\", \"3.9\", \"3.8\", \"3.7\"]\nmain_python_version = \"3.9\"\nlocations = \"src\", \"tests\", \"noxfile.py\"\n\n\n@nox_session(python=python_versions)\ndef tests(session: Session) -> None:\n \"\"\"Execute pytest tests and compute coverage.\n\n Args:\n session: Nox session.\n \"\"\"\n backend_db = os.environ.get(\"PYTEST_BACKEND\", \"sqlite\")\n\n if backend_db == \"mssql\":\n session.install(\".[mssql]\")\n else:\n session.install(\".\")\n\n session.install(\n \"coverage[toml]\",\n \"freezegun\",\n \"mock\",\n \"pytest\",\n \"pytest-asyncio\",\n \"pytest-docker\",\n \"pytest-order\",\n \"pytest-randomly\",\n \"requests-mock\",\n )\n\n try:\n session.run(\n \"coverage\",\n \"run\",\n \"--parallel\",\n \"-m\",\n \"pytest\",\n f\"--randomly-seed={randint(0, 2**32-1)}\", # noqa: S311, WPS432\n *session.posargs,\n env={\"NOX_CURRENT_SESSION\": \"tests\"},\n )\n finally:\n if session.interactive:\n session.notify(\"coverage\", posargs=[])\n\n\n@nox_session(python=main_python_version)\ndef coverage(session: Session) -> None:\n \"\"\"Upload coverage data.\n\n Args:\n session: Nox session.\n \"\"\"\n args = session.posargs or [\"report\"]\n\n session.install(\"coverage[toml]\")\n\n if not session.posargs and any(Path().glob(\".coverage.*\")):\n session.run(\"coverage\", \"combine\")\n\n session.run(\"coverage\", *args)\n\n\n@nox_session(python=main_python_version)\ndef mypy(session: Session) -> None:\n \"\"\"Run mypy type checking.\n\n Args:\n session: Nox session.\n \"\"\"\n args = session.posargs or [\"src/meltano\"]\n\n session.install(\".\")\n session.install(\n \"mypy\",\n \"sqlalchemy2-stubs\",\n \"types-requests\",\n )\n session.run(\"mypy\", *args)\n", "path": "noxfile.py"}]}
| 1,651 | 196 |
gh_patches_debug_1777
|
rasdani/github-patches
|
git_diff
|
internetarchive__openlibrary-8318
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Rename merge queue files for consistency
### Short Summary:
Refactor merge request table such that there is more parity between the JS and HTML files.
### Background:
Names of files related to the librarian merge queue have become inconsistent over time:
#### Current file names
| Component | JS filename | HTML filename | LESS filename |
|--------|--------|--------|--------|
| Table header | merge-request-table/LibrarianQueue/TableHeader.js | `None` | components/merge-request-table.less |
| Table row | merge-request-table/LibrarianQueue/TableRow.js | `None`| components/merge-request-table.less |
| Base component (the whole table) | merge-request-table/LibrarianQueue.js | merge_queue/merge_queue.html | components/merge-request-table.less |
I figure that the naming conventions for the JS and LESS files are in alignment, and no changes are required. Our HTML template tile,,however, has an entirely different name, and would be difficult to find by a new developer (at least not without the help of somebody who is familiar with this code). It's also kind of odd that there is a JS file for each component, but only one template file.
### Main Requirements:
1. Create two new template files: one for the table header, and one for a single table row. Move existing header and table row HTML into their respective, newly created files.
2. Ensure that the following filepaths are used:
#### Updated file names
| Component | JS filename | HTML filename |
|--------|--------|--------|
| Table header | merge-request-table/MergeRequestTable/TableHeader.js | merge_request_table/table_header.html |
| Table row | merge-request-table/MergeRequestTable/TableRow.js | merge_request_table/table_row.html |
| Base component (the whole table) | merge-request-table/MergeRequestTable.js | merge_request_table/merge_request_table.html |
### Checklist:
- [ ] JS filepaths have been updated as per the above "Updated file names" table.
- [ ] All references to these files have been updated.
- [ ] New templates have been created
- [ ] table_header.html
- [ ] table_row.html
- [ ] Existing merge_queue/merge_queue.html template has been updated:
- [ ] Change filepath to merge_request_table/merge_request_table.html
- [ ] Replace header and table row code with references to the new templates
- [ ] Update all references to the merge table template file
</issue>
<code>
[start of openlibrary/plugins/upstream/edits.py]
1 """Librarian Edits
2 """
3
4 import json
5 import web
6
7 from openlibrary import accounts
8 from openlibrary.core.edits import CommunityEditsQueue, get_status_for_view
9 from infogami.utils import delegate
10 from infogami.utils.view import render_template
11
12
13 def response(status='ok', **kwargs):
14 return {'status': status, **kwargs}
15
16
17 def process_merge_request(rtype, data):
18 user = accounts.get_current_user()
19 username = user['key'].split('/')[-1]
20 # Request types can be: create-request, update-request
21 if rtype == 'create-request':
22 resp = community_edits_queue.create_request(username, **data)
23 elif rtype == 'update-request':
24 resp = community_edits_queue.update_request(username, **data)
25 else:
26 resp = response(status='error', error='Unknown request type')
27 return resp
28
29
30 class community_edits_queue(delegate.page):
31 path = '/merges'
32
33 def GET(self):
34 i = web.input(
35 page=1,
36 limit=25,
37 mode="open",
38 submitter=None,
39 reviewer=None,
40 order='desc',
41 status=None,
42 )
43 merge_requests = CommunityEditsQueue.get_requests(
44 page=int(i.page),
45 limit=int(i.limit),
46 mode=i.mode,
47 submitter=i.submitter,
48 reviewer=i.reviewer,
49 order=f'updated {i.order}',
50 status=i.status,
51 ).list()
52
53 total_found = {
54 "open": CommunityEditsQueue.get_counts_by_mode(
55 mode='open', submitter=i.submitter, reviewer=i.reviewer
56 ),
57 "closed": CommunityEditsQueue.get_counts_by_mode(
58 mode='closed', submitter=i.submitter, reviewer=i.reviewer
59 ),
60 "submitters": CommunityEditsQueue.get_submitters(),
61 "reviewers": CommunityEditsQueue.get_reviewers(),
62 }
63
64 librarians = {
65 'submitters': CommunityEditsQueue.get_submitters(),
66 'reviewers': CommunityEditsQueue.get_reviewers(),
67 }
68
69 return render_template(
70 'merge_queue/merge_queue',
71 total_found,
72 librarians,
73 merge_requests=merge_requests,
74 )
75
76 def POST(self):
77 data = json.loads(web.data())
78 resp = process_merge_request(data.pop('rtype', ''), data)
79
80 return delegate.RawText(json.dumps(resp), content_type='application/json')
81
82 @staticmethod
83 def create_request(
84 username,
85 action='',
86 mr_type=None,
87 olids='',
88 comment: str | None = None,
89 primary: str | None = None,
90 ):
91 def is_valid_action(action):
92 return action in ('create-pending', 'create-merged')
93
94 def needs_unique_url(mr_type):
95 return mr_type in (
96 CommunityEditsQueue.TYPE['WORK_MERGE'],
97 CommunityEditsQueue.TYPE['AUTHOR_MERGE'],
98 )
99
100 if is_valid_action(action):
101 olid_list = olids.split(',')
102
103 title = community_edits_queue.create_title(mr_type, olid_list)
104 url = community_edits_queue.create_url(mr_type, olid_list, primary=primary)
105
106 # Validate URL
107 is_valid_url = True
108 if needs_unique_url(mr_type) and CommunityEditsQueue.exists(url):
109 is_valid_url = False
110
111 if is_valid_url:
112 if action == 'create-pending':
113 result = CommunityEditsQueue.submit_request(
114 url, username, title=title, comment=comment, mr_type=mr_type
115 )
116 elif action == 'create-merged':
117 result = CommunityEditsQueue.submit_request(
118 url,
119 username,
120 title=title,
121 comment=comment,
122 reviewer=username,
123 status=CommunityEditsQueue.STATUS['MERGED'],
124 mr_type=mr_type,
125 )
126 resp = (
127 response(id=result)
128 if result
129 else response(status='error', error='Request creation failed.')
130 )
131 else:
132 resp = response(
133 status='error',
134 error='A merge request for these items already exists.',
135 )
136 else:
137 resp = response(
138 status='error',
139 error=f'Action "{action}" is invalid for this request type.',
140 )
141
142 return resp
143
144 @staticmethod
145 def update_request(username, action='', mrid=None, comment=None):
146 # Comment on existing request:
147 if action == 'comment':
148 if comment:
149 CommunityEditsQueue.comment_request(mrid, username, comment)
150 resp = response()
151 else:
152 resp = response(status='error', error='No comment sent in request.')
153 # Assign to existing request:
154 elif action == 'claim':
155 result = CommunityEditsQueue.assign_request(mrid, username)
156 resp = response(**result)
157 # Unassign from existing request:
158 elif action == 'unassign':
159 CommunityEditsQueue.unassign_request(mrid)
160 status = get_status_for_view(CommunityEditsQueue.STATUS['PENDING'])
161 resp = response(newStatus=status)
162 # Close request by approving:
163 elif action == 'approve':
164 CommunityEditsQueue.update_request_status(
165 mrid, CommunityEditsQueue.STATUS['MERGED'], username, comment=comment
166 )
167 resp = response()
168 # Close request by declining:
169 elif action == 'decline':
170 CommunityEditsQueue.update_request_status(
171 mrid, CommunityEditsQueue.STATUS['DECLINED'], username, comment=comment
172 )
173 resp = response()
174 # Unknown request:
175 else:
176 resp = response(
177 status='error',
178 error=f'Action "{action}" is invalid for this request type.',
179 )
180
181 return resp
182
183 @staticmethod
184 def create_url(mr_type: int, olids: list[str], primary: str | None = None) -> str:
185 if mr_type == CommunityEditsQueue.TYPE['WORK_MERGE']:
186 primary_param = f'&primary={primary}' if primary else ''
187 return f'/works/merge?records={",".join(olids)}{primary_param}'
188 elif mr_type == CommunityEditsQueue.TYPE['AUTHOR_MERGE']:
189 return f'/authors/merge?key={"&key=".join(olids)}'
190 return ''
191
192 @staticmethod
193 def create_title(mr_type: int, olids: list[str]) -> str:
194 if mr_type == CommunityEditsQueue.TYPE['WORK_MERGE']:
195 for olid in olids:
196 book = web.ctx.site.get(f'/works/{olid}')
197 if book and book.title:
198 return book.title
199 elif mr_type == CommunityEditsQueue.TYPE['AUTHOR_MERGE']:
200 for olid in olids:
201 author = web.ctx.site.get(f'/authors/{olid}')
202 if author and author.name:
203 return author.name
204 return 'Unknown record'
205
206
207 def setup():
208 pass
209
[end of openlibrary/plugins/upstream/edits.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/openlibrary/plugins/upstream/edits.py b/openlibrary/plugins/upstream/edits.py
--- a/openlibrary/plugins/upstream/edits.py
+++ b/openlibrary/plugins/upstream/edits.py
@@ -67,7 +67,7 @@
}
return render_template(
- 'merge_queue/merge_queue',
+ 'merge_request_table/merge_request_table',
total_found,
librarians,
merge_requests=merge_requests,
|
{"golden_diff": "diff --git a/openlibrary/plugins/upstream/edits.py b/openlibrary/plugins/upstream/edits.py\n--- a/openlibrary/plugins/upstream/edits.py\n+++ b/openlibrary/plugins/upstream/edits.py\n@@ -67,7 +67,7 @@\n }\n \n return render_template(\n- 'merge_queue/merge_queue',\n+ 'merge_request_table/merge_request_table',\n total_found,\n librarians,\n merge_requests=merge_requests,\n", "issue": "Rename merge queue files for consistency\n### Short Summary:\r\nRefactor merge request table such that there is more parity between the JS and HTML files.\r\n\r\n### Background:\r\nNames of files related to the librarian merge queue have become inconsistent over time:\r\n\r\n#### Current file names\r\n| Component | JS filename | HTML filename | LESS filename |\r\n|--------|--------|--------|--------|\r\n| Table header | merge-request-table/LibrarianQueue/TableHeader.js | `None` | components/merge-request-table.less |\r\n| Table row | merge-request-table/LibrarianQueue/TableRow.js | `None`| components/merge-request-table.less |\r\n| Base component (the whole table) | merge-request-table/LibrarianQueue.js | merge_queue/merge_queue.html | components/merge-request-table.less | \r\n\r\nI figure that the naming conventions for the JS and LESS files are in alignment, and no changes are required. Our HTML template tile,,however, has an entirely different name, and would be difficult to find by a new developer (at least not without the help of somebody who is familiar with this code). It's also kind of odd that there is a JS file for each component, but only one template file.\r\n\r\n### Main Requirements:\r\n1. Create two new template files: one for the table header, and one for a single table row. Move existing header and table row HTML into their respective, newly created files.\r\n2. Ensure that the following filepaths are used:\r\n\r\n#### Updated file names\r\n| Component | JS filename | HTML filename |\r\n|--------|--------|--------|\r\n| Table header | merge-request-table/MergeRequestTable/TableHeader.js | merge_request_table/table_header.html |\r\n| Table row | merge-request-table/MergeRequestTable/TableRow.js | merge_request_table/table_row.html |\r\n| Base component (the whole table) | merge-request-table/MergeRequestTable.js | merge_request_table/merge_request_table.html |\r\n\r\n### Checklist:\r\n- [ ] JS filepaths have been updated as per the above \"Updated file names\" table.\r\n - [ ] All references to these files have been updated.\r\n- [ ] New templates have been created\r\n - [ ] table_header.html\r\n - [ ] table_row.html\r\n- [ ] Existing merge_queue/merge_queue.html template has been updated:\r\n - [ ] Change filepath to merge_request_table/merge_request_table.html\r\n - [ ] Replace header and table row code with references to the new templates\r\n- [ ] Update all references to the merge table template file\n", "before_files": [{"content": "\"\"\"Librarian Edits\n\"\"\"\n\nimport json\nimport web\n\nfrom openlibrary import accounts\nfrom openlibrary.core.edits import CommunityEditsQueue, get_status_for_view\nfrom infogami.utils import delegate\nfrom infogami.utils.view import render_template\n\n\ndef response(status='ok', **kwargs):\n return {'status': status, **kwargs}\n\n\ndef process_merge_request(rtype, data):\n user = accounts.get_current_user()\n username = user['key'].split('/')[-1]\n # Request types can be: create-request, update-request\n if rtype == 'create-request':\n resp = community_edits_queue.create_request(username, **data)\n elif rtype == 'update-request':\n resp = community_edits_queue.update_request(username, **data)\n else:\n resp = response(status='error', error='Unknown request type')\n return resp\n\n\nclass community_edits_queue(delegate.page):\n path = '/merges'\n\n def GET(self):\n i = web.input(\n page=1,\n limit=25,\n mode=\"open\",\n submitter=None,\n reviewer=None,\n order='desc',\n status=None,\n )\n merge_requests = CommunityEditsQueue.get_requests(\n page=int(i.page),\n limit=int(i.limit),\n mode=i.mode,\n submitter=i.submitter,\n reviewer=i.reviewer,\n order=f'updated {i.order}',\n status=i.status,\n ).list()\n\n total_found = {\n \"open\": CommunityEditsQueue.get_counts_by_mode(\n mode='open', submitter=i.submitter, reviewer=i.reviewer\n ),\n \"closed\": CommunityEditsQueue.get_counts_by_mode(\n mode='closed', submitter=i.submitter, reviewer=i.reviewer\n ),\n \"submitters\": CommunityEditsQueue.get_submitters(),\n \"reviewers\": CommunityEditsQueue.get_reviewers(),\n }\n\n librarians = {\n 'submitters': CommunityEditsQueue.get_submitters(),\n 'reviewers': CommunityEditsQueue.get_reviewers(),\n }\n\n return render_template(\n 'merge_queue/merge_queue',\n total_found,\n librarians,\n merge_requests=merge_requests,\n )\n\n def POST(self):\n data = json.loads(web.data())\n resp = process_merge_request(data.pop('rtype', ''), data)\n\n return delegate.RawText(json.dumps(resp), content_type='application/json')\n\n @staticmethod\n def create_request(\n username,\n action='',\n mr_type=None,\n olids='',\n comment: str | None = None,\n primary: str | None = None,\n ):\n def is_valid_action(action):\n return action in ('create-pending', 'create-merged')\n\n def needs_unique_url(mr_type):\n return mr_type in (\n CommunityEditsQueue.TYPE['WORK_MERGE'],\n CommunityEditsQueue.TYPE['AUTHOR_MERGE'],\n )\n\n if is_valid_action(action):\n olid_list = olids.split(',')\n\n title = community_edits_queue.create_title(mr_type, olid_list)\n url = community_edits_queue.create_url(mr_type, olid_list, primary=primary)\n\n # Validate URL\n is_valid_url = True\n if needs_unique_url(mr_type) and CommunityEditsQueue.exists(url):\n is_valid_url = False\n\n if is_valid_url:\n if action == 'create-pending':\n result = CommunityEditsQueue.submit_request(\n url, username, title=title, comment=comment, mr_type=mr_type\n )\n elif action == 'create-merged':\n result = CommunityEditsQueue.submit_request(\n url,\n username,\n title=title,\n comment=comment,\n reviewer=username,\n status=CommunityEditsQueue.STATUS['MERGED'],\n mr_type=mr_type,\n )\n resp = (\n response(id=result)\n if result\n else response(status='error', error='Request creation failed.')\n )\n else:\n resp = response(\n status='error',\n error='A merge request for these items already exists.',\n )\n else:\n resp = response(\n status='error',\n error=f'Action \"{action}\" is invalid for this request type.',\n )\n\n return resp\n\n @staticmethod\n def update_request(username, action='', mrid=None, comment=None):\n # Comment on existing request:\n if action == 'comment':\n if comment:\n CommunityEditsQueue.comment_request(mrid, username, comment)\n resp = response()\n else:\n resp = response(status='error', error='No comment sent in request.')\n # Assign to existing request:\n elif action == 'claim':\n result = CommunityEditsQueue.assign_request(mrid, username)\n resp = response(**result)\n # Unassign from existing request:\n elif action == 'unassign':\n CommunityEditsQueue.unassign_request(mrid)\n status = get_status_for_view(CommunityEditsQueue.STATUS['PENDING'])\n resp = response(newStatus=status)\n # Close request by approving:\n elif action == 'approve':\n CommunityEditsQueue.update_request_status(\n mrid, CommunityEditsQueue.STATUS['MERGED'], username, comment=comment\n )\n resp = response()\n # Close request by declining:\n elif action == 'decline':\n CommunityEditsQueue.update_request_status(\n mrid, CommunityEditsQueue.STATUS['DECLINED'], username, comment=comment\n )\n resp = response()\n # Unknown request:\n else:\n resp = response(\n status='error',\n error=f'Action \"{action}\" is invalid for this request type.',\n )\n\n return resp\n\n @staticmethod\n def create_url(mr_type: int, olids: list[str], primary: str | None = None) -> str:\n if mr_type == CommunityEditsQueue.TYPE['WORK_MERGE']:\n primary_param = f'&primary={primary}' if primary else ''\n return f'/works/merge?records={\",\".join(olids)}{primary_param}'\n elif mr_type == CommunityEditsQueue.TYPE['AUTHOR_MERGE']:\n return f'/authors/merge?key={\"&key=\".join(olids)}'\n return ''\n\n @staticmethod\n def create_title(mr_type: int, olids: list[str]) -> str:\n if mr_type == CommunityEditsQueue.TYPE['WORK_MERGE']:\n for olid in olids:\n book = web.ctx.site.get(f'/works/{olid}')\n if book and book.title:\n return book.title\n elif mr_type == CommunityEditsQueue.TYPE['AUTHOR_MERGE']:\n for olid in olids:\n author = web.ctx.site.get(f'/authors/{olid}')\n if author and author.name:\n return author.name\n return 'Unknown record'\n\n\ndef setup():\n pass\n", "path": "openlibrary/plugins/upstream/edits.py"}]}
| 3,041 | 103 |
gh_patches_debug_40512
|
rasdani/github-patches
|
git_diff
|
buildbot__buildbot-5710
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
FakeTransport error while starting buildbot.
I'm trying to understand why I'm getting the following error, even though the master seems to start and run normally. Googling for this message was fruitless. I'm using buildbot 2.9.3 and Twisted 20.3.0 (both latest). Do I need to downgrade Twisted?
```
(venv) alex@solitude:~/build_bot$ buildbot start master
Following twistd.log until startup finished..
Unhandled Error
Traceback (most recent call last):
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/python/log.py", line 103, in callWithLogger
return callWithContext({"system": lp}, func, *args, **kw)
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/python/log.py", line 86, in callWithContext
return context.call({ILogContext: newCtx}, func, *args, **kw)
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/python/context.py", line 122, in callWithContext
return self.currentContext().callWithContext(ctx, func, *args, **kw)
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/python/context.py", line 85, in callWithContext
return func(*args,**kw)
--- <exception caught here> ---
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/posixbase.py", line 614, in _doReadOrWrite
why = selectable.doRead()
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/process.py", line 252, in doRead
return fdesc.readFromFD(self.fd, self.dataReceived)
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/fdesc.py", line 94, in readFromFD
callback(output)
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/process.py", line 256, in dataReceived
self.proc.childDataReceived(self.name, data)
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/process.py", line 922, in childDataReceived
self.proto.childDataReceived(name, data)
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/protocol.py", line 640, in childDataReceived
self.outReceived(data)
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/buildbot/scripts/logwatcher.py", line 49, in outReceived
self.lw.dataReceived(data)
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/protocols/basic.py", line 452, in dataReceived
return self.lineLengthExceeded(line)
File "/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/protocols/basic.py", line 484, in lineLengthExceeded
return self.transport.loseConnection()
builtins.AttributeError: 'FakeTransport' object has no attribute 'loseConnection'
The buildmaster took more than 10.0 seconds to start, so we were unable to
confirm that it started correctly. Please 'tail twistd.log' and look for a line
that says 'BuildMaster is running' to verify correct startup.
```
_Originally posted by @alexreinking in https://github.com/buildbot/buildbot/discussions/5702_
</issue>
<code>
[start of master/buildbot/scripts/logwatcher.py]
1 # This file is part of Buildbot. Buildbot is free software: you can
2 # redistribute it and/or modify it under the terms of the GNU General Public
3 # License as published by the Free Software Foundation, version 2.
4 #
5 # This program is distributed in the hope that it will be useful, but WITHOUT
6 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
7 # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
8 # details.
9 #
10 # You should have received a copy of the GNU General Public License along with
11 # this program; if not, write to the Free Software Foundation, Inc., 51
12 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
13 #
14 # Copyright Buildbot Team Members
15
16
17 import os
18 import platform
19
20 from twisted.internet import defer
21 from twisted.internet import error
22 from twisted.internet import protocol
23 from twisted.internet import reactor
24 from twisted.protocols.basic import LineOnlyReceiver
25 from twisted.python.failure import Failure
26
27 from buildbot.util import unicode2bytes
28
29
30 class FakeTransport:
31 disconnecting = False
32
33
34 class BuildmasterTimeoutError(Exception):
35 pass
36
37
38 class BuildmasterStartupError(Exception):
39 pass
40
41
42 class ReconfigError(Exception):
43 pass
44
45
46 class TailProcess(protocol.ProcessProtocol):
47
48 def outReceived(self, data):
49 self.lw.dataReceived(data)
50
51 def errReceived(self, data):
52 print("ERR: '{}'".format(data))
53
54
55 class LogWatcher(LineOnlyReceiver):
56 POLL_INTERVAL = 0.1
57 TIMEOUT_DELAY = 10.0
58 delimiter = unicode2bytes(os.linesep)
59
60 def __init__(self, logfile, timeout=None, _reactor=reactor):
61 self.logfile = logfile
62 self.in_reconfig = False
63 self.transport = FakeTransport()
64 self.pp = TailProcess()
65 self.pp.lw = self
66 self.timer = None
67 self._reactor = _reactor
68 self._timeout_delay = timeout or self.TIMEOUT_DELAY
69
70 def start(self):
71 # If the log file doesn't exist, create it now.
72 if not os.path.exists(self.logfile):
73 open(self.logfile, 'a').close()
74
75 # return a Deferred that fires when the reconfig process has
76 # finished. It errbacks with TimeoutError if the startup has not
77 # progressed for 10 seconds, and with ReconfigError if the error
78 # line was seen. If the logfile could not be opened, it errbacks with
79 # an IOError.
80 if platform.system().lower() == 'sunos' and os.path.exists('/usr/xpg4/bin/tail'):
81 tailBin = "/usr/xpg4/bin/tail"
82 elif platform.system().lower() == 'haiku' and os.path.exists('/bin/tail'):
83 tailBin = "/bin/tail"
84 else:
85 tailBin = "/usr/bin/tail"
86
87 args = ("tail", "-f", "-n", "0", self.logfile)
88 self.p = self._reactor.spawnProcess(self.pp, tailBin, args,
89 env=os.environ)
90 self.running = True
91 d = defer.maybeDeferred(self._start)
92 return d
93
94 def _start(self):
95 self.d = defer.Deferred()
96 self.startTimer()
97 return self.d
98
99 def startTimer(self):
100 self.timer = self._reactor.callLater(self._timeout_delay, self.timeout)
101
102 def timeout(self):
103 # was the timeout set to be ignored? if so, restart it
104 if not self.timer:
105 self.startTimer()
106 return
107
108 self.timer = None
109 e = BuildmasterTimeoutError()
110 self.finished(Failure(e))
111
112 def finished(self, results):
113 try:
114 self.p.signalProcess("KILL")
115 except error.ProcessExitedAlready:
116 pass
117 if self.timer:
118 self.timer.cancel()
119 self.timer = None
120 self.running = False
121 self.in_reconfig = False
122 self.d.callback(results)
123
124 def lineReceived(self, line):
125 if not self.running:
126 return None
127 if b"Log opened." in line:
128 self.in_reconfig = True
129 if b"beginning configuration update" in line:
130 self.in_reconfig = True
131
132 if self.in_reconfig:
133 print(line.decode())
134
135 # certain lines indicate progress, so we "cancel" the timeout
136 # and it will get re-added when it fires
137 PROGRESS_TEXT = [b'Starting BuildMaster', b'Loading configuration from', b'added builder',
138 b'adding scheduler', b'Loading builder', b'Starting factory']
139 for progressText in PROGRESS_TEXT:
140 if progressText in line:
141 self.timer = None
142 break
143
144 if b"message from master: attached" in line:
145 return self.finished("worker")
146 if b"reconfig aborted" in line or b'reconfig partially applied' in line:
147 return self.finished(Failure(ReconfigError()))
148 if b"Server Shut Down" in line:
149 return self.finished(Failure(ReconfigError()))
150 if b"configuration update complete" in line:
151 return self.finished("buildmaster")
152 if b"BuildMaster is running" in line:
153 return self.finished("buildmaster")
154 if b"BuildMaster startup failed" in line:
155 return self.finished(Failure(BuildmasterStartupError()))
156 return None
157
[end of master/buildbot/scripts/logwatcher.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/master/buildbot/scripts/logwatcher.py b/master/buildbot/scripts/logwatcher.py
--- a/master/buildbot/scripts/logwatcher.py
+++ b/master/buildbot/scripts/logwatcher.py
@@ -21,7 +21,6 @@
from twisted.internet import error
from twisted.internet import protocol
from twisted.internet import reactor
-from twisted.protocols.basic import LineOnlyReceiver
from twisted.python.failure import Failure
from buildbot.util import unicode2bytes
@@ -49,10 +48,41 @@
self.lw.dataReceived(data)
def errReceived(self, data):
- print("ERR: '{}'".format(data))
+ self.lw.print_output("ERR: '{}'".format(data))
+
+
+class LineOnlyLongLineReceiver(protocol.Protocol):
+ """
+ This is almost the same as Twisted's LineOnlyReceiver except that long lines are handled
+ appropriately.
+ """
+ _buffer = b''
+ delimiter = b'\r\n'
+ MAX_LENGTH = 16384
+
+ def dataReceived(self, data):
+ lines = (self._buffer + data).split(self.delimiter)
+ self._buffer = lines.pop(-1)
+ for line in lines:
+ if self.transport.disconnecting:
+ # this is necessary because the transport may be told to lose
+ # the connection by a line within a larger packet, and it is
+ # important to disregard all the lines in that packet following
+ # the one that told it to close.
+ return
+ if len(line) > self.MAX_LENGTH:
+ self.lineLengthExceeded(line)
+ else:
+ self.lineReceived(line)
+
+ def lineReceived(self, line):
+ raise NotImplementedError
+
+ def lineLengthExceeded(self, line):
+ raise NotImplementedError
-class LogWatcher(LineOnlyReceiver):
+class LogWatcher(LineOnlyLongLineReceiver):
POLL_INTERVAL = 0.1
TIMEOUT_DELAY = 10.0
delimiter = unicode2bytes(os.linesep)
@@ -69,8 +99,7 @@
def start(self):
# If the log file doesn't exist, create it now.
- if not os.path.exists(self.logfile):
- open(self.logfile, 'a').close()
+ self.create_logfile(self.logfile)
# return a Deferred that fires when the reconfig process has
# finished. It errbacks with TimeoutError if the startup has not
@@ -121,6 +150,17 @@
self.in_reconfig = False
self.d.callback(results)
+ def create_logfile(self, path): # pragma: no cover
+ if not os.path.exists(path):
+ open(path, 'a').close()
+
+ def print_output(self, output): # pragma: no cover
+ print(output)
+
+ def lineLengthExceeded(self, line):
+ msg = 'Got an a very long line in the log (length {} bytes), ignoring'.format(len(line))
+ self.print_output(msg)
+
def lineReceived(self, line):
if not self.running:
return None
@@ -130,7 +170,7 @@
self.in_reconfig = True
if self.in_reconfig:
- print(line.decode())
+ self.print_output(line.decode())
# certain lines indicate progress, so we "cancel" the timeout
# and it will get re-added when it fires
|
{"golden_diff": "diff --git a/master/buildbot/scripts/logwatcher.py b/master/buildbot/scripts/logwatcher.py\n--- a/master/buildbot/scripts/logwatcher.py\n+++ b/master/buildbot/scripts/logwatcher.py\n@@ -21,7 +21,6 @@\n from twisted.internet import error\n from twisted.internet import protocol\n from twisted.internet import reactor\n-from twisted.protocols.basic import LineOnlyReceiver\n from twisted.python.failure import Failure\n \n from buildbot.util import unicode2bytes\n@@ -49,10 +48,41 @@\n self.lw.dataReceived(data)\n \n def errReceived(self, data):\n- print(\"ERR: '{}'\".format(data))\n+ self.lw.print_output(\"ERR: '{}'\".format(data))\n+\n+\n+class LineOnlyLongLineReceiver(protocol.Protocol):\n+ \"\"\"\n+ This is almost the same as Twisted's LineOnlyReceiver except that long lines are handled\n+ appropriately.\n+ \"\"\"\n+ _buffer = b''\n+ delimiter = b'\\r\\n'\n+ MAX_LENGTH = 16384\n+\n+ def dataReceived(self, data):\n+ lines = (self._buffer + data).split(self.delimiter)\n+ self._buffer = lines.pop(-1)\n+ for line in lines:\n+ if self.transport.disconnecting:\n+ # this is necessary because the transport may be told to lose\n+ # the connection by a line within a larger packet, and it is\n+ # important to disregard all the lines in that packet following\n+ # the one that told it to close.\n+ return\n+ if len(line) > self.MAX_LENGTH:\n+ self.lineLengthExceeded(line)\n+ else:\n+ self.lineReceived(line)\n+\n+ def lineReceived(self, line):\n+ raise NotImplementedError\n+\n+ def lineLengthExceeded(self, line):\n+ raise NotImplementedError\n \n \n-class LogWatcher(LineOnlyReceiver):\n+class LogWatcher(LineOnlyLongLineReceiver):\n POLL_INTERVAL = 0.1\n TIMEOUT_DELAY = 10.0\n delimiter = unicode2bytes(os.linesep)\n@@ -69,8 +99,7 @@\n \n def start(self):\n # If the log file doesn't exist, create it now.\n- if not os.path.exists(self.logfile):\n- open(self.logfile, 'a').close()\n+ self.create_logfile(self.logfile)\n \n # return a Deferred that fires when the reconfig process has\n # finished. It errbacks with TimeoutError if the startup has not\n@@ -121,6 +150,17 @@\n self.in_reconfig = False\n self.d.callback(results)\n \n+ def create_logfile(self, path): # pragma: no cover\n+ if not os.path.exists(path):\n+ open(path, 'a').close()\n+\n+ def print_output(self, output): # pragma: no cover\n+ print(output)\n+\n+ def lineLengthExceeded(self, line):\n+ msg = 'Got an a very long line in the log (length {} bytes), ignoring'.format(len(line))\n+ self.print_output(msg)\n+\n def lineReceived(self, line):\n if not self.running:\n return None\n@@ -130,7 +170,7 @@\n self.in_reconfig = True\n \n if self.in_reconfig:\n- print(line.decode())\n+ self.print_output(line.decode())\n \n # certain lines indicate progress, so we \"cancel\" the timeout\n # and it will get re-added when it fires\n", "issue": "FakeTransport error while starting buildbot.\nI'm trying to understand why I'm getting the following error, even though the master seems to start and run normally. Googling for this message was fruitless. I'm using buildbot 2.9.3 and Twisted 20.3.0 (both latest). Do I need to downgrade Twisted?\r\n\r\n```\r\n(venv) alex@solitude:~/build_bot$ buildbot start master\r\nFollowing twistd.log until startup finished..\r\nUnhandled Error\r\nTraceback (most recent call last):\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/python/log.py\", line 103, in callWithLogger\r\n return callWithContext({\"system\": lp}, func, *args, **kw)\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/python/log.py\", line 86, in callWithContext\r\n return context.call({ILogContext: newCtx}, func, *args, **kw)\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/python/context.py\", line 122, in callWithContext\r\n return self.currentContext().callWithContext(ctx, func, *args, **kw)\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/python/context.py\", line 85, in callWithContext\r\n return func(*args,**kw)\r\n--- <exception caught here> ---\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/posixbase.py\", line 614, in _doReadOrWrite\r\n why = selectable.doRead()\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/process.py\", line 252, in doRead\r\n return fdesc.readFromFD(self.fd, self.dataReceived)\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/fdesc.py\", line 94, in readFromFD\r\n callback(output)\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/process.py\", line 256, in dataReceived\r\n self.proc.childDataReceived(self.name, data)\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/process.py\", line 922, in childDataReceived\r\n self.proto.childDataReceived(name, data)\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/internet/protocol.py\", line 640, in childDataReceived\r\n self.outReceived(data)\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/buildbot/scripts/logwatcher.py\", line 49, in outReceived\r\n self.lw.dataReceived(data)\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/protocols/basic.py\", line 452, in dataReceived\r\n return self.lineLengthExceeded(line)\r\n File \"/home/alex/build_bot/venv/lib/python3.7/site-packages/twisted/protocols/basic.py\", line 484, in lineLengthExceeded\r\n return self.transport.loseConnection()\r\nbuiltins.AttributeError: 'FakeTransport' object has no attribute 'loseConnection'\r\n\r\nThe buildmaster took more than 10.0 seconds to start, so we were unable to\r\nconfirm that it started correctly. Please 'tail twistd.log' and look for a line\r\nthat says 'BuildMaster is running' to verify correct startup.\r\n```\r\n\r\n_Originally posted by @alexreinking in https://github.com/buildbot/buildbot/discussions/5702_\n", "before_files": [{"content": "# This file is part of Buildbot. Buildbot is free software: you can\n# redistribute it and/or modify it under the terms of the GNU General Public\n# License as published by the Free Software Foundation, version 2.\n#\n# This program is distributed in the hope that it will be useful, but WITHOUT\n# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\n# details.\n#\n# You should have received a copy of the GNU General Public License along with\n# this program; if not, write to the Free Software Foundation, Inc., 51\n# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n#\n# Copyright Buildbot Team Members\n\n\nimport os\nimport platform\n\nfrom twisted.internet import defer\nfrom twisted.internet import error\nfrom twisted.internet import protocol\nfrom twisted.internet import reactor\nfrom twisted.protocols.basic import LineOnlyReceiver\nfrom twisted.python.failure import Failure\n\nfrom buildbot.util import unicode2bytes\n\n\nclass FakeTransport:\n disconnecting = False\n\n\nclass BuildmasterTimeoutError(Exception):\n pass\n\n\nclass BuildmasterStartupError(Exception):\n pass\n\n\nclass ReconfigError(Exception):\n pass\n\n\nclass TailProcess(protocol.ProcessProtocol):\n\n def outReceived(self, data):\n self.lw.dataReceived(data)\n\n def errReceived(self, data):\n print(\"ERR: '{}'\".format(data))\n\n\nclass LogWatcher(LineOnlyReceiver):\n POLL_INTERVAL = 0.1\n TIMEOUT_DELAY = 10.0\n delimiter = unicode2bytes(os.linesep)\n\n def __init__(self, logfile, timeout=None, _reactor=reactor):\n self.logfile = logfile\n self.in_reconfig = False\n self.transport = FakeTransport()\n self.pp = TailProcess()\n self.pp.lw = self\n self.timer = None\n self._reactor = _reactor\n self._timeout_delay = timeout or self.TIMEOUT_DELAY\n\n def start(self):\n # If the log file doesn't exist, create it now.\n if not os.path.exists(self.logfile):\n open(self.logfile, 'a').close()\n\n # return a Deferred that fires when the reconfig process has\n # finished. It errbacks with TimeoutError if the startup has not\n # progressed for 10 seconds, and with ReconfigError if the error\n # line was seen. If the logfile could not be opened, it errbacks with\n # an IOError.\n if platform.system().lower() == 'sunos' and os.path.exists('/usr/xpg4/bin/tail'):\n tailBin = \"/usr/xpg4/bin/tail\"\n elif platform.system().lower() == 'haiku' and os.path.exists('/bin/tail'):\n tailBin = \"/bin/tail\"\n else:\n tailBin = \"/usr/bin/tail\"\n\n args = (\"tail\", \"-f\", \"-n\", \"0\", self.logfile)\n self.p = self._reactor.spawnProcess(self.pp, tailBin, args,\n env=os.environ)\n self.running = True\n d = defer.maybeDeferred(self._start)\n return d\n\n def _start(self):\n self.d = defer.Deferred()\n self.startTimer()\n return self.d\n\n def startTimer(self):\n self.timer = self._reactor.callLater(self._timeout_delay, self.timeout)\n\n def timeout(self):\n # was the timeout set to be ignored? if so, restart it\n if not self.timer:\n self.startTimer()\n return\n\n self.timer = None\n e = BuildmasterTimeoutError()\n self.finished(Failure(e))\n\n def finished(self, results):\n try:\n self.p.signalProcess(\"KILL\")\n except error.ProcessExitedAlready:\n pass\n if self.timer:\n self.timer.cancel()\n self.timer = None\n self.running = False\n self.in_reconfig = False\n self.d.callback(results)\n\n def lineReceived(self, line):\n if not self.running:\n return None\n if b\"Log opened.\" in line:\n self.in_reconfig = True\n if b\"beginning configuration update\" in line:\n self.in_reconfig = True\n\n if self.in_reconfig:\n print(line.decode())\n\n # certain lines indicate progress, so we \"cancel\" the timeout\n # and it will get re-added when it fires\n PROGRESS_TEXT = [b'Starting BuildMaster', b'Loading configuration from', b'added builder',\n b'adding scheduler', b'Loading builder', b'Starting factory']\n for progressText in PROGRESS_TEXT:\n if progressText in line:\n self.timer = None\n break\n\n if b\"message from master: attached\" in line:\n return self.finished(\"worker\")\n if b\"reconfig aborted\" in line or b'reconfig partially applied' in line:\n return self.finished(Failure(ReconfigError()))\n if b\"Server Shut Down\" in line:\n return self.finished(Failure(ReconfigError()))\n if b\"configuration update complete\" in line:\n return self.finished(\"buildmaster\")\n if b\"BuildMaster is running\" in line:\n return self.finished(\"buildmaster\")\n if b\"BuildMaster startup failed\" in line:\n return self.finished(Failure(BuildmasterStartupError()))\n return None\n", "path": "master/buildbot/scripts/logwatcher.py"}]}
| 2,920 | 769 |
gh_patches_debug_18851
|
rasdani/github-patches
|
git_diff
|
alltheplaces__alltheplaces-8363
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Problems with Spiders built on YextSpider
I've noticed a few of the spiders whose results I was using in my OSM tool have recently stopped returning any results, including five_guys_de_es_fr_gb.py , matalan_gb.py , and three_gb.py .
A common feature of these spiders is that they use the YextSpider class. Checking some other spiders that are also based on this class, reveals they've also stopped working. The spider stats suggest 404 and 403 errors are preventing the data being retrieved.
If this is a general problem affecting multiple spiders, would someone be able to take a look and see if it can be fixed?
</issue>
<code>
[start of locations/spiders/primanti_bros_us.py]
1 from locations.categories import Categories
2 from locations.storefinders.yext import YextSpider
3
4
5 class PrimantiBrosUSSpider(YextSpider):
6 name = "primanti_bros_us"
7 item_attributes = {"brand": "Primanti Bros", "brand_wikidata": "Q7243049", "extras": Categories.RESTAURANT.value}
8 api_key = "7515c25fc685bbdd7c5975b6573c6912"
9 api_version = "20220511"
10
11 def parse_item(self, item, location):
12 if "test-location" in item["ref"]:
13 return
14 item["ref"] = location.get("c_pagesURL")
15 item["name"] = location.get("c_searchName")
16 item["website"] = location.get("c_pagesURL")
17 item.pop("twitter", None)
18 yield item
19
[end of locations/spiders/primanti_bros_us.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/locations/spiders/primanti_bros_us.py b/locations/spiders/primanti_bros_us.py
--- a/locations/spiders/primanti_bros_us.py
+++ b/locations/spiders/primanti_bros_us.py
@@ -1,18 +1,13 @@
from locations.categories import Categories
-from locations.storefinders.yext import YextSpider
+from locations.storefinders.yext_answers import YextAnswersSpider
-class PrimantiBrosUSSpider(YextSpider):
+class PrimantiBrosUSSpider(YextAnswersSpider):
name = "primanti_bros_us"
item_attributes = {"brand": "Primanti Bros", "brand_wikidata": "Q7243049", "extras": Categories.RESTAURANT.value}
api_key = "7515c25fc685bbdd7c5975b6573c6912"
- api_version = "20220511"
+ experience_key = "locator"
- def parse_item(self, item, location):
- if "test-location" in item["ref"]:
- return
- item["ref"] = location.get("c_pagesURL")
- item["name"] = location.get("c_searchName")
- item["website"] = location.get("c_pagesURL")
- item.pop("twitter", None)
+ def parse_item(self, location, item):
+ item["website"] = location["data"].get("landingPageUrl")
yield item
|
{"golden_diff": "diff --git a/locations/spiders/primanti_bros_us.py b/locations/spiders/primanti_bros_us.py\n--- a/locations/spiders/primanti_bros_us.py\n+++ b/locations/spiders/primanti_bros_us.py\n@@ -1,18 +1,13 @@\n from locations.categories import Categories\n-from locations.storefinders.yext import YextSpider\n+from locations.storefinders.yext_answers import YextAnswersSpider\n \n \n-class PrimantiBrosUSSpider(YextSpider):\n+class PrimantiBrosUSSpider(YextAnswersSpider):\n name = \"primanti_bros_us\"\n item_attributes = {\"brand\": \"Primanti Bros\", \"brand_wikidata\": \"Q7243049\", \"extras\": Categories.RESTAURANT.value}\n api_key = \"7515c25fc685bbdd7c5975b6573c6912\"\n- api_version = \"20220511\"\n+ experience_key = \"locator\"\n \n- def parse_item(self, item, location):\n- if \"test-location\" in item[\"ref\"]:\n- return\n- item[\"ref\"] = location.get(\"c_pagesURL\")\n- item[\"name\"] = location.get(\"c_searchName\")\n- item[\"website\"] = location.get(\"c_pagesURL\")\n- item.pop(\"twitter\", None)\n+ def parse_item(self, location, item):\n+ item[\"website\"] = location[\"data\"].get(\"landingPageUrl\")\n yield item\n", "issue": "Problems with Spiders built on YextSpider\nI've noticed a few of the spiders whose results I was using in my OSM tool have recently stopped returning any results, including five_guys_de_es_fr_gb.py , matalan_gb.py , and three_gb.py .\r\n\r\nA common feature of these spiders is that they use the YextSpider class. Checking some other spiders that are also based on this class, reveals they've also stopped working. The spider stats suggest 404 and 403 errors are preventing the data being retrieved.\r\n\r\nIf this is a general problem affecting multiple spiders, would someone be able to take a look and see if it can be fixed?\n", "before_files": [{"content": "from locations.categories import Categories\nfrom locations.storefinders.yext import YextSpider\n\n\nclass PrimantiBrosUSSpider(YextSpider):\n name = \"primanti_bros_us\"\n item_attributes = {\"brand\": \"Primanti Bros\", \"brand_wikidata\": \"Q7243049\", \"extras\": Categories.RESTAURANT.value}\n api_key = \"7515c25fc685bbdd7c5975b6573c6912\"\n api_version = \"20220511\"\n\n def parse_item(self, item, location):\n if \"test-location\" in item[\"ref\"]:\n return\n item[\"ref\"] = location.get(\"c_pagesURL\")\n item[\"name\"] = location.get(\"c_searchName\")\n item[\"website\"] = location.get(\"c_pagesURL\")\n item.pop(\"twitter\", None)\n yield item\n", "path": "locations/spiders/primanti_bros_us.py"}]}
| 921 | 347 |
gh_patches_debug_466
|
rasdani/github-patches
|
git_diff
|
v7labs__darwin-py-315
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Remove unused requests_toolbelt requirement?
AFAICT, requests_toolbelt is not used anywhere, yet it exists in the install_requires.
https://github.com/v7labs/darwin-py/blob/878e9a0d639d6b70886bb53b00486908c3b6a14b/setup.py#L32
https://github.com/v7labs/darwin-py/search?q=requests_toolbelt
</issue>
<code>
[start of setup.py]
1 import re
2 from pathlib import Path
3
4 import setuptools
5
6 with open("README.md", "rb") as f:
7 long_description = f.read().decode("utf-8")
8
9 with open(Path(__file__).parent / "darwin" / "__init__.py", "r") as f:
10 content = f.read()
11 # from https://www.py4u.net/discuss/139845
12 version = re.search(r'__version__\s*=\s*[\'"]([^\'"]*)[\'"]', content).group(1)
13
14 setuptools.setup(
15 name="darwin-py",
16 version=version,
17 author="V7",
18 author_email="[email protected]",
19 description="Library and command line interface for darwin.v7labs.com",
20 long_description=long_description,
21 long_description_content_type="text/markdown",
22 url="https://github.com/v7labs/darwin-py",
23 setup_requires=["wheel"],
24 install_requires=[
25 "argcomplete",
26 "dataclasses",
27 "humanize",
28 "numpy",
29 "pillow",
30 "pyyaml>=5.1",
31 "requests",
32 "requests_toolbelt",
33 "rich",
34 "upolygon==0.1.6",
35 "jsonschema",
36 ],
37 extras_require={"test": ["responses", "pytest", "pytest-describe"], "ml": ["sklearn", "torch", "torchvision"]},
38 packages=[
39 "darwin",
40 "darwin.importer",
41 "darwin.dataset",
42 "darwin.torch",
43 "darwin.exporter",
44 "darwin.importer.formats",
45 "darwin.exporter.formats",
46 ],
47 entry_points={"console_scripts": ["darwin=darwin.cli:main"]},
48 classifiers=["Programming Language :: Python :: 3", "License :: OSI Approved :: MIT License"],
49 python_requires=">=3.6",
50 )
51
[end of setup.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,6 @@
"pillow",
"pyyaml>=5.1",
"requests",
- "requests_toolbelt",
"rich",
"upolygon==0.1.6",
"jsonschema",
|
{"golden_diff": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -29,7 +29,6 @@\n \"pillow\",\n \"pyyaml>=5.1\",\n \"requests\",\n- \"requests_toolbelt\",\n \"rich\",\n \"upolygon==0.1.6\",\n \"jsonschema\",\n", "issue": "Remove unused requests_toolbelt requirement?\nAFAICT, requests_toolbelt is not used anywhere, yet it exists in the install_requires.\r\n\r\nhttps://github.com/v7labs/darwin-py/blob/878e9a0d639d6b70886bb53b00486908c3b6a14b/setup.py#L32\r\n\r\nhttps://github.com/v7labs/darwin-py/search?q=requests_toolbelt\n", "before_files": [{"content": "import re\nfrom pathlib import Path\n\nimport setuptools\n\nwith open(\"README.md\", \"rb\") as f:\n long_description = f.read().decode(\"utf-8\")\n\nwith open(Path(__file__).parent / \"darwin\" / \"__init__.py\", \"r\") as f:\n content = f.read()\n # from https://www.py4u.net/discuss/139845\n version = re.search(r'__version__\\s*=\\s*[\\'\"]([^\\'\"]*)[\\'\"]', content).group(1)\n\nsetuptools.setup(\n name=\"darwin-py\",\n version=version,\n author=\"V7\",\n author_email=\"[email protected]\",\n description=\"Library and command line interface for darwin.v7labs.com\",\n long_description=long_description,\n long_description_content_type=\"text/markdown\",\n url=\"https://github.com/v7labs/darwin-py\",\n setup_requires=[\"wheel\"],\n install_requires=[\n \"argcomplete\",\n \"dataclasses\",\n \"humanize\",\n \"numpy\",\n \"pillow\",\n \"pyyaml>=5.1\",\n \"requests\",\n \"requests_toolbelt\",\n \"rich\",\n \"upolygon==0.1.6\",\n \"jsonschema\",\n ],\n extras_require={\"test\": [\"responses\", \"pytest\", \"pytest-describe\"], \"ml\": [\"sklearn\", \"torch\", \"torchvision\"]},\n packages=[\n \"darwin\",\n \"darwin.importer\",\n \"darwin.dataset\",\n \"darwin.torch\",\n \"darwin.exporter\",\n \"darwin.importer.formats\",\n \"darwin.exporter.formats\",\n ],\n entry_points={\"console_scripts\": [\"darwin=darwin.cli:main\"]},\n classifiers=[\"Programming Language :: Python :: 3\", \"License :: OSI Approved :: MIT License\"],\n python_requires=\">=3.6\",\n)\n", "path": "setup.py"}]}
| 1,132 | 77 |
gh_patches_debug_34389
|
rasdani/github-patches
|
git_diff
|
deepset-ai__haystack-7042
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Implement function to calculate Mean Reciprocal Rank metric
As specified in proposal #5794 we need to implement a function to calculate the Mean Reciprocal Rank metric.
Ideally the function should be part of the private interface and called only through the `calculate_metrics` function (see #6063). `_calculate_mrr()` could be a nice name.
For more detailed information check out the original proposal.
</issue>
<code>
[start of haystack/components/evaluators/statistical_evaluator.py]
1 import collections
2 import itertools
3 from enum import Enum
4 from typing import Any, Dict, List, Union
5
6 from numpy import array as np_array
7 from numpy import mean as np_mean
8
9 from haystack import default_from_dict, default_to_dict
10 from haystack.core.component import component
11
12
13 class StatisticalMetric(Enum):
14 """
15 Metrics supported by the StatisticalEvaluator.
16 """
17
18 F1 = "f1"
19 EM = "exact_match"
20 RECALL_SINGLE_HIT = "recall_single_hit"
21 RECALL_MULTI_HIT = "recall_multi_hit"
22
23 @classmethod
24 def from_str(cls, metric: str) -> "StatisticalMetric":
25 map = {e.value: e for e in StatisticalMetric}
26 metric_ = map.get(metric)
27 if metric_ is None:
28 raise ValueError(f"Unknown statistical metric '{metric}'")
29 return metric_
30
31
32 @component
33 class StatisticalEvaluator:
34 """
35 StatisticalEvaluator is a component that evaluates the performance of a model based on statistical metrics.
36 It's usually used in QA and Retrieval Augmented Generation (RAG) pipelines to evaluate the quality of the generated answers.
37
38 The supported metrics are:
39 - F1: Measures word overlap between predictions and labels.
40 - Exact Match: Measures the proportion of cases where prediction is identical to the expected label.
41 """
42
43 def __init__(self, metric: Union[str, StatisticalMetric]):
44 """
45 Creates a new instance of StatisticalEvaluator.
46
47 :param metric: Metric to use for evaluation in this component. Supported metrics are F1 and Exact Match.
48 """
49 if isinstance(metric, str):
50 metric = StatisticalMetric.from_str(metric)
51 self._metric = metric
52
53 self._metric_function = {
54 StatisticalMetric.F1: self._f1,
55 StatisticalMetric.EM: self._exact_match,
56 StatisticalMetric.RECALL_SINGLE_HIT: self._recall_single_hit,
57 StatisticalMetric.RECALL_MULTI_HIT: self._recall_multi_hit,
58 }[self._metric]
59
60 def to_dict(self) -> Dict[str, Any]:
61 return default_to_dict(self, metric=self._metric.value)
62
63 @classmethod
64 def from_dict(cls, data: Dict[str, Any]) -> "StatisticalEvaluator":
65 data["init_parameters"]["metric"] = StatisticalMetric(data["init_parameters"]["metric"])
66 return default_from_dict(cls, data)
67
68 @component.output_types(result=float)
69 def run(self, labels: List[str], predictions: List[str]) -> Dict[str, Any]:
70 """
71 Run the StatisticalEvaluator to compute the metric between a list of predictions and a list of labels.
72 Both must be list of strings of same length.
73
74 :param predictions: List of predictions.
75 :param labels: List of labels against which the predictions are compared.
76 :returns: A dictionary with the following outputs:
77 * `result` - Calculated result of the chosen metric.
78 """
79 return {"result": self._metric_function(labels, predictions)}
80
81 @staticmethod
82 def _f1(labels: List[str], predictions: List[str]):
83 """
84 Measure word overlap between predictions and labels.
85 """
86 if len(labels) != len(predictions):
87 raise ValueError("The number of predictions and labels must be the same.")
88
89 if len(predictions) == 0:
90 # We expect callers of this function already checked if predictions and labels are equal length
91 return 0.0
92
93 scores: List[float] = []
94 tokenized_predictions = [pred.split() for pred in predictions]
95 tokenized_labels = [label.split() for label in labels]
96 for label_tokens, prediction_tokens in zip(tokenized_labels, tokenized_predictions):
97 common = collections.Counter(label_tokens) & collections.Counter(prediction_tokens)
98 num_same = sum(common.values())
99 if len(label_tokens) == 0 or len(prediction_tokens) == 0:
100 # If either is no-answer, then F1 is 1 if they agree, 0 otherwise
101 return int(label_tokens == prediction_tokens)
102 if num_same == 0:
103 return 0
104 precision = 1.0 * num_same / len(prediction_tokens)
105 recall = 1.0 * num_same / len(label_tokens)
106 f1 = (2 * precision * recall) / (precision + recall)
107 scores.append(f1)
108
109 return np_mean(scores)
110
111 @staticmethod
112 def _exact_match(labels: List[str], predictions: List[str]) -> float:
113 """
114 Measure the proportion of cases where predictiond is identical to the the expected label.
115 """
116 if len(labels) != len(predictions):
117 raise ValueError("The number of predictions and labels must be the same.")
118
119 if len(predictions) == 0:
120 # We expect callers of this function already checked if predictions and labels are equal length
121 return 0.0
122 score_list = np_array(predictions) == np_array(labels)
123 return np_mean(score_list)
124
125 @staticmethod
126 def _recall_single_hit(labels: List[str], predictions: List[str]) -> float:
127 """
128 Measures how many times a label is present in at least one prediction.
129 If the same label is found in multiple predictions it is only counted once.
130 """
131 if len(labels) == 0:
132 return 0.0
133
134 # In Recall Single Hit we only consider if a label is present in at least one prediction.
135 # No need to count multiple occurrences of the same label in different predictions
136 retrieved_labels = {l for l, p in itertools.product(labels, predictions) if l in p}
137 return len(retrieved_labels) / len(labels)
138
139 @staticmethod
140 def _recall_multi_hit(labels: List[str], predictions: List[str]) -> float:
141 """
142 Measures how many times a label is present in at least one or more predictions.
143 """
144 if len(labels) == 0:
145 return 0.0
146
147 correct_retrievals = 0
148 for label, prediction in itertools.product(labels, predictions):
149 if label in prediction:
150 correct_retrievals += 1
151
152 return correct_retrievals / len(labels)
153
[end of haystack/components/evaluators/statistical_evaluator.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/haystack/components/evaluators/statistical_evaluator.py b/haystack/components/evaluators/statistical_evaluator.py
--- a/haystack/components/evaluators/statistical_evaluator.py
+++ b/haystack/components/evaluators/statistical_evaluator.py
@@ -19,6 +19,7 @@
EM = "exact_match"
RECALL_SINGLE_HIT = "recall_single_hit"
RECALL_MULTI_HIT = "recall_multi_hit"
+ MRR = "mean_reciprocal_rank"
@classmethod
def from_str(cls, metric: str) -> "StatisticalMetric":
@@ -55,6 +56,7 @@
StatisticalMetric.EM: self._exact_match,
StatisticalMetric.RECALL_SINGLE_HIT: self._recall_single_hit,
StatisticalMetric.RECALL_MULTI_HIT: self._recall_multi_hit,
+ StatisticalMetric.MRR: self._mrr,
}[self._metric]
def to_dict(self) -> Dict[str, Any]:
@@ -111,7 +113,7 @@
@staticmethod
def _exact_match(labels: List[str], predictions: List[str]) -> float:
"""
- Measure the proportion of cases where predictiond is identical to the the expected label.
+ Measure the proportion of cases where prediction is identical to the the expected label.
"""
if len(labels) != len(predictions):
raise ValueError("The number of predictions and labels must be the same.")
@@ -150,3 +152,20 @@
correct_retrievals += 1
return correct_retrievals / len(labels)
+
+ @staticmethod
+ def _mrr(labels: List[str], predictions: List[str]) -> float:
+ """
+ Measures the mean reciprocal rank of times a label is present in at least one or more predictions.
+ """
+ if len(labels) == 0:
+ return 0.0
+
+ mrr_sum = 0.0
+ for label in labels:
+ for rank, prediction in enumerate(predictions):
+ if label in prediction:
+ mrr_sum += 1 / (rank + 1)
+ break
+
+ return mrr_sum / len(labels)
|
{"golden_diff": "diff --git a/haystack/components/evaluators/statistical_evaluator.py b/haystack/components/evaluators/statistical_evaluator.py\n--- a/haystack/components/evaluators/statistical_evaluator.py\n+++ b/haystack/components/evaluators/statistical_evaluator.py\n@@ -19,6 +19,7 @@\n EM = \"exact_match\"\n RECALL_SINGLE_HIT = \"recall_single_hit\"\n RECALL_MULTI_HIT = \"recall_multi_hit\"\n+ MRR = \"mean_reciprocal_rank\"\n \n @classmethod\n def from_str(cls, metric: str) -> \"StatisticalMetric\":\n@@ -55,6 +56,7 @@\n StatisticalMetric.EM: self._exact_match,\n StatisticalMetric.RECALL_SINGLE_HIT: self._recall_single_hit,\n StatisticalMetric.RECALL_MULTI_HIT: self._recall_multi_hit,\n+ StatisticalMetric.MRR: self._mrr,\n }[self._metric]\n \n def to_dict(self) -> Dict[str, Any]:\n@@ -111,7 +113,7 @@\n @staticmethod\n def _exact_match(labels: List[str], predictions: List[str]) -> float:\n \"\"\"\n- Measure the proportion of cases where predictiond is identical to the the expected label.\n+ Measure the proportion of cases where prediction is identical to the the expected label.\n \"\"\"\n if len(labels) != len(predictions):\n raise ValueError(\"The number of predictions and labels must be the same.\")\n@@ -150,3 +152,20 @@\n correct_retrievals += 1\n \n return correct_retrievals / len(labels)\n+\n+ @staticmethod\n+ def _mrr(labels: List[str], predictions: List[str]) -> float:\n+ \"\"\"\n+ Measures the mean reciprocal rank of times a label is present in at least one or more predictions.\n+ \"\"\"\n+ if len(labels) == 0:\n+ return 0.0\n+\n+ mrr_sum = 0.0\n+ for label in labels:\n+ for rank, prediction in enumerate(predictions):\n+ if label in prediction:\n+ mrr_sum += 1 / (rank + 1)\n+ break\n+\n+ return mrr_sum / len(labels)\n", "issue": "Implement function to calculate Mean Reciprocal Rank metric\nAs specified in proposal #5794 we need to implement a function to calculate the Mean Reciprocal Rank metric.\r\n\r\nIdeally the function should be part of the private interface and called only through the `calculate_metrics` function (see #6063). `_calculate_mrr()` could be a nice name.\r\n\r\nFor more detailed information check out the original proposal.\n", "before_files": [{"content": "import collections\nimport itertools\nfrom enum import Enum\nfrom typing import Any, Dict, List, Union\n\nfrom numpy import array as np_array\nfrom numpy import mean as np_mean\n\nfrom haystack import default_from_dict, default_to_dict\nfrom haystack.core.component import component\n\n\nclass StatisticalMetric(Enum):\n \"\"\"\n Metrics supported by the StatisticalEvaluator.\n \"\"\"\n\n F1 = \"f1\"\n EM = \"exact_match\"\n RECALL_SINGLE_HIT = \"recall_single_hit\"\n RECALL_MULTI_HIT = \"recall_multi_hit\"\n\n @classmethod\n def from_str(cls, metric: str) -> \"StatisticalMetric\":\n map = {e.value: e for e in StatisticalMetric}\n metric_ = map.get(metric)\n if metric_ is None:\n raise ValueError(f\"Unknown statistical metric '{metric}'\")\n return metric_\n\n\n@component\nclass StatisticalEvaluator:\n \"\"\"\n StatisticalEvaluator is a component that evaluates the performance of a model based on statistical metrics.\n It's usually used in QA and Retrieval Augmented Generation (RAG) pipelines to evaluate the quality of the generated answers.\n\n The supported metrics are:\n - F1: Measures word overlap between predictions and labels.\n - Exact Match: Measures the proportion of cases where prediction is identical to the expected label.\n \"\"\"\n\n def __init__(self, metric: Union[str, StatisticalMetric]):\n \"\"\"\n Creates a new instance of StatisticalEvaluator.\n\n :param metric: Metric to use for evaluation in this component. Supported metrics are F1 and Exact Match.\n \"\"\"\n if isinstance(metric, str):\n metric = StatisticalMetric.from_str(metric)\n self._metric = metric\n\n self._metric_function = {\n StatisticalMetric.F1: self._f1,\n StatisticalMetric.EM: self._exact_match,\n StatisticalMetric.RECALL_SINGLE_HIT: self._recall_single_hit,\n StatisticalMetric.RECALL_MULTI_HIT: self._recall_multi_hit,\n }[self._metric]\n\n def to_dict(self) -> Dict[str, Any]:\n return default_to_dict(self, metric=self._metric.value)\n\n @classmethod\n def from_dict(cls, data: Dict[str, Any]) -> \"StatisticalEvaluator\":\n data[\"init_parameters\"][\"metric\"] = StatisticalMetric(data[\"init_parameters\"][\"metric\"])\n return default_from_dict(cls, data)\n\n @component.output_types(result=float)\n def run(self, labels: List[str], predictions: List[str]) -> Dict[str, Any]:\n \"\"\"\n Run the StatisticalEvaluator to compute the metric between a list of predictions and a list of labels.\n Both must be list of strings of same length.\n\n :param predictions: List of predictions.\n :param labels: List of labels against which the predictions are compared.\n :returns: A dictionary with the following outputs:\n * `result` - Calculated result of the chosen metric.\n \"\"\"\n return {\"result\": self._metric_function(labels, predictions)}\n\n @staticmethod\n def _f1(labels: List[str], predictions: List[str]):\n \"\"\"\n Measure word overlap between predictions and labels.\n \"\"\"\n if len(labels) != len(predictions):\n raise ValueError(\"The number of predictions and labels must be the same.\")\n\n if len(predictions) == 0:\n # We expect callers of this function already checked if predictions and labels are equal length\n return 0.0\n\n scores: List[float] = []\n tokenized_predictions = [pred.split() for pred in predictions]\n tokenized_labels = [label.split() for label in labels]\n for label_tokens, prediction_tokens in zip(tokenized_labels, tokenized_predictions):\n common = collections.Counter(label_tokens) & collections.Counter(prediction_tokens)\n num_same = sum(common.values())\n if len(label_tokens) == 0 or len(prediction_tokens) == 0:\n # If either is no-answer, then F1 is 1 if they agree, 0 otherwise\n return int(label_tokens == prediction_tokens)\n if num_same == 0:\n return 0\n precision = 1.0 * num_same / len(prediction_tokens)\n recall = 1.0 * num_same / len(label_tokens)\n f1 = (2 * precision * recall) / (precision + recall)\n scores.append(f1)\n\n return np_mean(scores)\n\n @staticmethod\n def _exact_match(labels: List[str], predictions: List[str]) -> float:\n \"\"\"\n Measure the proportion of cases where predictiond is identical to the the expected label.\n \"\"\"\n if len(labels) != len(predictions):\n raise ValueError(\"The number of predictions and labels must be the same.\")\n\n if len(predictions) == 0:\n # We expect callers of this function already checked if predictions and labels are equal length\n return 0.0\n score_list = np_array(predictions) == np_array(labels)\n return np_mean(score_list)\n\n @staticmethod\n def _recall_single_hit(labels: List[str], predictions: List[str]) -> float:\n \"\"\"\n Measures how many times a label is present in at least one prediction.\n If the same label is found in multiple predictions it is only counted once.\n \"\"\"\n if len(labels) == 0:\n return 0.0\n\n # In Recall Single Hit we only consider if a label is present in at least one prediction.\n # No need to count multiple occurrences of the same label in different predictions\n retrieved_labels = {l for l, p in itertools.product(labels, predictions) if l in p}\n return len(retrieved_labels) / len(labels)\n\n @staticmethod\n def _recall_multi_hit(labels: List[str], predictions: List[str]) -> float:\n \"\"\"\n Measures how many times a label is present in at least one or more predictions.\n \"\"\"\n if len(labels) == 0:\n return 0.0\n\n correct_retrievals = 0\n for label, prediction in itertools.product(labels, predictions):\n if label in prediction:\n correct_retrievals += 1\n\n return correct_retrievals / len(labels)\n", "path": "haystack/components/evaluators/statistical_evaluator.py"}]}
| 2,276 | 490 |
gh_patches_debug_41277
|
rasdani/github-patches
|
git_diff
|
pyinstaller__pyinstaller-7885
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
pkgutil.iter_modules is broken on MacOS
## Description of the issue
I am trying to build an application on MacOS that uses pkguilt.iter_modules to dynamically find and load modules however it is not finding any modules.
The modules are there and can be imported with importlib.import_module.
Note that I am using PyInstaller with FBS but I don't believe the latter changes anything that would effect this.
The following is an example project structure
```
my_package
my_module_1
my_module_2
my_module_3
```
Here is the code that does not work
```py
import importlib
import pkgutil
m = importlib.import_module("my_package")
print("Found nested modules", list(pkgutil.iter_modules(m.__path__, m.__name__ + ".")))
```
The last line prints an empty list when built with PyInstaller.
I have done a bit of a dive into the code and I believe this is a rather complex mixup with paths and symbolic links.
https://github.com/pyinstaller/pyinstaller/blob/develop/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py
It looks like #6539 had a go at supporting symbolic links but it only resolves symbolic links up to the `_MEIPASS` directory.
On MacOS `_MEIPASS` is equal to `"/path/to/my_package.app/Contents/MacOS/"`
`my_package.__path__` is equal to `["/path/to/my_package.app/Contents/MacOS/my_package"]`
`/path/to/my_package.app/Contents/MacOS/my_package` is a symbolic link to `/path/to/my_package.app/Contents/Resources/my_package` when there are data files present in that package.
The `iter_modules` hook expands symbolic links in the `path` variable which converts `"/path/to/my_package.app/Contents/MacOS/my_package"` to `"/path/to/my_package.app/Contents/Resources/my_package"`
The following code then skips over the directory because it does not start with `SYS_PREFIX`
```py
if not pkg_path.startswith(SYS_PREFIX):
# If the path does not start with sys._MEIPASS, it cannot be a bundled package.
continue
```
I don't know how this should be implemented but we need to resolve the expected path relative to the `_MEIPASS` directory and then expand symbolic links and only then skip if the package path does not start with the directory.
### Context information (for bug reports)
* Output of `pyinstaller --version`: ```5.13.0```
* Version of Python: Python 3.11.4 (main, Aug 22 2023, 11:47:24) [Clang 14.0.3 (clang-1403.0.22.14.1)] on darwin
* Platform: OS X
* How you installed Python: pyenv
* Did you also try this on another platform? Does it work there? This only effects MacOS as far as I am aware
</issue>
<code>
[start of PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py]
1 #-----------------------------------------------------------------------------
2 # Copyright (c) 2021-2023, PyInstaller Development Team.
3 #
4 # Licensed under the Apache License, Version 2.0 (the "License");
5 # you may not use this file except in compliance with the License.
6 #
7 # The full license is in the file COPYING.txt, distributed with this software.
8 #
9 # SPDX-License-Identifier: Apache-2.0
10 #-----------------------------------------------------------------------------
11 #
12 # This rthook overrides pkgutil.iter_modules with custom implementation that uses PyInstaller's PyiFrozenImporter to
13 # list sub-modules embedded in the PYZ archive. The non-embedded modules (binary extensions, or .pyc modules in
14 # noarchive build) are handled by original pkgutil iter_modules implementation (and consequently, python's FileFinder).
15 #
16 # The preferred way of adding support for iter_modules would be adding non-standard iter_modules() method to
17 # PyiFrozenImporter itself. However, that seems to work only for path entry finders (for use with sys.path_hooks), while
18 # PyInstaller's PyiFrozenImporter is registered as meta path finders (for use with sys.meta_path). Turning
19 # PyiFrozenImporter into path entry finder, would seemingly require the latter to support on-filesystem resources
20 # (e.g., extension modules) in addition to PYZ-embedded ones.
21 #
22 # Therefore, we instead opt for overriding pkgutil.iter_modules with custom implementation that augments the output of
23 # original implementation with contents of PYZ archive from PyiFrozenImporter's TOC.
24
25
26 def _pyi_rthook():
27 import os
28 import pkgutil
29 import sys
30
31 from pyimod02_importers import PyiFrozenImporter
32
33 _orig_pkgutil_iter_modules = pkgutil.iter_modules
34
35 def _pyi_pkgutil_iter_modules(path=None, prefix=''):
36 # Use original implementation to discover on-filesystem modules (binary extensions in regular builds, or both
37 # binary extensions and compiled pyc modules in noarchive debug builds).
38 yield from _orig_pkgutil_iter_modules(path, prefix)
39
40 # Find the instance of PyInstaller's PyiFrozenImporter.
41 for importer in pkgutil.iter_importers():
42 if isinstance(importer, PyiFrozenImporter):
43 break
44 else:
45 return
46
47 if path is None:
48 # Search for all top-level packages/modules. These will have no dots in their entry names.
49 for entry in importer.toc:
50 if entry.count('.') != 0:
51 continue
52 is_pkg = importer.is_package(entry)
53 yield pkgutil.ModuleInfo(importer, prefix + entry, is_pkg)
54 else:
55 # Declare SYS_PREFIX locally, to avoid clash with eponymous global symbol from pyi_rth_pkgutil hook.
56 #
57 # Use os.path.realpath() to fully resolve any symbolic links in sys._MEIPASS, in order to avoid path
58 # mis-matches when the given search paths also contain symbolic links and are already fully resolved.
59 # See #6537 for an example of such a problem with onefile build on macOS, where the temporary directory
60 # is placed under /var, which is actually a symbolic link to /private/var.
61 SYS_PREFIX = os.path.realpath(sys._MEIPASS) + os.path.sep
62 SYS_PREFIXLEN = len(SYS_PREFIX)
63
64 for pkg_path in path:
65 # Fully resolve the given path, in case it contains symbolic links.
66 pkg_path = os.path.realpath(pkg_path)
67 if not pkg_path.startswith(SYS_PREFIX):
68 # If the path does not start with sys._MEIPASS, it cannot be a bundled package.
69 continue
70 # Construct package prefix from path...
71 pkg_prefix = pkg_path[SYS_PREFIXLEN:]
72 pkg_prefix = pkg_prefix.replace(os.path.sep, '.')
73 # ... and ensure it ends with a dot (so we can directly filter out the package itself).
74 if not pkg_prefix.endswith('.'):
75 pkg_prefix += '.'
76 pkg_prefix_len = len(pkg_prefix)
77
78 for entry in importer.toc:
79 if not entry.startswith(pkg_prefix):
80 continue
81 name = entry[pkg_prefix_len:]
82 if name.count('.') != 0:
83 continue
84 is_pkg = importer.is_package(entry)
85 yield pkgutil.ModuleInfo(importer, prefix + name, is_pkg)
86
87 pkgutil.iter_modules = _pyi_pkgutil_iter_modules
88
89
90 _pyi_rthook()
91 del _pyi_rthook
92
[end of PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py b/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py
--- a/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py
+++ b/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py
@@ -47,39 +47,39 @@
if path is None:
# Search for all top-level packages/modules. These will have no dots in their entry names.
for entry in importer.toc:
- if entry.count('.') != 0:
+ if "." in entry:
continue
is_pkg = importer.is_package(entry)
yield pkgutil.ModuleInfo(importer, prefix + entry, is_pkg)
else:
- # Declare SYS_PREFIX locally, to avoid clash with eponymous global symbol from pyi_rth_pkgutil hook.
- #
# Use os.path.realpath() to fully resolve any symbolic links in sys._MEIPASS, in order to avoid path
# mis-matches when the given search paths also contain symbolic links and are already fully resolved.
# See #6537 for an example of such a problem with onefile build on macOS, where the temporary directory
# is placed under /var, which is actually a symbolic link to /private/var.
- SYS_PREFIX = os.path.realpath(sys._MEIPASS) + os.path.sep
- SYS_PREFIXLEN = len(SYS_PREFIX)
+ MEIPASS = os.path.realpath(sys._MEIPASS)
for pkg_path in path:
# Fully resolve the given path, in case it contains symbolic links.
pkg_path = os.path.realpath(pkg_path)
- if not pkg_path.startswith(SYS_PREFIX):
- # If the path does not start with sys._MEIPASS, it cannot be a bundled package.
- continue
- # Construct package prefix from path...
- pkg_prefix = pkg_path[SYS_PREFIXLEN:]
- pkg_prefix = pkg_prefix.replace(os.path.sep, '.')
- # ... and ensure it ends with a dot (so we can directly filter out the package itself).
- if not pkg_prefix.endswith('.'):
- pkg_prefix += '.'
- pkg_prefix_len = len(pkg_prefix)
+ # Ensure it ends with os.path.sep (so we can directly filter out the package itself).
+ if not pkg_path.endswith(os.path.sep):
+ pkg_path += os.path.sep
for entry in importer.toc:
- if not entry.startswith(pkg_prefix):
+ # Get the path to the module, and resolve symbolic links. This implicitly solves the problem with
+ # macOS .app bundles and packages that contain data files, where package directory is fully
+ # collected into Contents/Resources, and symbolic link to directory is created in sys._MEIPASS
+ # (Contents/Frameworks). See #7884.
+ module_path = os.path.realpath(os.path.join(MEIPASS, entry.replace(".", os.path.sep)))
+
+ # If the module is not in the requested path, skip it.
+ if not module_path.startswith(pkg_path):
continue
- name = entry[pkg_prefix_len:]
- if name.count('.') != 0:
+
+ name = module_path[len(pkg_path):]
+
+ if os.path.sep in name:
+ # Not a direct child
continue
is_pkg = importer.is_package(entry)
yield pkgutil.ModuleInfo(importer, prefix + name, is_pkg)
|
{"golden_diff": "diff --git a/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py b/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py\n--- a/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py\n+++ b/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py\n@@ -47,39 +47,39 @@\n if path is None:\n # Search for all top-level packages/modules. These will have no dots in their entry names.\n for entry in importer.toc:\n- if entry.count('.') != 0:\n+ if \".\" in entry:\n continue\n is_pkg = importer.is_package(entry)\n yield pkgutil.ModuleInfo(importer, prefix + entry, is_pkg)\n else:\n- # Declare SYS_PREFIX locally, to avoid clash with eponymous global symbol from pyi_rth_pkgutil hook.\n- #\n # Use os.path.realpath() to fully resolve any symbolic links in sys._MEIPASS, in order to avoid path\n # mis-matches when the given search paths also contain symbolic links and are already fully resolved.\n # See #6537 for an example of such a problem with onefile build on macOS, where the temporary directory\n # is placed under /var, which is actually a symbolic link to /private/var.\n- SYS_PREFIX = os.path.realpath(sys._MEIPASS) + os.path.sep\n- SYS_PREFIXLEN = len(SYS_PREFIX)\n+ MEIPASS = os.path.realpath(sys._MEIPASS)\n \n for pkg_path in path:\n # Fully resolve the given path, in case it contains symbolic links.\n pkg_path = os.path.realpath(pkg_path)\n- if not pkg_path.startswith(SYS_PREFIX):\n- # If the path does not start with sys._MEIPASS, it cannot be a bundled package.\n- continue\n- # Construct package prefix from path...\n- pkg_prefix = pkg_path[SYS_PREFIXLEN:]\n- pkg_prefix = pkg_prefix.replace(os.path.sep, '.')\n- # ... and ensure it ends with a dot (so we can directly filter out the package itself).\n- if not pkg_prefix.endswith('.'):\n- pkg_prefix += '.'\n- pkg_prefix_len = len(pkg_prefix)\n+ # Ensure it ends with os.path.sep (so we can directly filter out the package itself).\n+ if not pkg_path.endswith(os.path.sep):\n+ pkg_path += os.path.sep\n \n for entry in importer.toc:\n- if not entry.startswith(pkg_prefix):\n+ # Get the path to the module, and resolve symbolic links. This implicitly solves the problem with\n+ # macOS .app bundles and packages that contain data files, where package directory is fully\n+ # collected into Contents/Resources, and symbolic link to directory is created in sys._MEIPASS\n+ # (Contents/Frameworks). See #7884.\n+ module_path = os.path.realpath(os.path.join(MEIPASS, entry.replace(\".\", os.path.sep)))\n+\n+ # If the module is not in the requested path, skip it.\n+ if not module_path.startswith(pkg_path):\n continue\n- name = entry[pkg_prefix_len:]\n- if name.count('.') != 0:\n+\n+ name = module_path[len(pkg_path):]\n+\n+ if os.path.sep in name:\n+ # Not a direct child\n continue\n is_pkg = importer.is_package(entry)\n yield pkgutil.ModuleInfo(importer, prefix + name, is_pkg)\n", "issue": "pkgutil.iter_modules is broken on MacOS\n## Description of the issue\r\n\r\nI am trying to build an application on MacOS that uses pkguilt.iter_modules to dynamically find and load modules however it is not finding any modules.\r\nThe modules are there and can be imported with importlib.import_module.\r\nNote that I am using PyInstaller with FBS but I don't believe the latter changes anything that would effect this.\r\n\r\nThe following is an example project structure\r\n```\r\nmy_package\r\n my_module_1\r\n my_module_2\r\n my_module_3\r\n```\r\n\r\nHere is the code that does not work\r\n```py\r\nimport importlib\r\nimport pkgutil\r\nm = importlib.import_module(\"my_package\")\r\nprint(\"Found nested modules\", list(pkgutil.iter_modules(m.__path__, m.__name__ + \".\")))\r\n```\r\n\r\nThe last line prints an empty list when built with PyInstaller.\r\n\r\nI have done a bit of a dive into the code and I believe this is a rather complex mixup with paths and symbolic links.\r\nhttps://github.com/pyinstaller/pyinstaller/blob/develop/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py\r\n\r\nIt looks like #6539 had a go at supporting symbolic links but it only resolves symbolic links up to the `_MEIPASS` directory.\r\n\r\nOn MacOS `_MEIPASS` is equal to `\"/path/to/my_package.app/Contents/MacOS/\"`\r\n\r\n`my_package.__path__` is equal to `[\"/path/to/my_package.app/Contents/MacOS/my_package\"]`\r\n\r\n`/path/to/my_package.app/Contents/MacOS/my_package` is a symbolic link to `/path/to/my_package.app/Contents/Resources/my_package` when there are data files present in that package.\r\n\r\nThe `iter_modules` hook expands symbolic links in the `path` variable which converts `\"/path/to/my_package.app/Contents/MacOS/my_package\"` to `\"/path/to/my_package.app/Contents/Resources/my_package\"`\r\n\r\nThe following code then skips over the directory because it does not start with `SYS_PREFIX`\r\n\r\n```py\r\n if not pkg_path.startswith(SYS_PREFIX):\r\n # If the path does not start with sys._MEIPASS, it cannot be a bundled package.\r\n continue\r\n```\r\n\r\nI don't know how this should be implemented but we need to resolve the expected path relative to the `_MEIPASS` directory and then expand symbolic links and only then skip if the package path does not start with the directory.\r\n\r\n\r\n### Context information (for bug reports)\r\n\r\n* Output of `pyinstaller --version`: ```5.13.0```\r\n* Version of Python: Python 3.11.4 (main, Aug 22 2023, 11:47:24) [Clang 14.0.3 (clang-1403.0.22.14.1)] on darwin\r\n* Platform: OS X\r\n* How you installed Python: pyenv\r\n* Did you also try this on another platform? Does it work there? This only effects MacOS as far as I am aware\r\n\n", "before_files": [{"content": "#-----------------------------------------------------------------------------\n# Copyright (c) 2021-2023, PyInstaller Development Team.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n#\n# The full license is in the file COPYING.txt, distributed with this software.\n#\n# SPDX-License-Identifier: Apache-2.0\n#-----------------------------------------------------------------------------\n#\n# This rthook overrides pkgutil.iter_modules with custom implementation that uses PyInstaller's PyiFrozenImporter to\n# list sub-modules embedded in the PYZ archive. The non-embedded modules (binary extensions, or .pyc modules in\n# noarchive build) are handled by original pkgutil iter_modules implementation (and consequently, python's FileFinder).\n#\n# The preferred way of adding support for iter_modules would be adding non-standard iter_modules() method to\n# PyiFrozenImporter itself. However, that seems to work only for path entry finders (for use with sys.path_hooks), while\n# PyInstaller's PyiFrozenImporter is registered as meta path finders (for use with sys.meta_path). Turning\n# PyiFrozenImporter into path entry finder, would seemingly require the latter to support on-filesystem resources\n# (e.g., extension modules) in addition to PYZ-embedded ones.\n#\n# Therefore, we instead opt for overriding pkgutil.iter_modules with custom implementation that augments the output of\n# original implementation with contents of PYZ archive from PyiFrozenImporter's TOC.\n\n\ndef _pyi_rthook():\n import os\n import pkgutil\n import sys\n\n from pyimod02_importers import PyiFrozenImporter\n\n _orig_pkgutil_iter_modules = pkgutil.iter_modules\n\n def _pyi_pkgutil_iter_modules(path=None, prefix=''):\n # Use original implementation to discover on-filesystem modules (binary extensions in regular builds, or both\n # binary extensions and compiled pyc modules in noarchive debug builds).\n yield from _orig_pkgutil_iter_modules(path, prefix)\n\n # Find the instance of PyInstaller's PyiFrozenImporter.\n for importer in pkgutil.iter_importers():\n if isinstance(importer, PyiFrozenImporter):\n break\n else:\n return\n\n if path is None:\n # Search for all top-level packages/modules. These will have no dots in their entry names.\n for entry in importer.toc:\n if entry.count('.') != 0:\n continue\n is_pkg = importer.is_package(entry)\n yield pkgutil.ModuleInfo(importer, prefix + entry, is_pkg)\n else:\n # Declare SYS_PREFIX locally, to avoid clash with eponymous global symbol from pyi_rth_pkgutil hook.\n #\n # Use os.path.realpath() to fully resolve any symbolic links in sys._MEIPASS, in order to avoid path\n # mis-matches when the given search paths also contain symbolic links and are already fully resolved.\n # See #6537 for an example of such a problem with onefile build on macOS, where the temporary directory\n # is placed under /var, which is actually a symbolic link to /private/var.\n SYS_PREFIX = os.path.realpath(sys._MEIPASS) + os.path.sep\n SYS_PREFIXLEN = len(SYS_PREFIX)\n\n for pkg_path in path:\n # Fully resolve the given path, in case it contains symbolic links.\n pkg_path = os.path.realpath(pkg_path)\n if not pkg_path.startswith(SYS_PREFIX):\n # If the path does not start with sys._MEIPASS, it cannot be a bundled package.\n continue\n # Construct package prefix from path...\n pkg_prefix = pkg_path[SYS_PREFIXLEN:]\n pkg_prefix = pkg_prefix.replace(os.path.sep, '.')\n # ... and ensure it ends with a dot (so we can directly filter out the package itself).\n if not pkg_prefix.endswith('.'):\n pkg_prefix += '.'\n pkg_prefix_len = len(pkg_prefix)\n\n for entry in importer.toc:\n if not entry.startswith(pkg_prefix):\n continue\n name = entry[pkg_prefix_len:]\n if name.count('.') != 0:\n continue\n is_pkg = importer.is_package(entry)\n yield pkgutil.ModuleInfo(importer, prefix + name, is_pkg)\n\n pkgutil.iter_modules = _pyi_pkgutil_iter_modules\n\n\n_pyi_rthook()\ndel _pyi_rthook\n", "path": "PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py"}]}
| 2,319 | 751 |
gh_patches_debug_16682
|
rasdani/github-patches
|
git_diff
|
netbox-community__netbox-9150
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Show full usernames when filtering
### NetBox version
v3.1.9
### Feature type
Change to existing functionality
### Proposed functionality
When using the filters to filter user-based (e.g. Journal and Changelog), the full user name should be displayed in brackets, instead of just the login name.
### Use case
Makes filtering in big installations easier
### Database changes
None, all data is already in netbox
### External dependencies
None
</issue>
<code>
[start of netbox/users/api/nested_serializers.py]
1 from django.contrib.auth.models import Group, User
2 from django.contrib.contenttypes.models import ContentType
3 from rest_framework import serializers
4
5 from netbox.api import ContentTypeField, WritableNestedSerializer
6 from users.models import ObjectPermission, Token
7
8 __all__ = [
9 'NestedGroupSerializer',
10 'NestedObjectPermissionSerializer',
11 'NestedTokenSerializer',
12 'NestedUserSerializer',
13 ]
14
15
16 class NestedGroupSerializer(WritableNestedSerializer):
17 url = serializers.HyperlinkedIdentityField(view_name='users-api:group-detail')
18
19 class Meta:
20 model = Group
21 fields = ['id', 'url', 'display', 'name']
22
23
24 class NestedUserSerializer(WritableNestedSerializer):
25 url = serializers.HyperlinkedIdentityField(view_name='users-api:user-detail')
26
27 class Meta:
28 model = User
29 fields = ['id', 'url', 'display', 'username']
30
31
32 class NestedTokenSerializer(WritableNestedSerializer):
33 url = serializers.HyperlinkedIdentityField(view_name='users-api:token-detail')
34
35 class Meta:
36 model = Token
37 fields = ['id', 'url', 'display', 'key', 'write_enabled']
38
39
40 class NestedObjectPermissionSerializer(WritableNestedSerializer):
41 url = serializers.HyperlinkedIdentityField(view_name='users-api:objectpermission-detail')
42 object_types = ContentTypeField(
43 queryset=ContentType.objects.all(),
44 many=True
45 )
46 groups = serializers.SerializerMethodField(read_only=True)
47 users = serializers.SerializerMethodField(read_only=True)
48
49 class Meta:
50 model = ObjectPermission
51 fields = ['id', 'url', 'display', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions']
52
53 def get_groups(self, obj):
54 return [g.name for g in obj.groups.all()]
55
56 def get_users(self, obj):
57 return [u.username for u in obj.users.all()]
58
[end of netbox/users/api/nested_serializers.py]
[start of netbox/users/api/serializers.py]
1 from django.contrib.auth.models import Group, User
2 from django.contrib.contenttypes.models import ContentType
3 from rest_framework import serializers
4
5 from netbox.api import ContentTypeField, SerializedPKRelatedField, ValidatedModelSerializer
6 from users.models import ObjectPermission, Token
7 from .nested_serializers import *
8
9
10 __all__ = (
11 'GroupSerializer',
12 'ObjectPermissionSerializer',
13 'TokenSerializer',
14 'UserSerializer',
15 )
16
17
18 class UserSerializer(ValidatedModelSerializer):
19 url = serializers.HyperlinkedIdentityField(view_name='users-api:user-detail')
20 groups = SerializedPKRelatedField(
21 queryset=Group.objects.all(),
22 serializer=NestedGroupSerializer,
23 required=False,
24 many=True
25 )
26
27 class Meta:
28 model = User
29 fields = (
30 'id', 'url', 'display', 'username', 'password', 'first_name', 'last_name', 'email', 'is_staff', 'is_active',
31 'date_joined', 'groups',
32 )
33 extra_kwargs = {
34 'password': {'write_only': True}
35 }
36
37 def create(self, validated_data):
38 """
39 Extract the password from validated data and set it separately to ensure proper hash generation.
40 """
41 password = validated_data.pop('password')
42 user = super().create(validated_data)
43 user.set_password(password)
44 user.save()
45
46 return user
47
48
49 class GroupSerializer(ValidatedModelSerializer):
50 url = serializers.HyperlinkedIdentityField(view_name='users-api:group-detail')
51 user_count = serializers.IntegerField(read_only=True)
52
53 class Meta:
54 model = Group
55 fields = ('id', 'url', 'display', 'name', 'user_count')
56
57
58 class TokenSerializer(ValidatedModelSerializer):
59 url = serializers.HyperlinkedIdentityField(view_name='users-api:token-detail')
60 key = serializers.CharField(min_length=40, max_length=40, allow_blank=True, required=False)
61 user = NestedUserSerializer()
62
63 class Meta:
64 model = Token
65 fields = ('id', 'url', 'display', 'user', 'created', 'expires', 'key', 'write_enabled', 'description')
66
67 def to_internal_value(self, data):
68 if 'key' not in data:
69 data['key'] = Token.generate_key()
70 return super().to_internal_value(data)
71
72
73 class TokenProvisionSerializer(serializers.Serializer):
74 username = serializers.CharField()
75 password = serializers.CharField()
76
77
78 class ObjectPermissionSerializer(ValidatedModelSerializer):
79 url = serializers.HyperlinkedIdentityField(view_name='users-api:objectpermission-detail')
80 object_types = ContentTypeField(
81 queryset=ContentType.objects.all(),
82 many=True
83 )
84 groups = SerializedPKRelatedField(
85 queryset=Group.objects.all(),
86 serializer=NestedGroupSerializer,
87 required=False,
88 many=True
89 )
90 users = SerializedPKRelatedField(
91 queryset=User.objects.all(),
92 serializer=NestedUserSerializer,
93 required=False,
94 many=True
95 )
96
97 class Meta:
98 model = ObjectPermission
99 fields = (
100 'id', 'url', 'display', 'name', 'description', 'enabled', 'object_types', 'groups', 'users', 'actions',
101 'constraints',
102 )
103
[end of netbox/users/api/serializers.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/netbox/users/api/nested_serializers.py b/netbox/users/api/nested_serializers.py
--- a/netbox/users/api/nested_serializers.py
+++ b/netbox/users/api/nested_serializers.py
@@ -28,6 +28,11 @@
model = User
fields = ['id', 'url', 'display', 'username']
+ def get_display(self, obj):
+ if full_name := obj.get_full_name():
+ return f"{obj.username} ({full_name})"
+ return obj.username
+
class NestedTokenSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='users-api:token-detail')
diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py
--- a/netbox/users/api/serializers.py
+++ b/netbox/users/api/serializers.py
@@ -44,6 +44,11 @@
user.save()
return user
+
+ def get_display(self, obj):
+ if full_name := obj.get_full_name():
+ return f"{obj.username} ({full_name})"
+ return obj.username
class GroupSerializer(ValidatedModelSerializer):
|
{"golden_diff": "diff --git a/netbox/users/api/nested_serializers.py b/netbox/users/api/nested_serializers.py\n--- a/netbox/users/api/nested_serializers.py\n+++ b/netbox/users/api/nested_serializers.py\n@@ -28,6 +28,11 @@\n model = User\n fields = ['id', 'url', 'display', 'username']\n \n+ def get_display(self, obj):\n+ if full_name := obj.get_full_name():\n+ return f\"{obj.username} ({full_name})\"\n+ return obj.username\n+\n \n class NestedTokenSerializer(WritableNestedSerializer):\n url = serializers.HyperlinkedIdentityField(view_name='users-api:token-detail')\ndiff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py\n--- a/netbox/users/api/serializers.py\n+++ b/netbox/users/api/serializers.py\n@@ -44,6 +44,11 @@\n user.save()\n \n return user\n+ \n+ def get_display(self, obj):\n+ if full_name := obj.get_full_name():\n+ return f\"{obj.username} ({full_name})\"\n+ return obj.username\n \n \n class GroupSerializer(ValidatedModelSerializer):\n", "issue": "Show full usernames when filtering\n### NetBox version\n\nv3.1.9\n\n### Feature type\n\nChange to existing functionality\n\n### Proposed functionality\n\nWhen using the filters to filter user-based (e.g. Journal and Changelog), the full user name should be displayed in brackets, instead of just the login name.\n\n### Use case\n\nMakes filtering in big installations easier\n\n### Database changes\n\nNone, all data is already in netbox\n\n### External dependencies\n\nNone\n", "before_files": [{"content": "from django.contrib.auth.models import Group, User\nfrom django.contrib.contenttypes.models import ContentType\nfrom rest_framework import serializers\n\nfrom netbox.api import ContentTypeField, WritableNestedSerializer\nfrom users.models import ObjectPermission, Token\n\n__all__ = [\n 'NestedGroupSerializer',\n 'NestedObjectPermissionSerializer',\n 'NestedTokenSerializer',\n 'NestedUserSerializer',\n]\n\n\nclass NestedGroupSerializer(WritableNestedSerializer):\n url = serializers.HyperlinkedIdentityField(view_name='users-api:group-detail')\n\n class Meta:\n model = Group\n fields = ['id', 'url', 'display', 'name']\n\n\nclass NestedUserSerializer(WritableNestedSerializer):\n url = serializers.HyperlinkedIdentityField(view_name='users-api:user-detail')\n\n class Meta:\n model = User\n fields = ['id', 'url', 'display', 'username']\n\n\nclass NestedTokenSerializer(WritableNestedSerializer):\n url = serializers.HyperlinkedIdentityField(view_name='users-api:token-detail')\n\n class Meta:\n model = Token\n fields = ['id', 'url', 'display', 'key', 'write_enabled']\n\n\nclass NestedObjectPermissionSerializer(WritableNestedSerializer):\n url = serializers.HyperlinkedIdentityField(view_name='users-api:objectpermission-detail')\n object_types = ContentTypeField(\n queryset=ContentType.objects.all(),\n many=True\n )\n groups = serializers.SerializerMethodField(read_only=True)\n users = serializers.SerializerMethodField(read_only=True)\n\n class Meta:\n model = ObjectPermission\n fields = ['id', 'url', 'display', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions']\n\n def get_groups(self, obj):\n return [g.name for g in obj.groups.all()]\n\n def get_users(self, obj):\n return [u.username for u in obj.users.all()]\n", "path": "netbox/users/api/nested_serializers.py"}, {"content": "from django.contrib.auth.models import Group, User\nfrom django.contrib.contenttypes.models import ContentType\nfrom rest_framework import serializers\n\nfrom netbox.api import ContentTypeField, SerializedPKRelatedField, ValidatedModelSerializer\nfrom users.models import ObjectPermission, Token\nfrom .nested_serializers import *\n\n\n__all__ = (\n 'GroupSerializer',\n 'ObjectPermissionSerializer',\n 'TokenSerializer',\n 'UserSerializer',\n)\n\n\nclass UserSerializer(ValidatedModelSerializer):\n url = serializers.HyperlinkedIdentityField(view_name='users-api:user-detail')\n groups = SerializedPKRelatedField(\n queryset=Group.objects.all(),\n serializer=NestedGroupSerializer,\n required=False,\n many=True\n )\n\n class Meta:\n model = User\n fields = (\n 'id', 'url', 'display', 'username', 'password', 'first_name', 'last_name', 'email', 'is_staff', 'is_active',\n 'date_joined', 'groups',\n )\n extra_kwargs = {\n 'password': {'write_only': True}\n }\n\n def create(self, validated_data):\n \"\"\"\n Extract the password from validated data and set it separately to ensure proper hash generation.\n \"\"\"\n password = validated_data.pop('password')\n user = super().create(validated_data)\n user.set_password(password)\n user.save()\n\n return user\n\n\nclass GroupSerializer(ValidatedModelSerializer):\n url = serializers.HyperlinkedIdentityField(view_name='users-api:group-detail')\n user_count = serializers.IntegerField(read_only=True)\n\n class Meta:\n model = Group\n fields = ('id', 'url', 'display', 'name', 'user_count')\n\n\nclass TokenSerializer(ValidatedModelSerializer):\n url = serializers.HyperlinkedIdentityField(view_name='users-api:token-detail')\n key = serializers.CharField(min_length=40, max_length=40, allow_blank=True, required=False)\n user = NestedUserSerializer()\n\n class Meta:\n model = Token\n fields = ('id', 'url', 'display', 'user', 'created', 'expires', 'key', 'write_enabled', 'description')\n\n def to_internal_value(self, data):\n if 'key' not in data:\n data['key'] = Token.generate_key()\n return super().to_internal_value(data)\n\n\nclass TokenProvisionSerializer(serializers.Serializer):\n username = serializers.CharField()\n password = serializers.CharField()\n\n\nclass ObjectPermissionSerializer(ValidatedModelSerializer):\n url = serializers.HyperlinkedIdentityField(view_name='users-api:objectpermission-detail')\n object_types = ContentTypeField(\n queryset=ContentType.objects.all(),\n many=True\n )\n groups = SerializedPKRelatedField(\n queryset=Group.objects.all(),\n serializer=NestedGroupSerializer,\n required=False,\n many=True\n )\n users = SerializedPKRelatedField(\n queryset=User.objects.all(),\n serializer=NestedUserSerializer,\n required=False,\n many=True\n )\n\n class Meta:\n model = ObjectPermission\n fields = (\n 'id', 'url', 'display', 'name', 'description', 'enabled', 'object_types', 'groups', 'users', 'actions',\n 'constraints',\n )\n", "path": "netbox/users/api/serializers.py"}]}
| 2,058 | 265 |
gh_patches_debug_4655
|
rasdani/github-patches
|
git_diff
|
chainer__chainer-289
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
`Function` which get no input cannot select `volatile`
In `Function.__call__`, it checks `volatile` of all input variables, and the same value is used. But, `Function` which get not argument such as `Parameter`, always selects `volatile=False`. it may causes conflict of volatility.
https://github.com/pfnet/chainer/blob/master/chainer/function.py#L132
`Parameter` always returns `False` here.
</issue>
<code>
[start of chainer/functions/parameter.py]
1 import numpy
2
3 from chainer import function
4 from chainer.utils import type_check
5
6
7 class Parameter(function.Function):
8
9 """Function that outputs its weight array.
10
11 This is a parameterized function that takes no input and returns a variable
12 holding a shallow copy of the parameter array.
13
14 Args:
15 array: Initial parameter array.
16
17 """
18 parameter_names = 'W',
19 gradient_names = 'gW',
20
21 def __init__(self, array):
22 self.W = array
23 self.gW = numpy.empty_like(array)
24
25 def check_type_forward(self, in_types):
26 type_check.expect(in_types.size() == 0)
27
28 def forward(self, x):
29 return self.W,
30
31 def backward(self, x, gy):
32 self.gW += gy[0]
33 return ()
34
[end of chainer/functions/parameter.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/chainer/functions/parameter.py b/chainer/functions/parameter.py
--- a/chainer/functions/parameter.py
+++ b/chainer/functions/parameter.py
@@ -22,6 +22,13 @@
self.W = array
self.gW = numpy.empty_like(array)
+ def __call__(self, volatile=False):
+ ret = super(Parameter, self).__call__()
+ if volatile:
+ ret.unchain_backward()
+ ret.volatile = volatile
+ return ret
+
def check_type_forward(self, in_types):
type_check.expect(in_types.size() == 0)
|
{"golden_diff": "diff --git a/chainer/functions/parameter.py b/chainer/functions/parameter.py\n--- a/chainer/functions/parameter.py\n+++ b/chainer/functions/parameter.py\n@@ -22,6 +22,13 @@\n self.W = array\n self.gW = numpy.empty_like(array)\n \n+ def __call__(self, volatile=False):\n+ ret = super(Parameter, self).__call__()\n+ if volatile:\n+ ret.unchain_backward()\n+ ret.volatile = volatile\n+ return ret\n+\n def check_type_forward(self, in_types):\n type_check.expect(in_types.size() == 0)\n", "issue": "`Function` which get no input cannot select `volatile`\nIn `Function.__call__`, it checks `volatile` of all input variables, and the same value is used. But, `Function` which get not argument such as `Parameter`, always selects `volatile=False`. it may causes conflict of volatility.\n\nhttps://github.com/pfnet/chainer/blob/master/chainer/function.py#L132\n`Parameter` always returns `False` here.\n\n", "before_files": [{"content": "import numpy\n\nfrom chainer import function\nfrom chainer.utils import type_check\n\n\nclass Parameter(function.Function):\n\n \"\"\"Function that outputs its weight array.\n\n This is a parameterized function that takes no input and returns a variable\n holding a shallow copy of the parameter array.\n\n Args:\n array: Initial parameter array.\n\n \"\"\"\n parameter_names = 'W',\n gradient_names = 'gW',\n\n def __init__(self, array):\n self.W = array\n self.gW = numpy.empty_like(array)\n\n def check_type_forward(self, in_types):\n type_check.expect(in_types.size() == 0)\n\n def forward(self, x):\n return self.W,\n\n def backward(self, x, gy):\n self.gW += gy[0]\n return ()\n", "path": "chainer/functions/parameter.py"}]}
| 865 | 137 |
gh_patches_debug_4060
|
rasdani/github-patches
|
git_diff
|
python-poetry__poetry-6824
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Exit code relay fails when run command is a script
<!--
Hi there! Thank you for submitting a bug report!
Before you submit your issue, please review and follow the instructions at
https://python-poetry.org/docs/contributing/#reporting-bugs. Fully fill out the template below; insufficient
information or bad reproduction instructions will impair the ability of others to help you.
-->
<!-- All the below information must be provided for others to understand and help with your issue. -->
- **Poetry version**: `1.2.2`
- **Python version**: `3.10.6`
- **OS version and name**: macOS 12.5.1
- **pyproject.toml**: Relevant details below
```
[tool.poetry.scripts]
toolname = "toolname.__main__:main"
```
<!-- All the below steps should be completed before submitting your issue. Checked checkbox should look like this: [x] -->
- [x] I am on the [latest](https://github.com/python-poetry/poetry/releases/latest) stable Poetry version, installed using a recommended method.
- [x] I have searched the [issues](https://github.com/python-poetry/poetry/issues) of this repo and believe that this is not a duplicate.
- [x] I have consulted the [FAQ](https://python-poetry.org/docs/faq/) and [blog](https://python-poetry.org/blog/) for any relevant entries or release notes.
- [x] If an exception occurs when executing a command, I executed it again in debug mode (`-vvv` option) and have included the output below.
## Issue
<!-- Now feel free to write your issue, and please be as descriptive as possible! Make sure to include detailed reproduction steps. -->
<!-- Thanks again 🙌 ❤ -->
Hi there,
When using `poetry run` to run a script defined in the [`scripts`](https://python-poetry.org/docs/pyproject/#scripts) section of `pyproject.toml` the exit code of the script is not relayed as the final exit code of `poetry` itself. I originally noticed https://github.com/python-poetry/poetry/issues/5773 and https://github.com/python-poetry/poetry/issues/2369 and was wondering why it wasn't working for me.
Consider the following cases:
```
$ poetry run python -m toolname --version
0.5.0
$ echo $?
1
```
```
$ poetry run toolname --version
0.5.0
$ echo $?
0
```
It looks like https://github.com/python-poetry/poetry/pull/4456 did not fix https://github.com/python-poetry/poetry/issues/2369 because these are different execution paths. Looking at [`commands/run.py`](https://github.com/python-poetry/poetry/blob/16046d9ac9b72a49e1bc4618fb686695cc64821c/src/poetry/console/commands/run.py#L61), running a script (as defined in `pyproject.toml`) is a different execution path than running non-scripts. As mentioned in https://github.com/python-poetry/poetry/issues/2369, I believe the fix would be:
`f"import_module('{module}').{callable_}()"` -> `f"sys.exit(import_module('{module}').{callable_}())"`
I made this change locally and it fixed this issue for me.
Alternatively, I believe another fix would be removing the `RunCommand.run_script` special-case code. Since `poetry` knows where the script is (`$VIRTUALENV/bin/`), it could include this directory in the `$PATH` when executing the command. `poetry` would then execute the script generated by [`builders/editable.py`](https://github.com/python-poetry/poetry/blob/master/src/poetry/masonry/builders/editable.py#L31).
There may be reasons these two code paths are distinct that I don't understand, but if they can be unified to a single path that would ease maintenance burden and help alleviate situations like this where one path is updated but the other is forgotten.
</issue>
<code>
[start of src/poetry/console/commands/run.py]
1 from __future__ import annotations
2
3 from typing import TYPE_CHECKING
4
5 from cleo.helpers import argument
6
7 from poetry.console.commands.env_command import EnvCommand
8
9
10 if TYPE_CHECKING:
11 from poetry.core.masonry.utils.module import Module
12
13
14 class RunCommand(EnvCommand):
15 name = "run"
16 description = "Runs a command in the appropriate environment."
17
18 arguments = [
19 argument("args", "The command and arguments/options to run.", multiple=True)
20 ]
21
22 def handle(self) -> int:
23 args = self.argument("args")
24 script = args[0]
25 scripts = self.poetry.local_config.get("scripts")
26
27 if scripts and script in scripts:
28 return self.run_script(scripts[script], args)
29
30 try:
31 return self.env.execute(*args)
32 except FileNotFoundError:
33 self.line_error(f"<error>Command not found: <c1>{script}</c1></error>")
34 return 1
35
36 @property
37 def _module(self) -> Module:
38 from poetry.core.masonry.utils.module import Module
39
40 poetry = self.poetry
41 package = poetry.package
42 path = poetry.file.parent
43 module = Module(package.name, path.as_posix(), package.packages)
44
45 return module
46
47 def run_script(self, script: str | dict[str, str], args: str) -> int:
48 if isinstance(script, dict):
49 script = script["callable"]
50
51 module, callable_ = script.split(":")
52
53 src_in_sys_path = "sys.path.append('src'); " if self._module.is_in_src() else ""
54
55 cmd = ["python", "-c"]
56
57 cmd += [
58 "import sys; "
59 "from importlib import import_module; "
60 f"sys.argv = {args!r}; {src_in_sys_path}"
61 f"import_module('{module}').{callable_}()"
62 ]
63
64 return self.env.execute(*cmd)
65
[end of src/poetry/console/commands/run.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/src/poetry/console/commands/run.py b/src/poetry/console/commands/run.py
--- a/src/poetry/console/commands/run.py
+++ b/src/poetry/console/commands/run.py
@@ -58,7 +58,7 @@
"import sys; "
"from importlib import import_module; "
f"sys.argv = {args!r}; {src_in_sys_path}"
- f"import_module('{module}').{callable_}()"
+ f"sys.exit(import_module('{module}').{callable_}())"
]
return self.env.execute(*cmd)
|
{"golden_diff": "diff --git a/src/poetry/console/commands/run.py b/src/poetry/console/commands/run.py\n--- a/src/poetry/console/commands/run.py\n+++ b/src/poetry/console/commands/run.py\n@@ -58,7 +58,7 @@\n \"import sys; \"\n \"from importlib import import_module; \"\n f\"sys.argv = {args!r}; {src_in_sys_path}\"\n- f\"import_module('{module}').{callable_}()\"\n+ f\"sys.exit(import_module('{module}').{callable_}())\"\n ]\n \n return self.env.execute(*cmd)\n", "issue": "Exit code relay fails when run command is a script\n<!--\r\n Hi there! Thank you for submitting a bug report!\r\n\r\n Before you submit your issue, please review and follow the instructions at\r\n https://python-poetry.org/docs/contributing/#reporting-bugs. Fully fill out the template below; insufficient\r\n information or bad reproduction instructions will impair the ability of others to help you.\r\n-->\r\n\r\n<!-- All the below information must be provided for others to understand and help with your issue. -->\r\n- **Poetry version**: `1.2.2`\r\n- **Python version**: `3.10.6`\r\n- **OS version and name**: macOS 12.5.1\r\n- **pyproject.toml**: Relevant details below\r\n\r\n```\r\n[tool.poetry.scripts]\r\ntoolname = \"toolname.__main__:main\"\r\n```\r\n\r\n<!-- All the below steps should be completed before submitting your issue. Checked checkbox should look like this: [x] -->\r\n- [x] I am on the [latest](https://github.com/python-poetry/poetry/releases/latest) stable Poetry version, installed using a recommended method.\r\n- [x] I have searched the [issues](https://github.com/python-poetry/poetry/issues) of this repo and believe that this is not a duplicate.\r\n- [x] I have consulted the [FAQ](https://python-poetry.org/docs/faq/) and [blog](https://python-poetry.org/blog/) for any relevant entries or release notes.\r\n- [x] If an exception occurs when executing a command, I executed it again in debug mode (`-vvv` option) and have included the output below.\r\n\r\n## Issue\r\n<!-- Now feel free to write your issue, and please be as descriptive as possible! Make sure to include detailed reproduction steps. -->\r\n<!-- Thanks again \ud83d\ude4c \u2764 -->\r\n\r\nHi there,\r\n\r\nWhen using `poetry run` to run a script defined in the [`scripts`](https://python-poetry.org/docs/pyproject/#scripts) section of `pyproject.toml` the exit code of the script is not relayed as the final exit code of `poetry` itself. I originally noticed https://github.com/python-poetry/poetry/issues/5773 and https://github.com/python-poetry/poetry/issues/2369 and was wondering why it wasn't working for me.\r\n\r\nConsider the following cases:\r\n\r\n```\r\n$ poetry run python -m toolname --version\r\n0.5.0\r\n$ echo $?\r\n1\r\n```\r\n\r\n```\r\n$ poetry run toolname --version\r\n0.5.0\r\n$ echo $?\r\n0\r\n```\r\n\r\nIt looks like https://github.com/python-poetry/poetry/pull/4456 did not fix https://github.com/python-poetry/poetry/issues/2369 because these are different execution paths. Looking at [`commands/run.py`](https://github.com/python-poetry/poetry/blob/16046d9ac9b72a49e1bc4618fb686695cc64821c/src/poetry/console/commands/run.py#L61), running a script (as defined in `pyproject.toml`) is a different execution path than running non-scripts. As mentioned in https://github.com/python-poetry/poetry/issues/2369, I believe the fix would be:\r\n\r\n`f\"import_module('{module}').{callable_}()\"` -> `f\"sys.exit(import_module('{module}').{callable_}())\"`\r\n\r\nI made this change locally and it fixed this issue for me.\r\n\r\nAlternatively, I believe another fix would be removing the `RunCommand.run_script` special-case code. Since `poetry` knows where the script is (`$VIRTUALENV/bin/`), it could include this directory in the `$PATH` when executing the command. `poetry` would then execute the script generated by [`builders/editable.py`](https://github.com/python-poetry/poetry/blob/master/src/poetry/masonry/builders/editable.py#L31).\r\n\r\nThere may be reasons these two code paths are distinct that I don't understand, but if they can be unified to a single path that would ease maintenance burden and help alleviate situations like this where one path is updated but the other is forgotten.\n", "before_files": [{"content": "from __future__ import annotations\n\nfrom typing import TYPE_CHECKING\n\nfrom cleo.helpers import argument\n\nfrom poetry.console.commands.env_command import EnvCommand\n\n\nif TYPE_CHECKING:\n from poetry.core.masonry.utils.module import Module\n\n\nclass RunCommand(EnvCommand):\n name = \"run\"\n description = \"Runs a command in the appropriate environment.\"\n\n arguments = [\n argument(\"args\", \"The command and arguments/options to run.\", multiple=True)\n ]\n\n def handle(self) -> int:\n args = self.argument(\"args\")\n script = args[0]\n scripts = self.poetry.local_config.get(\"scripts\")\n\n if scripts and script in scripts:\n return self.run_script(scripts[script], args)\n\n try:\n return self.env.execute(*args)\n except FileNotFoundError:\n self.line_error(f\"<error>Command not found: <c1>{script}</c1></error>\")\n return 1\n\n @property\n def _module(self) -> Module:\n from poetry.core.masonry.utils.module import Module\n\n poetry = self.poetry\n package = poetry.package\n path = poetry.file.parent\n module = Module(package.name, path.as_posix(), package.packages)\n\n return module\n\n def run_script(self, script: str | dict[str, str], args: str) -> int:\n if isinstance(script, dict):\n script = script[\"callable\"]\n\n module, callable_ = script.split(\":\")\n\n src_in_sys_path = \"sys.path.append('src'); \" if self._module.is_in_src() else \"\"\n\n cmd = [\"python\", \"-c\"]\n\n cmd += [\n \"import sys; \"\n \"from importlib import import_module; \"\n f\"sys.argv = {args!r}; {src_in_sys_path}\"\n f\"import_module('{module}').{callable_}()\"\n ]\n\n return self.env.execute(*cmd)\n", "path": "src/poetry/console/commands/run.py"}]}
| 1,992 | 137 |
gh_patches_debug_9064
|
rasdani/github-patches
|
git_diff
|
jupyterhub__zero-to-jupyterhub-k8s-250
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
add handling of init_containers to the default jupyterhub_config.py
While experimenting a bit with lifecycle hooks and init containers with kubespawner, I noticed that while lifecycle hooks are captured in the jupyterhub_config.py [here](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/master/images/hub/jupyterhub_config.py#L111-L113), there's not out-of-the-box handling for init-containers.
Does it make sense to add this to jupyterhub_config.py?
```
init_containers = get_config('singleuser.init-containers')
if init_containers:
c.KubeSpawner.singleuser_init_containers = init_containers
```
Let me know and I can send a PR.
</issue>
<code>
[start of images/hub/jupyterhub_config.py]
1 import os
2 import sys
3 import yaml
4 from tornado.httpclient import AsyncHTTPClient
5
6 def get_config(key, default=None):
7 """
8 Find a config item of a given name & return it
9
10 Parses everything as YAML, so lists and dicts are available too
11 """
12 path = os.path.join('/etc/jupyterhub/config', key)
13 try:
14 with open(path) as f:
15 data = yaml.safe_load(f)
16 print(key, data)
17 return data
18 except FileNotFoundError:
19 return default
20
21 def get_secret(key, default=None):
22 """Get a secret from /etc/jupyterhub/secret"""
23 path = os.path.join('/etc/jupyterhub/secret', key)
24 try:
25 with open(path) as f:
26 return f.read().strip()
27 except FileNotFoundError:
28 return default
29
30
31 # Configure JupyterHub to use the curl backend for making HTTP requests,
32 # rather than the pure-python implementations. The default one starts
33 # being too slow to make a large number of requests to the proxy API
34 # at the rate required.
35 AsyncHTTPClient.configure("tornado.curl_httpclient.CurlAsyncHTTPClient")
36
37 c.JupyterHub.spawner_class = 'kubespawner.KubeSpawner'
38
39 # Connect to a proxy running in a different pod
40 c.ConfigurableHTTPProxy.api_url = 'http://{}:{}'.format(os.environ['PROXY_API_SERVICE_HOST'], int(os.environ['PROXY_API_SERVICE_PORT']))
41 c.ConfigurableHTTPProxy.should_start = False
42
43 # Check that the proxy has routes appropriately setup
44 # This isn't the best named setting :D
45 c.JupyterHub.last_activity_interval = 60
46
47 # Max number of servers that can be spawning at any one time
48 c.JupyterHub.concurrent_spawn_limit = get_config('hub.concurrent-spawn-limit')
49
50 c.JupyterHub.ip = os.environ['PROXY_PUBLIC_SERVICE_HOST']
51 c.JupyterHub.port = int(os.environ['PROXY_PUBLIC_SERVICE_PORT'])
52
53 # the hub should listen on all interfaces, so the proxy can access it
54 c.JupyterHub.hub_ip = '0.0.0.0'
55
56 c.KubeSpawner.namespace = os.environ.get('POD_NAMESPACE', 'default')
57
58 # Sometimes disks take a while to attach, so let's keep a not-too-short timeout
59 c.KubeSpawner.start_timeout = 5 * 60
60
61 # Use env var for this, since we want hub to restart when this changes
62 c.KubeSpawner.singleuser_image_spec = os.environ['SINGLEUSER_IMAGE']
63
64 c.KubeSpawner.singleuser_extra_labels = get_config('singleuser.extra-labels', {})
65
66 c.KubeSpawner.singleuser_uid = get_config('singleuser.uid')
67 c.KubeSpawner.singleuser_fs_gid = get_config('singleuser.fs-gid')
68
69 # Configure dynamically provisioning pvc
70 storage_type = get_config('singleuser.storage.type')
71 if storage_type == 'dynamic':
72 c.KubeSpawner.pvc_name_template = 'claim-{username}{servername}'
73 c.KubeSpawner.user_storage_pvc_ensure = True
74 storage_class = get_config('singleuser.storage.dynamic.storage-class', None)
75 if storage_class:
76 c.KubeSpawner.user_storage_class = storage_class
77 c.KubeSpawner.user_storage_access_modes = ['ReadWriteOnce']
78 c.KubeSpawner.user_storage_capacity = get_config('singleuser.storage.capacity')
79
80 # Add volumes to singleuser pods
81 c.KubeSpawner.volumes = [
82 {
83 'name': 'volume-{username}{servername}',
84 'persistentVolumeClaim': {
85 'claimName': 'claim-{username}{servername}'
86 }
87 }
88 ]
89 c.KubeSpawner.volume_mounts = [
90 {
91 'mountPath': get_config('singleuser.storage.home_mount_path'),
92 'name': 'volume-{username}{servername}'
93 }
94 ]
95 elif storage_type == 'static':
96 pvc_claim_name = get_config('singleuser.storage.static.pvc-name')
97 c.KubeSpawner.volumes = [{
98 'name': 'home',
99 'persistentVolumeClaim': {
100 'claimName': pvc_claim_name
101 }
102 }]
103
104 c.KubeSpawner.volume_mounts = [{
105 'mountPath': get_config('singleuser.storage.home_mount_path'),
106 'name': 'home',
107 'subPath': get_config('singleuser.storage.static.sub-path')
108 }]
109
110 c.KubeSpawner.volumes.extend(get_config('singleuser.storage.extra-volumes', []))
111 c.KubeSpawner.volume_mounts.extend(get_config('singleuser.storage.extra-volume-mounts', []))
112
113 lifecycle_hooks = get_config('singleuser.lifecycle-hooks')
114 if lifecycle_hooks:
115 c.KubeSpawner.singleuser_lifecycle_hooks = lifecycle_hooks
116
117 # Gives spawned containers access to the API of the hub
118 c.KubeSpawner.hub_connect_ip = os.environ['HUB_SERVICE_HOST']
119 c.KubeSpawner.hub_connect_port = int(os.environ['HUB_SERVICE_PORT'])
120
121 c.JupyterHub.hub_connect_ip = os.environ['HUB_SERVICE_HOST']
122 c.JupyterHub.hub_connect_port = int(os.environ['HUB_SERVICE_PORT'])
123
124 c.KubeSpawner.mem_limit = get_config('singleuser.memory.limit')
125 c.KubeSpawner.mem_guarantee = get_config('singleuser.memory.guarantee')
126 c.KubeSpawner.cpu_limit = get_config('singleuser.cpu.limit')
127 c.KubeSpawner.cpu_guarantee = get_config('singleuser.cpu.guarantee')
128
129 # Allow switching authenticators easily
130 auth_type = get_config('auth.type')
131 email_domain = 'local'
132
133 if auth_type == 'google':
134 c.JupyterHub.authenticator_class = 'oauthenticator.GoogleOAuthenticator'
135 c.GoogleOAuthenticator.client_id = get_config('auth.google.client-id')
136 c.GoogleOAuthenticator.client_secret = get_config('auth.google.client-secret')
137 c.GoogleOAuthenticator.oauth_callback_url = get_config('auth.google.callback-url')
138 c.GoogleOAuthenticator.hosted_domain = get_config('auth.google.hosted-domain')
139 c.GoogleOAuthenticator.login_service = get_config('auth.google.login-service')
140 email_domain = get_config('auth.google.hosted-domain')
141 elif auth_type == 'github':
142 c.JupyterHub.authenticator_class = 'oauthenticator.GitHubOAuthenticator'
143 c.GitHubOAuthenticator.oauth_callback_url = get_config('auth.github.callback-url')
144 c.GitHubOAuthenticator.client_id = get_config('auth.github.client-id')
145 c.GitHubOAuthenticator.client_secret = get_config('auth.github.client-secret')
146 elif auth_type == 'cilogon':
147 c.JupyterHub.authenticator_class = 'oauthenticator.CILogonOAuthenticator'
148 c.CILogonOAuthenticator.oauth_callback_url = get_config('auth.cilogon.callback-url')
149 c.CILogonOAuthenticator.client_id = get_config('auth.cilogon.client-id')
150 c.CILogonOAuthenticator.client_secret = get_config('auth.cilogon.client-secret')
151 elif auth_type == 'gitlab':
152 c.JupyterHub.authenticator_class = 'oauthenticator.gitlab.GitLabOAuthenticator'
153 c.GitLabOAuthenticator.oauth_callback_url = get_config('auth.gitlab.callback-url')
154 c.GitLabOAuthenticator.client_id = get_config('auth.gitlab.client-id')
155 c.GitLabOAuthenticator.client_secret = get_config('auth.gitlab.client-secret')
156 elif auth_type == 'mediawiki':
157 c.JupyterHub.authenticator_class = 'oauthenticator.mediawiki.MWOAuthenticator'
158 c.MWOAuthenticator.client_id = get_config('auth.mediawiki.client-id')
159 c.MWOAuthenticator.client_secret = get_config('auth.mediawiki.client-secret')
160 c.MWOAuthenticator.index_url = get_config('auth.mediawiki.index-url')
161 elif auth_type == 'hmac':
162 c.JupyterHub.authenticator_class = 'hmacauthenticator.HMACAuthenticator'
163 c.HMACAuthenticator.secret_key = bytes.fromhex(get_config('auth.hmac.secret-key'))
164 elif auth_type == 'dummy':
165 c.JupyterHub.authenticator_class = 'dummyauthenticator.DummyAuthenticator'
166 c.DummyAuthenticator.password = get_config('auth.dummy.password', None)
167 elif auth_type == 'tmp':
168 c.JupyterHub.authenticator_class = 'tmpauthenticator.TmpAuthenticator'
169 elif auth_type == 'custom':
170 # full_class_name looks like "myauthenticator.MyAuthenticator".
171 # To create a docker image with this class availabe, you can just have the
172 # following Dockerifle:
173 # FROM jupyterhub/k8s-hub:v0.4
174 # RUN pip3 install myauthenticator
175 full_class_name = get_config('auth.custom.class-name')
176 c.JupyterHub.authenticator_class = full_class_name
177 auth_class_name = full_class_name.rsplit('.', 1)[-1]
178 auth_config = c[auth_class_name]
179 auth_config.update(get_config('auth.custom.config') or {})
180 else:
181 raise ValueError("Unhandled auth type: %r" % auth_type)
182
183
184 def generate_user_email(spawner):
185 """
186 Used as the EMAIL environment variable
187 """
188 return '{username}@{domain}'.format(
189 username=spawner.user.name, domain=email_domain
190 )
191
192 def generate_user_name(spawner):
193 """
194 Used as GIT_AUTHOR_NAME and GIT_COMMITTER_NAME environment variables
195 """
196 return spawner.user.name
197
198 c.KubeSpawner.environment = {
199 'EMAIL': generate_user_email,
200 # git requires these committer attributes
201 'GIT_AUTHOR_NAME': generate_user_name,
202 'GIT_COMMITTER_NAME': generate_user_name
203 }
204
205 c.KubeSpawner.environment.update(get_config('singleuser.extra-env', {}))
206
207 # Enable admins to access user servers
208 c.JupyterHub.admin_access = get_config('admin.access')
209
210
211 c.Authenticator.admin_users = get_config('admin.users', [])
212
213 c.Authenticator.whitelist = get_config('hub.whitelist.users', [])
214
215 c.JupyterHub.services = []
216
217 if get_config('cull.enabled', False):
218 cull_timeout = get_config('cull.timeout')
219 cull_every = get_config('cull.every')
220 cull_cmd = [
221 '/usr/local/bin/cull_idle_servers.py',
222 '--timeout=%s' % cull_timeout,
223 '--cull-every=%s' % cull_every,
224 ]
225 if get_config('cull.users'):
226 cull_cmd.append('--cull-users')
227 c.JupyterHub.services.append({
228 'name': 'cull-idle',
229 'admin': True,
230 'command': cull_cmd,
231 })
232
233 for name, service in get_config('hub.services', {}).items():
234 api_token = get_secret('services.token.%s' % name)
235 # jupyterhub.services is a list of dicts, but
236 # in the helm chart it is a dict of dicts for easier merged-config
237 service.setdefault('name', name)
238 if api_token:
239 service['api_token'] = api_token
240 c.JupyterHub.services.append(service)
241
242 c.JupyterHub.base_url = get_config('hub.base_url')
243
244 c.JupyterHub.db_url = get_config('hub.db_url')
245
246 cmd = get_config('singleuser.cmd', None)
247 if cmd:
248 c.Spawner.cmd = cmd
249
250
251 extra_config_path = '/etc/jupyterhub/config/hub.extra-config.py'
252 if os.path.exists(extra_config_path):
253 load_subconfig(extra_config_path)
254
[end of images/hub/jupyterhub_config.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/images/hub/jupyterhub_config.py b/images/hub/jupyterhub_config.py
--- a/images/hub/jupyterhub_config.py
+++ b/images/hub/jupyterhub_config.py
@@ -114,6 +114,10 @@
if lifecycle_hooks:
c.KubeSpawner.singleuser_lifecycle_hooks = lifecycle_hooks
+init_containers = get_config('singleuser.init-containers')
+if init_containers:
+ c.KubeSpawner.singleuser_init_containers = init_containers
+
# Gives spawned containers access to the API of the hub
c.KubeSpawner.hub_connect_ip = os.environ['HUB_SERVICE_HOST']
c.KubeSpawner.hub_connect_port = int(os.environ['HUB_SERVICE_PORT'])
|
{"golden_diff": "diff --git a/images/hub/jupyterhub_config.py b/images/hub/jupyterhub_config.py\n--- a/images/hub/jupyterhub_config.py\n+++ b/images/hub/jupyterhub_config.py\n@@ -114,6 +114,10 @@\n if lifecycle_hooks:\n c.KubeSpawner.singleuser_lifecycle_hooks = lifecycle_hooks\n \n+init_containers = get_config('singleuser.init-containers')\n+if init_containers:\n+ c.KubeSpawner.singleuser_init_containers = init_containers \n+\n # Gives spawned containers access to the API of the hub\n c.KubeSpawner.hub_connect_ip = os.environ['HUB_SERVICE_HOST']\n c.KubeSpawner.hub_connect_port = int(os.environ['HUB_SERVICE_PORT'])\n", "issue": "add handling of init_containers to the default jupyterhub_config.py\nWhile experimenting a bit with lifecycle hooks and init containers with kubespawner, I noticed that while lifecycle hooks are captured in the jupyterhub_config.py [here](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/master/images/hub/jupyterhub_config.py#L111-L113), there's not out-of-the-box handling for init-containers.\r\n\r\nDoes it make sense to add this to jupyterhub_config.py?\r\n```\r\ninit_containers = get_config('singleuser.init-containers')\r\nif init_containers:\r\n c.KubeSpawner.singleuser_init_containers = init_containers\r\n```\r\nLet me know and I can send a PR.\n", "before_files": [{"content": "import os\nimport sys\nimport yaml\nfrom tornado.httpclient import AsyncHTTPClient\n\ndef get_config(key, default=None):\n \"\"\"\n Find a config item of a given name & return it\n\n Parses everything as YAML, so lists and dicts are available too\n \"\"\"\n path = os.path.join('/etc/jupyterhub/config', key)\n try:\n with open(path) as f:\n data = yaml.safe_load(f)\n print(key, data)\n return data\n except FileNotFoundError:\n return default\n\ndef get_secret(key, default=None):\n \"\"\"Get a secret from /etc/jupyterhub/secret\"\"\"\n path = os.path.join('/etc/jupyterhub/secret', key)\n try:\n with open(path) as f:\n return f.read().strip()\n except FileNotFoundError:\n return default\n\n\n# Configure JupyterHub to use the curl backend for making HTTP requests,\n# rather than the pure-python implementations. The default one starts\n# being too slow to make a large number of requests to the proxy API\n# at the rate required.\nAsyncHTTPClient.configure(\"tornado.curl_httpclient.CurlAsyncHTTPClient\")\n\nc.JupyterHub.spawner_class = 'kubespawner.KubeSpawner'\n\n# Connect to a proxy running in a different pod\nc.ConfigurableHTTPProxy.api_url = 'http://{}:{}'.format(os.environ['PROXY_API_SERVICE_HOST'], int(os.environ['PROXY_API_SERVICE_PORT']))\nc.ConfigurableHTTPProxy.should_start = False\n\n# Check that the proxy has routes appropriately setup\n# This isn't the best named setting :D\nc.JupyterHub.last_activity_interval = 60\n\n# Max number of servers that can be spawning at any one time\nc.JupyterHub.concurrent_spawn_limit = get_config('hub.concurrent-spawn-limit')\n\nc.JupyterHub.ip = os.environ['PROXY_PUBLIC_SERVICE_HOST']\nc.JupyterHub.port = int(os.environ['PROXY_PUBLIC_SERVICE_PORT'])\n\n# the hub should listen on all interfaces, so the proxy can access it\nc.JupyterHub.hub_ip = '0.0.0.0'\n\nc.KubeSpawner.namespace = os.environ.get('POD_NAMESPACE', 'default')\n\n# Sometimes disks take a while to attach, so let's keep a not-too-short timeout\nc.KubeSpawner.start_timeout = 5 * 60\n\n# Use env var for this, since we want hub to restart when this changes\nc.KubeSpawner.singleuser_image_spec = os.environ['SINGLEUSER_IMAGE']\n\nc.KubeSpawner.singleuser_extra_labels = get_config('singleuser.extra-labels', {})\n\nc.KubeSpawner.singleuser_uid = get_config('singleuser.uid')\nc.KubeSpawner.singleuser_fs_gid = get_config('singleuser.fs-gid')\n\n# Configure dynamically provisioning pvc\nstorage_type = get_config('singleuser.storage.type')\nif storage_type == 'dynamic':\n c.KubeSpawner.pvc_name_template = 'claim-{username}{servername}'\n c.KubeSpawner.user_storage_pvc_ensure = True\n storage_class = get_config('singleuser.storage.dynamic.storage-class', None)\n if storage_class:\n c.KubeSpawner.user_storage_class = storage_class\n c.KubeSpawner.user_storage_access_modes = ['ReadWriteOnce']\n c.KubeSpawner.user_storage_capacity = get_config('singleuser.storage.capacity')\n\n # Add volumes to singleuser pods\n c.KubeSpawner.volumes = [\n {\n 'name': 'volume-{username}{servername}',\n 'persistentVolumeClaim': {\n 'claimName': 'claim-{username}{servername}'\n }\n }\n ]\n c.KubeSpawner.volume_mounts = [\n {\n 'mountPath': get_config('singleuser.storage.home_mount_path'),\n 'name': 'volume-{username}{servername}'\n }\n ]\nelif storage_type == 'static':\n pvc_claim_name = get_config('singleuser.storage.static.pvc-name')\n c.KubeSpawner.volumes = [{\n 'name': 'home',\n 'persistentVolumeClaim': {\n 'claimName': pvc_claim_name\n }\n }]\n\n c.KubeSpawner.volume_mounts = [{\n 'mountPath': get_config('singleuser.storage.home_mount_path'),\n 'name': 'home',\n 'subPath': get_config('singleuser.storage.static.sub-path')\n }]\n\nc.KubeSpawner.volumes.extend(get_config('singleuser.storage.extra-volumes', []))\nc.KubeSpawner.volume_mounts.extend(get_config('singleuser.storage.extra-volume-mounts', []))\n\nlifecycle_hooks = get_config('singleuser.lifecycle-hooks')\nif lifecycle_hooks:\n c.KubeSpawner.singleuser_lifecycle_hooks = lifecycle_hooks\n\n# Gives spawned containers access to the API of the hub\nc.KubeSpawner.hub_connect_ip = os.environ['HUB_SERVICE_HOST']\nc.KubeSpawner.hub_connect_port = int(os.environ['HUB_SERVICE_PORT'])\n\nc.JupyterHub.hub_connect_ip = os.environ['HUB_SERVICE_HOST']\nc.JupyterHub.hub_connect_port = int(os.environ['HUB_SERVICE_PORT'])\n\nc.KubeSpawner.mem_limit = get_config('singleuser.memory.limit')\nc.KubeSpawner.mem_guarantee = get_config('singleuser.memory.guarantee')\nc.KubeSpawner.cpu_limit = get_config('singleuser.cpu.limit')\nc.KubeSpawner.cpu_guarantee = get_config('singleuser.cpu.guarantee')\n\n# Allow switching authenticators easily\nauth_type = get_config('auth.type')\nemail_domain = 'local'\n\nif auth_type == 'google':\n c.JupyterHub.authenticator_class = 'oauthenticator.GoogleOAuthenticator'\n c.GoogleOAuthenticator.client_id = get_config('auth.google.client-id')\n c.GoogleOAuthenticator.client_secret = get_config('auth.google.client-secret')\n c.GoogleOAuthenticator.oauth_callback_url = get_config('auth.google.callback-url')\n c.GoogleOAuthenticator.hosted_domain = get_config('auth.google.hosted-domain')\n c.GoogleOAuthenticator.login_service = get_config('auth.google.login-service')\n email_domain = get_config('auth.google.hosted-domain')\nelif auth_type == 'github':\n c.JupyterHub.authenticator_class = 'oauthenticator.GitHubOAuthenticator'\n c.GitHubOAuthenticator.oauth_callback_url = get_config('auth.github.callback-url')\n c.GitHubOAuthenticator.client_id = get_config('auth.github.client-id')\n c.GitHubOAuthenticator.client_secret = get_config('auth.github.client-secret')\nelif auth_type == 'cilogon':\n c.JupyterHub.authenticator_class = 'oauthenticator.CILogonOAuthenticator'\n c.CILogonOAuthenticator.oauth_callback_url = get_config('auth.cilogon.callback-url')\n c.CILogonOAuthenticator.client_id = get_config('auth.cilogon.client-id')\n c.CILogonOAuthenticator.client_secret = get_config('auth.cilogon.client-secret')\nelif auth_type == 'gitlab':\n c.JupyterHub.authenticator_class = 'oauthenticator.gitlab.GitLabOAuthenticator'\n c.GitLabOAuthenticator.oauth_callback_url = get_config('auth.gitlab.callback-url')\n c.GitLabOAuthenticator.client_id = get_config('auth.gitlab.client-id')\n c.GitLabOAuthenticator.client_secret = get_config('auth.gitlab.client-secret')\nelif auth_type == 'mediawiki':\n c.JupyterHub.authenticator_class = 'oauthenticator.mediawiki.MWOAuthenticator'\n c.MWOAuthenticator.client_id = get_config('auth.mediawiki.client-id')\n c.MWOAuthenticator.client_secret = get_config('auth.mediawiki.client-secret')\n c.MWOAuthenticator.index_url = get_config('auth.mediawiki.index-url')\nelif auth_type == 'hmac':\n c.JupyterHub.authenticator_class = 'hmacauthenticator.HMACAuthenticator'\n c.HMACAuthenticator.secret_key = bytes.fromhex(get_config('auth.hmac.secret-key'))\nelif auth_type == 'dummy':\n c.JupyterHub.authenticator_class = 'dummyauthenticator.DummyAuthenticator'\n c.DummyAuthenticator.password = get_config('auth.dummy.password', None)\nelif auth_type == 'tmp':\n c.JupyterHub.authenticator_class = 'tmpauthenticator.TmpAuthenticator'\nelif auth_type == 'custom':\n # full_class_name looks like \"myauthenticator.MyAuthenticator\".\n # To create a docker image with this class availabe, you can just have the\n # following Dockerifle:\n # FROM jupyterhub/k8s-hub:v0.4\n # RUN pip3 install myauthenticator\n full_class_name = get_config('auth.custom.class-name')\n c.JupyterHub.authenticator_class = full_class_name\n auth_class_name = full_class_name.rsplit('.', 1)[-1]\n auth_config = c[auth_class_name]\n auth_config.update(get_config('auth.custom.config') or {})\nelse:\n raise ValueError(\"Unhandled auth type: %r\" % auth_type)\n\n\ndef generate_user_email(spawner):\n \"\"\"\n Used as the EMAIL environment variable\n \"\"\"\n return '{username}@{domain}'.format(\n username=spawner.user.name, domain=email_domain\n )\n\ndef generate_user_name(spawner):\n \"\"\"\n Used as GIT_AUTHOR_NAME and GIT_COMMITTER_NAME environment variables\n \"\"\"\n return spawner.user.name\n\nc.KubeSpawner.environment = {\n 'EMAIL': generate_user_email,\n # git requires these committer attributes\n 'GIT_AUTHOR_NAME': generate_user_name,\n 'GIT_COMMITTER_NAME': generate_user_name\n}\n\nc.KubeSpawner.environment.update(get_config('singleuser.extra-env', {}))\n\n# Enable admins to access user servers\nc.JupyterHub.admin_access = get_config('admin.access')\n\n\nc.Authenticator.admin_users = get_config('admin.users', [])\n\nc.Authenticator.whitelist = get_config('hub.whitelist.users', [])\n\nc.JupyterHub.services = []\n\nif get_config('cull.enabled', False):\n cull_timeout = get_config('cull.timeout')\n cull_every = get_config('cull.every')\n cull_cmd = [\n '/usr/local/bin/cull_idle_servers.py',\n '--timeout=%s' % cull_timeout,\n '--cull-every=%s' % cull_every,\n ]\n if get_config('cull.users'):\n cull_cmd.append('--cull-users')\n c.JupyterHub.services.append({\n 'name': 'cull-idle',\n 'admin': True,\n 'command': cull_cmd,\n })\n\nfor name, service in get_config('hub.services', {}).items():\n api_token = get_secret('services.token.%s' % name)\n # jupyterhub.services is a list of dicts, but\n # in the helm chart it is a dict of dicts for easier merged-config\n service.setdefault('name', name)\n if api_token:\n service['api_token'] = api_token\n c.JupyterHub.services.append(service)\n\nc.JupyterHub.base_url = get_config('hub.base_url')\n\nc.JupyterHub.db_url = get_config('hub.db_url')\n\ncmd = get_config('singleuser.cmd', None)\nif cmd:\n c.Spawner.cmd = cmd\n\n\nextra_config_path = '/etc/jupyterhub/config/hub.extra-config.py'\nif os.path.exists(extra_config_path):\n load_subconfig(extra_config_path)\n", "path": "images/hub/jupyterhub_config.py"}]}
| 3,804 | 165 |
gh_patches_debug_17544
|
rasdani/github-patches
|
git_diff
|
encode__httpx-1736
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Enforce that upload files must be binary, not text.
### Based on this discussion... https://github.com/encode/httpx/discussions/1704
<div type='discussions-op-text'>
<sup>Originally posted by **plotski** June 21, 2021</sup>
I just spent several hours debugging `LocalProtocolError("Too much data for declared Content-Length")`. I've figured out what's going on, but I don't know what the best fix would be or if this is entirely my own fault.
I was passing a `StringIO` object to a POST request, e.g.:
```python
>>> files = {'upload-file': ('foo', StringIO('cöntént of föö'))}
>>> r = httpx.post("https://httpbin.org/post", files=files)
```
The `StringIO` object ends up in `FileField.get_length()`, which calls `peek_filelike_length()`, which correctly reports the the length of the string. However, we must know the length of the string as `bytes` because that's what we need for the POST request.
The fix is very simple: Use `BytesIO` instead of `StringIO`. But the error message was extremely unhelpful.
Maybe `FileField` shouldn't accept a `StringIO` object? Or maybe it should convert to `bytes` first? Or maybe this is really obvious for anyone with more experience and there's no need to fix it?</div>
I'm fairly sure that the most sensible thing to do here is to raise an error on:
* Files opened in text mode.
* `StringIO` instances, used instead of `BytesIO` instances.
</issue>
<code>
[start of httpx/_types.py]
1 """
2 Type definitions for type checking purposes.
3 """
4
5 import ssl
6 from http.cookiejar import CookieJar
7 from typing import (
8 IO,
9 TYPE_CHECKING,
10 AsyncIterable,
11 Callable,
12 Dict,
13 Iterable,
14 List,
15 Mapping,
16 Optional,
17 Sequence,
18 Tuple,
19 Union,
20 )
21
22 if TYPE_CHECKING: # pragma: no cover
23 from ._auth import Auth # noqa: F401
24 from ._config import Proxy, Timeout # noqa: F401
25 from ._models import URL, Cookies, Headers, QueryParams, Request # noqa: F401
26
27
28 PrimitiveData = Optional[Union[str, int, float, bool]]
29
30 RawURL = Tuple[bytes, bytes, Optional[int], bytes]
31
32 URLTypes = Union["URL", str]
33
34 QueryParamTypes = Union[
35 "QueryParams",
36 Mapping[str, Union[PrimitiveData, Sequence[PrimitiveData]]],
37 List[Tuple[str, PrimitiveData]],
38 Tuple[Tuple[str, PrimitiveData], ...],
39 str,
40 bytes,
41 None,
42 ]
43
44 HeaderTypes = Union[
45 "Headers",
46 Dict[str, str],
47 Dict[bytes, bytes],
48 Sequence[Tuple[str, str]],
49 Sequence[Tuple[bytes, bytes]],
50 ]
51
52 CookieTypes = Union["Cookies", CookieJar, Dict[str, str], List[Tuple[str, str]]]
53
54 CertTypes = Union[
55 # certfile
56 str,
57 # (certfile, keyfile)
58 Tuple[str, Optional[str]],
59 # (certfile, keyfile, password)
60 Tuple[str, Optional[str], Optional[str]],
61 ]
62 VerifyTypes = Union[str, bool, ssl.SSLContext]
63 TimeoutTypes = Union[
64 Optional[float],
65 Tuple[Optional[float], Optional[float], Optional[float], Optional[float]],
66 "Timeout",
67 ]
68 ProxiesTypes = Union[URLTypes, "Proxy", Dict[URLTypes, Union[None, URLTypes, "Proxy"]]]
69
70 AuthTypes = Union[
71 Tuple[Union[str, bytes], Union[str, bytes]],
72 Callable[["Request"], "Request"],
73 "Auth",
74 None,
75 ]
76
77 RequestContent = Union[str, bytes, Iterable[bytes], AsyncIterable[bytes]]
78 ResponseContent = Union[str, bytes, Iterable[bytes], AsyncIterable[bytes]]
79
80 RequestData = dict
81
82 FileContent = Union[IO[str], IO[bytes], str, bytes]
83 FileTypes = Union[
84 # file (or text)
85 FileContent,
86 # (filename, file (or text))
87 Tuple[Optional[str], FileContent],
88 # (filename, file (or text), content_type)
89 Tuple[Optional[str], FileContent, Optional[str]],
90 ]
91 RequestFiles = Union[Mapping[str, FileTypes], Sequence[Tuple[str, FileTypes]]]
92
[end of httpx/_types.py]
[start of httpx/_multipart.py]
1 import binascii
2 import os
3 import typing
4 from pathlib import Path
5
6 from ._transports.base import AsyncByteStream, SyncByteStream
7 from ._types import FileContent, FileTypes, RequestFiles
8 from ._utils import (
9 format_form_param,
10 guess_content_type,
11 peek_filelike_length,
12 primitive_value_to_str,
13 to_bytes,
14 )
15
16
17 class DataField:
18 """
19 A single form field item, within a multipart form field.
20 """
21
22 def __init__(
23 self, name: str, value: typing.Union[str, bytes, int, float, None]
24 ) -> None:
25 if not isinstance(name, str):
26 raise TypeError(
27 f"Invalid type for name. Expected str, got {type(name)}: {name!r}"
28 )
29 if value is not None and not isinstance(value, (str, bytes, int, float)):
30 raise TypeError(
31 f"Invalid type for value. Expected primitive type, got {type(value)}: {value!r}"
32 )
33 self.name = name
34 self.value: typing.Union[str, bytes] = (
35 value if isinstance(value, bytes) else primitive_value_to_str(value)
36 )
37
38 def render_headers(self) -> bytes:
39 if not hasattr(self, "_headers"):
40 name = format_form_param("name", self.name)
41 self._headers = b"".join(
42 [b"Content-Disposition: form-data; ", name, b"\r\n\r\n"]
43 )
44
45 return self._headers
46
47 def render_data(self) -> bytes:
48 if not hasattr(self, "_data"):
49 self._data = to_bytes(self.value)
50
51 return self._data
52
53 def get_length(self) -> int:
54 headers = self.render_headers()
55 data = self.render_data()
56 return len(headers) + len(data)
57
58 def render(self) -> typing.Iterator[bytes]:
59 yield self.render_headers()
60 yield self.render_data()
61
62
63 class FileField:
64 """
65 A single file field item, within a multipart form field.
66 """
67
68 def __init__(self, name: str, value: FileTypes) -> None:
69 self.name = name
70
71 fileobj: FileContent
72
73 if isinstance(value, tuple):
74 try:
75 filename, fileobj, content_type = value # type: ignore
76 except ValueError:
77 filename, fileobj = value # type: ignore
78 content_type = guess_content_type(filename)
79 else:
80 filename = Path(str(getattr(value, "name", "upload"))).name
81 fileobj = value
82 content_type = guess_content_type(filename)
83
84 self.filename = filename
85 self.file = fileobj
86 self.content_type = content_type
87 self._consumed = False
88
89 def get_length(self) -> int:
90 headers = self.render_headers()
91
92 if isinstance(self.file, (str, bytes)):
93 return len(headers) + len(to_bytes(self.file))
94
95 # Let's do our best not to read `file` into memory.
96 file_length = peek_filelike_length(self.file)
97 if file_length is None:
98 # As a last resort, read file and cache contents for later.
99 assert not hasattr(self, "_data")
100 self._data = to_bytes(self.file.read())
101 file_length = len(self._data)
102
103 return len(headers) + file_length
104
105 def render_headers(self) -> bytes:
106 if not hasattr(self, "_headers"):
107 parts = [
108 b"Content-Disposition: form-data; ",
109 format_form_param("name", self.name),
110 ]
111 if self.filename:
112 filename = format_form_param("filename", self.filename)
113 parts.extend([b"; ", filename])
114 if self.content_type is not None:
115 content_type = self.content_type.encode()
116 parts.extend([b"\r\nContent-Type: ", content_type])
117 parts.append(b"\r\n\r\n")
118 self._headers = b"".join(parts)
119
120 return self._headers
121
122 def render_data(self) -> typing.Iterator[bytes]:
123 if isinstance(self.file, (str, bytes)):
124 yield to_bytes(self.file)
125 return
126
127 if hasattr(self, "_data"):
128 # Already rendered.
129 yield self._data
130 return
131
132 if self._consumed: # pragma: nocover
133 self.file.seek(0)
134 self._consumed = True
135
136 for chunk in self.file:
137 yield to_bytes(chunk)
138
139 def render(self) -> typing.Iterator[bytes]:
140 yield self.render_headers()
141 yield from self.render_data()
142
143
144 class MultipartStream(SyncByteStream, AsyncByteStream):
145 """
146 Request content as streaming multipart encoded form data.
147 """
148
149 def __init__(self, data: dict, files: RequestFiles, boundary: bytes = None) -> None:
150 if boundary is None:
151 boundary = binascii.hexlify(os.urandom(16))
152
153 self.boundary = boundary
154 self.content_type = "multipart/form-data; boundary=%s" % boundary.decode(
155 "ascii"
156 )
157 self.fields = list(self._iter_fields(data, files))
158
159 def _iter_fields(
160 self, data: dict, files: RequestFiles
161 ) -> typing.Iterator[typing.Union[FileField, DataField]]:
162 for name, value in data.items():
163 if isinstance(value, list):
164 for item in value:
165 yield DataField(name=name, value=item)
166 else:
167 yield DataField(name=name, value=value)
168
169 file_items = files.items() if isinstance(files, typing.Mapping) else files
170 for name, value in file_items:
171 yield FileField(name=name, value=value)
172
173 def iter_chunks(self) -> typing.Iterator[bytes]:
174 for field in self.fields:
175 yield b"--%s\r\n" % self.boundary
176 yield from field.render()
177 yield b"\r\n"
178 yield b"--%s--\r\n" % self.boundary
179
180 def iter_chunks_lengths(self) -> typing.Iterator[int]:
181 boundary_length = len(self.boundary)
182 # Follow closely what `.iter_chunks()` does.
183 for field in self.fields:
184 yield 2 + boundary_length + 2
185 yield field.get_length()
186 yield 2
187 yield 2 + boundary_length + 4
188
189 def get_content_length(self) -> int:
190 return sum(self.iter_chunks_lengths())
191
192 # Content stream interface.
193
194 def get_headers(self) -> typing.Dict[str, str]:
195 content_length = str(self.get_content_length())
196 content_type = self.content_type
197 return {"Content-Length": content_length, "Content-Type": content_type}
198
199 def __iter__(self) -> typing.Iterator[bytes]:
200 for chunk in self.iter_chunks():
201 yield chunk
202
203 async def __aiter__(self) -> typing.AsyncIterator[bytes]:
204 for chunk in self.iter_chunks():
205 yield chunk
206
[end of httpx/_multipart.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/httpx/_multipart.py b/httpx/_multipart.py
--- a/httpx/_multipart.py
+++ b/httpx/_multipart.py
@@ -1,4 +1,5 @@
import binascii
+import io
import os
import typing
from pathlib import Path
@@ -81,6 +82,9 @@
fileobj = value
content_type = guess_content_type(filename)
+ if isinstance(fileobj, str) or isinstance(fileobj, io.StringIO):
+ raise TypeError(f"Expected bytes or bytes-like object got: {type(fileobj)}")
+
self.filename = filename
self.file = fileobj
self.content_type = content_type
diff --git a/httpx/_types.py b/httpx/_types.py
--- a/httpx/_types.py
+++ b/httpx/_types.py
@@ -79,7 +79,7 @@
RequestData = dict
-FileContent = Union[IO[str], IO[bytes], str, bytes]
+FileContent = Union[IO[bytes], bytes]
FileTypes = Union[
# file (or text)
FileContent,
|
{"golden_diff": "diff --git a/httpx/_multipart.py b/httpx/_multipart.py\n--- a/httpx/_multipart.py\n+++ b/httpx/_multipart.py\n@@ -1,4 +1,5 @@\n import binascii\n+import io\n import os\n import typing\n from pathlib import Path\n@@ -81,6 +82,9 @@\n fileobj = value\n content_type = guess_content_type(filename)\n \n+ if isinstance(fileobj, str) or isinstance(fileobj, io.StringIO):\n+ raise TypeError(f\"Expected bytes or bytes-like object got: {type(fileobj)}\")\n+\n self.filename = filename\n self.file = fileobj\n self.content_type = content_type\ndiff --git a/httpx/_types.py b/httpx/_types.py\n--- a/httpx/_types.py\n+++ b/httpx/_types.py\n@@ -79,7 +79,7 @@\n \n RequestData = dict\n \n-FileContent = Union[IO[str], IO[bytes], str, bytes]\n+FileContent = Union[IO[bytes], bytes]\n FileTypes = Union[\n # file (or text)\n FileContent,\n", "issue": "Enforce that upload files must be binary, not text.\n### Based on this discussion... https://github.com/encode/httpx/discussions/1704\r\n\r\n<div type='discussions-op-text'>\r\n\r\n<sup>Originally posted by **plotski** June 21, 2021</sup>\r\nI just spent several hours debugging `LocalProtocolError(\"Too much data for declared Content-Length\")`. I've figured out what's going on, but I don't know what the best fix would be or if this is entirely my own fault.\r\n\r\nI was passing a `StringIO` object to a POST request, e.g.:\r\n\r\n```python\r\n>>> files = {'upload-file': ('foo', StringIO('c\u00f6nt\u00e9nt of f\u00f6\u00f6'))}\r\n>>> r = httpx.post(\"https://httpbin.org/post\", files=files)\r\n```\r\n\r\nThe `StringIO` object ends up in `FileField.get_length()`, which calls `peek_filelike_length()`, which correctly reports the the length of the string. However, we must know the length of the string as `bytes` because that's what we need for the POST request.\r\n\r\nThe fix is very simple: Use `BytesIO` instead of `StringIO`. But the error message was extremely unhelpful.\r\n\r\nMaybe `FileField` shouldn't accept a `StringIO` object? Or maybe it should convert to `bytes` first? Or maybe this is really obvious for anyone with more experience and there's no need to fix it?</div>\r\n\r\nI'm fairly sure that the most sensible thing to do here is to raise an error on:\r\n\r\n* Files opened in text mode.\r\n* `StringIO` instances, used instead of `BytesIO` instances.\n", "before_files": [{"content": "\"\"\"\nType definitions for type checking purposes.\n\"\"\"\n\nimport ssl\nfrom http.cookiejar import CookieJar\nfrom typing import (\n IO,\n TYPE_CHECKING,\n AsyncIterable,\n Callable,\n Dict,\n Iterable,\n List,\n Mapping,\n Optional,\n Sequence,\n Tuple,\n Union,\n)\n\nif TYPE_CHECKING: # pragma: no cover\n from ._auth import Auth # noqa: F401\n from ._config import Proxy, Timeout # noqa: F401\n from ._models import URL, Cookies, Headers, QueryParams, Request # noqa: F401\n\n\nPrimitiveData = Optional[Union[str, int, float, bool]]\n\nRawURL = Tuple[bytes, bytes, Optional[int], bytes]\n\nURLTypes = Union[\"URL\", str]\n\nQueryParamTypes = Union[\n \"QueryParams\",\n Mapping[str, Union[PrimitiveData, Sequence[PrimitiveData]]],\n List[Tuple[str, PrimitiveData]],\n Tuple[Tuple[str, PrimitiveData], ...],\n str,\n bytes,\n None,\n]\n\nHeaderTypes = Union[\n \"Headers\",\n Dict[str, str],\n Dict[bytes, bytes],\n Sequence[Tuple[str, str]],\n Sequence[Tuple[bytes, bytes]],\n]\n\nCookieTypes = Union[\"Cookies\", CookieJar, Dict[str, str], List[Tuple[str, str]]]\n\nCertTypes = Union[\n # certfile\n str,\n # (certfile, keyfile)\n Tuple[str, Optional[str]],\n # (certfile, keyfile, password)\n Tuple[str, Optional[str], Optional[str]],\n]\nVerifyTypes = Union[str, bool, ssl.SSLContext]\nTimeoutTypes = Union[\n Optional[float],\n Tuple[Optional[float], Optional[float], Optional[float], Optional[float]],\n \"Timeout\",\n]\nProxiesTypes = Union[URLTypes, \"Proxy\", Dict[URLTypes, Union[None, URLTypes, \"Proxy\"]]]\n\nAuthTypes = Union[\n Tuple[Union[str, bytes], Union[str, bytes]],\n Callable[[\"Request\"], \"Request\"],\n \"Auth\",\n None,\n]\n\nRequestContent = Union[str, bytes, Iterable[bytes], AsyncIterable[bytes]]\nResponseContent = Union[str, bytes, Iterable[bytes], AsyncIterable[bytes]]\n\nRequestData = dict\n\nFileContent = Union[IO[str], IO[bytes], str, bytes]\nFileTypes = Union[\n # file (or text)\n FileContent,\n # (filename, file (or text))\n Tuple[Optional[str], FileContent],\n # (filename, file (or text), content_type)\n Tuple[Optional[str], FileContent, Optional[str]],\n]\nRequestFiles = Union[Mapping[str, FileTypes], Sequence[Tuple[str, FileTypes]]]\n", "path": "httpx/_types.py"}, {"content": "import binascii\nimport os\nimport typing\nfrom pathlib import Path\n\nfrom ._transports.base import AsyncByteStream, SyncByteStream\nfrom ._types import FileContent, FileTypes, RequestFiles\nfrom ._utils import (\n format_form_param,\n guess_content_type,\n peek_filelike_length,\n primitive_value_to_str,\n to_bytes,\n)\n\n\nclass DataField:\n \"\"\"\n A single form field item, within a multipart form field.\n \"\"\"\n\n def __init__(\n self, name: str, value: typing.Union[str, bytes, int, float, None]\n ) -> None:\n if not isinstance(name, str):\n raise TypeError(\n f\"Invalid type for name. Expected str, got {type(name)}: {name!r}\"\n )\n if value is not None and not isinstance(value, (str, bytes, int, float)):\n raise TypeError(\n f\"Invalid type for value. Expected primitive type, got {type(value)}: {value!r}\"\n )\n self.name = name\n self.value: typing.Union[str, bytes] = (\n value if isinstance(value, bytes) else primitive_value_to_str(value)\n )\n\n def render_headers(self) -> bytes:\n if not hasattr(self, \"_headers\"):\n name = format_form_param(\"name\", self.name)\n self._headers = b\"\".join(\n [b\"Content-Disposition: form-data; \", name, b\"\\r\\n\\r\\n\"]\n )\n\n return self._headers\n\n def render_data(self) -> bytes:\n if not hasattr(self, \"_data\"):\n self._data = to_bytes(self.value)\n\n return self._data\n\n def get_length(self) -> int:\n headers = self.render_headers()\n data = self.render_data()\n return len(headers) + len(data)\n\n def render(self) -> typing.Iterator[bytes]:\n yield self.render_headers()\n yield self.render_data()\n\n\nclass FileField:\n \"\"\"\n A single file field item, within a multipart form field.\n \"\"\"\n\n def __init__(self, name: str, value: FileTypes) -> None:\n self.name = name\n\n fileobj: FileContent\n\n if isinstance(value, tuple):\n try:\n filename, fileobj, content_type = value # type: ignore\n except ValueError:\n filename, fileobj = value # type: ignore\n content_type = guess_content_type(filename)\n else:\n filename = Path(str(getattr(value, \"name\", \"upload\"))).name\n fileobj = value\n content_type = guess_content_type(filename)\n\n self.filename = filename\n self.file = fileobj\n self.content_type = content_type\n self._consumed = False\n\n def get_length(self) -> int:\n headers = self.render_headers()\n\n if isinstance(self.file, (str, bytes)):\n return len(headers) + len(to_bytes(self.file))\n\n # Let's do our best not to read `file` into memory.\n file_length = peek_filelike_length(self.file)\n if file_length is None:\n # As a last resort, read file and cache contents for later.\n assert not hasattr(self, \"_data\")\n self._data = to_bytes(self.file.read())\n file_length = len(self._data)\n\n return len(headers) + file_length\n\n def render_headers(self) -> bytes:\n if not hasattr(self, \"_headers\"):\n parts = [\n b\"Content-Disposition: form-data; \",\n format_form_param(\"name\", self.name),\n ]\n if self.filename:\n filename = format_form_param(\"filename\", self.filename)\n parts.extend([b\"; \", filename])\n if self.content_type is not None:\n content_type = self.content_type.encode()\n parts.extend([b\"\\r\\nContent-Type: \", content_type])\n parts.append(b\"\\r\\n\\r\\n\")\n self._headers = b\"\".join(parts)\n\n return self._headers\n\n def render_data(self) -> typing.Iterator[bytes]:\n if isinstance(self.file, (str, bytes)):\n yield to_bytes(self.file)\n return\n\n if hasattr(self, \"_data\"):\n # Already rendered.\n yield self._data\n return\n\n if self._consumed: # pragma: nocover\n self.file.seek(0)\n self._consumed = True\n\n for chunk in self.file:\n yield to_bytes(chunk)\n\n def render(self) -> typing.Iterator[bytes]:\n yield self.render_headers()\n yield from self.render_data()\n\n\nclass MultipartStream(SyncByteStream, AsyncByteStream):\n \"\"\"\n Request content as streaming multipart encoded form data.\n \"\"\"\n\n def __init__(self, data: dict, files: RequestFiles, boundary: bytes = None) -> None:\n if boundary is None:\n boundary = binascii.hexlify(os.urandom(16))\n\n self.boundary = boundary\n self.content_type = \"multipart/form-data; boundary=%s\" % boundary.decode(\n \"ascii\"\n )\n self.fields = list(self._iter_fields(data, files))\n\n def _iter_fields(\n self, data: dict, files: RequestFiles\n ) -> typing.Iterator[typing.Union[FileField, DataField]]:\n for name, value in data.items():\n if isinstance(value, list):\n for item in value:\n yield DataField(name=name, value=item)\n else:\n yield DataField(name=name, value=value)\n\n file_items = files.items() if isinstance(files, typing.Mapping) else files\n for name, value in file_items:\n yield FileField(name=name, value=value)\n\n def iter_chunks(self) -> typing.Iterator[bytes]:\n for field in self.fields:\n yield b\"--%s\\r\\n\" % self.boundary\n yield from field.render()\n yield b\"\\r\\n\"\n yield b\"--%s--\\r\\n\" % self.boundary\n\n def iter_chunks_lengths(self) -> typing.Iterator[int]:\n boundary_length = len(self.boundary)\n # Follow closely what `.iter_chunks()` does.\n for field in self.fields:\n yield 2 + boundary_length + 2\n yield field.get_length()\n yield 2\n yield 2 + boundary_length + 4\n\n def get_content_length(self) -> int:\n return sum(self.iter_chunks_lengths())\n\n # Content stream interface.\n\n def get_headers(self) -> typing.Dict[str, str]:\n content_length = str(self.get_content_length())\n content_type = self.content_type\n return {\"Content-Length\": content_length, \"Content-Type\": content_type}\n\n def __iter__(self) -> typing.Iterator[bytes]:\n for chunk in self.iter_chunks():\n yield chunk\n\n async def __aiter__(self) -> typing.AsyncIterator[bytes]:\n for chunk in self.iter_chunks():\n yield chunk\n", "path": "httpx/_multipart.py"}]}
| 3,665 | 244 |
gh_patches_debug_12161
|
rasdani/github-patches
|
git_diff
|
ckan__ckan-7483
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Pytest ckan_config does not override configurations from test.ini
## CKAN version
2.9, master
## Describe the bug
By configuring some variable in test.ini like `ckan.plugins` reduces duplication in tests themselves. However if test requires some other variable like different plugins, using `ckan_config` decorator does not override the variable from test.ini
### Steps to reproduce
Create tests with ckan.plugins set to something in test.ini
Implement a test with decorator:
@pytest.mark.ckan_config('ckan.plugins', 'some_plugin')
### Expected behavior
Test should use plugin given in decorator and not in test.ini
</issue>
<code>
[start of ckan/config/environment.py]
1 # encoding: utf-8
2 '''CKAN environment configuration'''
3 from __future__ import annotations
4
5 import os
6 import logging
7 import warnings
8 import pytz
9
10 from typing import Union, cast
11
12 import sqlalchemy
13 import sqlalchemy.exc
14
15 import ckan.model as model
16 import ckan.plugins as p
17 import ckan.lib.plugins as lib_plugins
18 import ckan.lib.helpers as helpers
19 import ckan.lib.app_globals as app_globals
20 from ckan.lib.redis import is_redis_available
21 import ckan.lib.search as search
22 import ckan.logic as logic
23 import ckan.authz as authz
24 from ckan.lib.webassets_tools import webassets_init
25 from ckan.lib.i18n import build_js_translations
26
27 from ckan.common import CKANConfig, config, config_declaration
28 from ckan.exceptions import CkanConfigurationException
29 from ckan.types import Config
30
31 log = logging.getLogger(__name__)
32
33 # Suppress benign warning 'Unbuilt egg for setuptools'
34 warnings.simplefilter('ignore', UserWarning)
35
36
37 def load_environment(conf: Union[Config, CKANConfig]):
38 """
39 Configure the Pylons environment via the ``pylons.config`` object. This
40 code should only need to be run once.
41 """
42 os.environ['CKAN_CONFIG'] = cast(str, conf['__file__'])
43
44 valid_base_public_folder_names = ['public', 'public-bs3']
45 static_files = conf.get('ckan.base_public_folder', 'public')
46 conf['ckan.base_public_folder'] = static_files
47
48 if static_files not in valid_base_public_folder_names:
49 raise CkanConfigurationException(
50 'You provided an invalid value for ckan.base_public_folder. '
51 'Possible values are: "public" and "public-bs3".'
52 )
53
54 log.info('Loading static files from %s' % static_files)
55
56 # Initialize main CKAN config object
57 config.update(conf)
58
59 # Setup the SQLAlchemy database engine
60 # Suppress a couple of sqlalchemy warnings
61 msgs = ['^Unicode type received non-unicode bind param value',
62 "^Did not recognize type 'BIGINT' of column 'size'",
63 "^Did not recognize type 'tsvector' of column 'search_vector'"
64 ]
65 for msg in msgs:
66 warnings.filterwarnings('ignore', msg, sqlalchemy.exc.SAWarning)
67
68 # load all CKAN plugins
69 p.load_all()
70
71 # Check Redis availability
72 if not is_redis_available():
73 log.critical('Could not connect to Redis.')
74
75 app_globals.reset()
76
77 # Build JavaScript translations. Must be done after plugins have
78 # been loaded.
79 build_js_translations()
80
81
82 # A mapping of config settings that can be overridden by env vars.
83 # Note: Do not remove the following lines, they are used in the docs
84 # Start CONFIG_FROM_ENV_VARS
85 CONFIG_FROM_ENV_VARS: dict[str, str] = {
86 'sqlalchemy.url': 'CKAN_SQLALCHEMY_URL',
87 'ckan.datastore.write_url': 'CKAN_DATASTORE_WRITE_URL',
88 'ckan.datastore.read_url': 'CKAN_DATASTORE_READ_URL',
89 'ckan.redis.url': 'CKAN_REDIS_URL',
90 'solr_url': 'CKAN_SOLR_URL',
91 'solr_user': 'CKAN_SOLR_USER',
92 'solr_password': 'CKAN_SOLR_PASSWORD',
93 'ckan.site_id': 'CKAN_SITE_ID',
94 'ckan.site_url': 'CKAN_SITE_URL',
95 'ckan.storage_path': 'CKAN_STORAGE_PATH',
96 'ckan.datapusher.url': 'CKAN_DATAPUSHER_URL',
97 'smtp.server': 'CKAN_SMTP_SERVER',
98 'smtp.starttls': 'CKAN_SMTP_STARTTLS',
99 'smtp.user': 'CKAN_SMTP_USER',
100 'smtp.password': 'CKAN_SMTP_PASSWORD',
101 'smtp.mail_from': 'CKAN_SMTP_MAIL_FROM',
102 'ckan.max_resource_size': 'CKAN_MAX_UPLOAD_SIZE_MB'
103 }
104 # End CONFIG_FROM_ENV_VARS
105
106
107 def update_config() -> None:
108 ''' This code needs to be run when the config is changed to take those
109 changes into account. It is called whenever a plugin is loaded as the
110 plugin might have changed the config values (for instance it might
111 change ckan.site_url) '''
112
113 config_declaration.setup()
114 config_declaration.make_safe(config)
115 config_declaration.normalize(config)
116
117 webassets_init()
118
119 for plugin in reversed(list(p.PluginImplementations(p.IConfigurer))):
120 # must do update in place as this does not work:
121 # config = plugin.update_config(config)
122 plugin.update_config(config)
123
124 for option in CONFIG_FROM_ENV_VARS:
125 from_env = os.environ.get(CONFIG_FROM_ENV_VARS[option], None)
126 if from_env:
127 config[option] = from_env
128
129 _, errors = config_declaration.validate(config)
130 if errors:
131 if config.get("config.mode") == "strict":
132 msg = "\n".join(
133 "{}: {}".format(key, "; ".join(issues))
134 for key, issues in errors.items()
135 )
136 msg = "Invalid configuration values provided:\n" + msg
137 raise CkanConfigurationException(msg)
138 else:
139 for key, issues in errors.items():
140 log.warning(
141 "Invalid value for %s (%s): %s",
142 key,
143 config.get(key),
144 "; ".join(issues)
145 )
146
147 root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
148
149 site_url = config.get('ckan.site_url')
150 if not site_url:
151 raise RuntimeError(
152 'ckan.site_url is not configured and it must have a value.'
153 ' Please amend your .ini file.')
154 if not site_url.lower().startswith('http'):
155 raise RuntimeError(
156 'ckan.site_url should be a full URL, including the schema '
157 '(http or https)')
158 # Remove backslash from site_url if present
159 config['ckan.site_url'] = site_url.rstrip('/')
160
161 display_timezone = config.get('ckan.display_timezone')
162 if (display_timezone and
163 display_timezone != 'server' and
164 display_timezone not in pytz.all_timezones):
165 raise CkanConfigurationException(
166 "ckan.display_timezone is not 'server' or a valid timezone"
167 )
168
169 # Init SOLR settings and check if the schema is compatible
170 # from ckan.lib.search import SolrSettings, check_solr_schema_version
171
172 # lib.search is imported here as we need the config enabled and parsed
173 search.SolrSettings.init(config.get('solr_url'),
174 config.get('solr_user'),
175 config.get('solr_password'))
176 search.check_solr_schema_version()
177
178 lib_plugins.reset_package_plugins()
179 lib_plugins.register_package_plugins()
180 lib_plugins.reset_group_plugins()
181 lib_plugins.register_group_plugins()
182
183 # initialise the globals
184 app_globals.app_globals._init()
185
186 helpers.load_plugin_helpers()
187
188 # Templates and CSS loading from configuration
189 valid_base_templates_folder_names = ['templates', 'templates-bs3']
190 templates = config.get('ckan.base_templates_folder')
191 config['ckan.base_templates_folder'] = templates
192
193 if templates not in valid_base_templates_folder_names:
194 raise CkanConfigurationException(
195 'You provided an invalid value for ckan.base_templates_folder. '
196 'Possible values are: "templates" and "templates-bs3".'
197 )
198
199 jinja2_templates_path = os.path.join(root, templates)
200 log.info('Loading templates from %s' % jinja2_templates_path)
201 template_paths = [jinja2_templates_path]
202
203 extra_template_paths = config.get('extra_template_paths')
204 if 'plugin_template_paths' in config:
205 template_paths = config['plugin_template_paths'] + template_paths
206 if extra_template_paths:
207 # must be first for them to override defaults
208 template_paths = extra_template_paths.split(',') + template_paths
209 config['computed_template_paths'] = template_paths
210
211 # Enable pessimistic disconnect handling (added in SQLAlchemy 1.2)
212 # to eliminate database errors due to stale pooled connections
213 config.setdefault('sqlalchemy.pool_pre_ping', True)
214 # Initialize SQLAlchemy
215 engine = sqlalchemy.engine_from_config(config)
216 model.init_model(engine)
217
218 for plugin in p.PluginImplementations(p.IConfigurable):
219 plugin.configure(config)
220
221 # clear other caches
222 logic.clear_actions_cache()
223 logic.clear_validators_cache()
224 authz.clear_auth_functions_cache()
225
226 # Here we create the site user if they are not already in the database
227 try:
228 logic.get_action('get_site_user')({'ignore_auth': True}, {})
229 except (sqlalchemy.exc.ProgrammingError, sqlalchemy.exc.OperationalError):
230 # The database is not yet initialised. It happens in `ckan db init`
231 pass
232 except sqlalchemy.exc.IntegrityError:
233 # Race condition, user already exists.
234 pass
235
236 # Close current session and open database connections to ensure a clean
237 # clean environment even if an error occurs later on
238 model.Session.remove()
239 model.Session.bind.dispose()
240
[end of ckan/config/environment.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/ckan/config/environment.py b/ckan/config/environment.py
--- a/ckan/config/environment.py
+++ b/ckan/config/environment.py
@@ -116,6 +116,14 @@
webassets_init()
+ # these are collections of all template/public paths registered by
+ # extensions. Each call to `tk.add_template_directory` or
+ # `tk.add_public_directory` updates these collections. We have to reset
+ # them in order to remove templates/public files that came from plugins
+ # that were once enabled but are disabled right now.
+ config["plugin_template_paths"] = []
+ config["plugin_public_paths"] = []
+
for plugin in reversed(list(p.PluginImplementations(p.IConfigurer))):
# must do update in place as this does not work:
# config = plugin.update_config(config)
|
{"golden_diff": "diff --git a/ckan/config/environment.py b/ckan/config/environment.py\n--- a/ckan/config/environment.py\n+++ b/ckan/config/environment.py\n@@ -116,6 +116,14 @@\n \n webassets_init()\n \n+ # these are collections of all template/public paths registered by\n+ # extensions. Each call to `tk.add_template_directory` or\n+ # `tk.add_public_directory` updates these collections. We have to reset\n+ # them in order to remove templates/public files that came from plugins\n+ # that were once enabled but are disabled right now.\n+ config[\"plugin_template_paths\"] = []\n+ config[\"plugin_public_paths\"] = []\n+\n for plugin in reversed(list(p.PluginImplementations(p.IConfigurer))):\n # must do update in place as this does not work:\n # config = plugin.update_config(config)\n", "issue": "Pytest ckan_config does not override configurations from test.ini\n## CKAN version\r\n2.9, master\r\n\r\n## Describe the bug\r\nBy configuring some variable in test.ini like `ckan.plugins` reduces duplication in tests themselves. However if test requires some other variable like different plugins, using `ckan_config` decorator does not override the variable from test.ini\r\n\r\n### Steps to reproduce\r\nCreate tests with ckan.plugins set to something in test.ini\r\nImplement a test with decorator:\r\[email protected]_config('ckan.plugins', 'some_plugin')\r\n\r\n### Expected behavior\r\nTest should use plugin given in decorator and not in test.ini\r\n\r\n\r\n\n", "before_files": [{"content": "# encoding: utf-8\n'''CKAN environment configuration'''\nfrom __future__ import annotations\n\nimport os\nimport logging\nimport warnings\nimport pytz\n\nfrom typing import Union, cast\n\nimport sqlalchemy\nimport sqlalchemy.exc\n\nimport ckan.model as model\nimport ckan.plugins as p\nimport ckan.lib.plugins as lib_plugins\nimport ckan.lib.helpers as helpers\nimport ckan.lib.app_globals as app_globals\nfrom ckan.lib.redis import is_redis_available\nimport ckan.lib.search as search\nimport ckan.logic as logic\nimport ckan.authz as authz\nfrom ckan.lib.webassets_tools import webassets_init\nfrom ckan.lib.i18n import build_js_translations\n\nfrom ckan.common import CKANConfig, config, config_declaration\nfrom ckan.exceptions import CkanConfigurationException\nfrom ckan.types import Config\n\nlog = logging.getLogger(__name__)\n\n# Suppress benign warning 'Unbuilt egg for setuptools'\nwarnings.simplefilter('ignore', UserWarning)\n\n\ndef load_environment(conf: Union[Config, CKANConfig]):\n \"\"\"\n Configure the Pylons environment via the ``pylons.config`` object. This\n code should only need to be run once.\n \"\"\"\n os.environ['CKAN_CONFIG'] = cast(str, conf['__file__'])\n\n valid_base_public_folder_names = ['public', 'public-bs3']\n static_files = conf.get('ckan.base_public_folder', 'public')\n conf['ckan.base_public_folder'] = static_files\n\n if static_files not in valid_base_public_folder_names:\n raise CkanConfigurationException(\n 'You provided an invalid value for ckan.base_public_folder. '\n 'Possible values are: \"public\" and \"public-bs3\".'\n )\n\n log.info('Loading static files from %s' % static_files)\n\n # Initialize main CKAN config object\n config.update(conf)\n\n # Setup the SQLAlchemy database engine\n # Suppress a couple of sqlalchemy warnings\n msgs = ['^Unicode type received non-unicode bind param value',\n \"^Did not recognize type 'BIGINT' of column 'size'\",\n \"^Did not recognize type 'tsvector' of column 'search_vector'\"\n ]\n for msg in msgs:\n warnings.filterwarnings('ignore', msg, sqlalchemy.exc.SAWarning)\n\n # load all CKAN plugins\n p.load_all()\n\n # Check Redis availability\n if not is_redis_available():\n log.critical('Could not connect to Redis.')\n\n app_globals.reset()\n\n # Build JavaScript translations. Must be done after plugins have\n # been loaded.\n build_js_translations()\n\n\n# A mapping of config settings that can be overridden by env vars.\n# Note: Do not remove the following lines, they are used in the docs\n# Start CONFIG_FROM_ENV_VARS\nCONFIG_FROM_ENV_VARS: dict[str, str] = {\n 'sqlalchemy.url': 'CKAN_SQLALCHEMY_URL',\n 'ckan.datastore.write_url': 'CKAN_DATASTORE_WRITE_URL',\n 'ckan.datastore.read_url': 'CKAN_DATASTORE_READ_URL',\n 'ckan.redis.url': 'CKAN_REDIS_URL',\n 'solr_url': 'CKAN_SOLR_URL',\n 'solr_user': 'CKAN_SOLR_USER',\n 'solr_password': 'CKAN_SOLR_PASSWORD',\n 'ckan.site_id': 'CKAN_SITE_ID',\n 'ckan.site_url': 'CKAN_SITE_URL',\n 'ckan.storage_path': 'CKAN_STORAGE_PATH',\n 'ckan.datapusher.url': 'CKAN_DATAPUSHER_URL',\n 'smtp.server': 'CKAN_SMTP_SERVER',\n 'smtp.starttls': 'CKAN_SMTP_STARTTLS',\n 'smtp.user': 'CKAN_SMTP_USER',\n 'smtp.password': 'CKAN_SMTP_PASSWORD',\n 'smtp.mail_from': 'CKAN_SMTP_MAIL_FROM',\n 'ckan.max_resource_size': 'CKAN_MAX_UPLOAD_SIZE_MB'\n}\n# End CONFIG_FROM_ENV_VARS\n\n\ndef update_config() -> None:\n ''' This code needs to be run when the config is changed to take those\n changes into account. It is called whenever a plugin is loaded as the\n plugin might have changed the config values (for instance it might\n change ckan.site_url) '''\n\n config_declaration.setup()\n config_declaration.make_safe(config)\n config_declaration.normalize(config)\n\n webassets_init()\n\n for plugin in reversed(list(p.PluginImplementations(p.IConfigurer))):\n # must do update in place as this does not work:\n # config = plugin.update_config(config)\n plugin.update_config(config)\n\n for option in CONFIG_FROM_ENV_VARS:\n from_env = os.environ.get(CONFIG_FROM_ENV_VARS[option], None)\n if from_env:\n config[option] = from_env\n\n _, errors = config_declaration.validate(config)\n if errors:\n if config.get(\"config.mode\") == \"strict\":\n msg = \"\\n\".join(\n \"{}: {}\".format(key, \"; \".join(issues))\n for key, issues in errors.items()\n )\n msg = \"Invalid configuration values provided:\\n\" + msg\n raise CkanConfigurationException(msg)\n else:\n for key, issues in errors.items():\n log.warning(\n \"Invalid value for %s (%s): %s\",\n key,\n config.get(key),\n \"; \".join(issues)\n )\n\n root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))\n\n site_url = config.get('ckan.site_url')\n if not site_url:\n raise RuntimeError(\n 'ckan.site_url is not configured and it must have a value.'\n ' Please amend your .ini file.')\n if not site_url.lower().startswith('http'):\n raise RuntimeError(\n 'ckan.site_url should be a full URL, including the schema '\n '(http or https)')\n # Remove backslash from site_url if present\n config['ckan.site_url'] = site_url.rstrip('/')\n\n display_timezone = config.get('ckan.display_timezone')\n if (display_timezone and\n display_timezone != 'server' and\n display_timezone not in pytz.all_timezones):\n raise CkanConfigurationException(\n \"ckan.display_timezone is not 'server' or a valid timezone\"\n )\n\n # Init SOLR settings and check if the schema is compatible\n # from ckan.lib.search import SolrSettings, check_solr_schema_version\n\n # lib.search is imported here as we need the config enabled and parsed\n search.SolrSettings.init(config.get('solr_url'),\n config.get('solr_user'),\n config.get('solr_password'))\n search.check_solr_schema_version()\n\n lib_plugins.reset_package_plugins()\n lib_plugins.register_package_plugins()\n lib_plugins.reset_group_plugins()\n lib_plugins.register_group_plugins()\n\n # initialise the globals\n app_globals.app_globals._init()\n\n helpers.load_plugin_helpers()\n\n # Templates and CSS loading from configuration\n valid_base_templates_folder_names = ['templates', 'templates-bs3']\n templates = config.get('ckan.base_templates_folder')\n config['ckan.base_templates_folder'] = templates\n\n if templates not in valid_base_templates_folder_names:\n raise CkanConfigurationException(\n 'You provided an invalid value for ckan.base_templates_folder. '\n 'Possible values are: \"templates\" and \"templates-bs3\".'\n )\n\n jinja2_templates_path = os.path.join(root, templates)\n log.info('Loading templates from %s' % jinja2_templates_path)\n template_paths = [jinja2_templates_path]\n\n extra_template_paths = config.get('extra_template_paths')\n if 'plugin_template_paths' in config:\n template_paths = config['plugin_template_paths'] + template_paths\n if extra_template_paths:\n # must be first for them to override defaults\n template_paths = extra_template_paths.split(',') + template_paths\n config['computed_template_paths'] = template_paths\n\n # Enable pessimistic disconnect handling (added in SQLAlchemy 1.2)\n # to eliminate database errors due to stale pooled connections\n config.setdefault('sqlalchemy.pool_pre_ping', True)\n # Initialize SQLAlchemy\n engine = sqlalchemy.engine_from_config(config)\n model.init_model(engine)\n\n for plugin in p.PluginImplementations(p.IConfigurable):\n plugin.configure(config)\n\n # clear other caches\n logic.clear_actions_cache()\n logic.clear_validators_cache()\n authz.clear_auth_functions_cache()\n\n # Here we create the site user if they are not already in the database\n try:\n logic.get_action('get_site_user')({'ignore_auth': True}, {})\n except (sqlalchemy.exc.ProgrammingError, sqlalchemy.exc.OperationalError):\n # The database is not yet initialised. It happens in `ckan db init`\n pass\n except sqlalchemy.exc.IntegrityError:\n # Race condition, user already exists.\n pass\n\n # Close current session and open database connections to ensure a clean\n # clean environment even if an error occurs later on\n model.Session.remove()\n model.Session.bind.dispose()\n", "path": "ckan/config/environment.py"}]}
| 3,227 | 192 |
gh_patches_debug_31630
|
rasdani/github-patches
|
git_diff
|
Pyomo__pyomo-1271
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
bug in pynumero example: sensitivity.py
It seems like the [sensitivity.py](https://github.com/Pyomo/pyomo/blob/master/pyomo/contrib/pynumero/examples/sensitivity.py) code is not calculating the sensitivity correctly. The sensitivity based x_new is a bit different from the result obtained by solving the perturbed NLP in the code. The cause of this seems to be the creation of `Np`
```
Np = BlockMatrix(2, 1)
Np[0, 0] = nlp.extract_submatrix_hessian_lag(pyomo_variables_rows=nlp.get_pyomo_variables(), pyomo_variables_cols=[m.eta1, m.eta2])
Np[1, 0] = nlp.extract_submatrix_jacobian(pyomo_variables=[m.eta1, m.eta2], pyomo_constraints=nlp.get_pyomo_constraints())
```
It seems that in this example Np should be 9x2 matrix with all zeros except elements (8, 1) and (9, 2) which should be one (based on eq 13 in this [reference paper](http://www.optimization-online.org/DB_FILE/2011/04/3008.pdf)).
I have a [jupyter notebook](https://github.com/notesofdabbler/learn_pyomo/blob/master/wk_pynumero/wk_sensitivity.ipynb) that recreates this example and the proposed modification which seems to fix the issue.
</issue>
<code>
[start of pyomo/contrib/pynumero/examples/sensitivity.py]
1 # ___________________________________________________________________________
2 #
3 # Pyomo: Python Optimization Modeling Objects
4 # Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5 # Under the terms of Contract DE-NA0003525 with National Technology and
6 # Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7 # rights in this software.
8 # This software is distributed under the 3-clause BSD License.
9 # ___________________________________________________________________________
10 import pyomo.environ as pyo
11 from pyomo.contrib.pynumero.interfaces.pyomo_nlp import PyomoNLP
12 from pyomo.contrib.pynumero.sparse import BlockSymMatrix, BlockMatrix, BlockVector
13 from scipy.sparse import identity
14 from scipy.sparse.linalg import spsolve
15 import numpy as np
16
17
18 def create_model(eta1, eta2):
19 model = pyo.ConcreteModel()
20 # variables
21 model.x1 = pyo.Var(initialize=0.15)
22 model.x2 = pyo.Var(initialize=0.15)
23 model.x3 = pyo.Var(initialize=0.0)
24 # parameters
25 model.eta1 = pyo.Var()
26 model.eta2 = pyo.Var()
27
28 model.nominal_eta1 = pyo.Param(initialize=eta1, mutable=True)
29 model.nominal_eta2 = pyo.Param(initialize=eta2, mutable=True)
30
31 # constraints + objective
32 model.const1 = pyo.Constraint(expr=6*model.x1+3*model.x2+2*model.x3 - model.eta1 == 0)
33 model.const2 = pyo.Constraint(expr=model.eta2*model.x1+model.x2-model.x3-1 == 0)
34 model.cost = pyo.Objective(expr=model.x1**2 + model.x2**2 + model.x3**2)
35 model.consteta1 = pyo.Constraint(expr=model.eta1 == model.nominal_eta1)
36 model.consteta2 = pyo.Constraint(expr=model.eta2 == model.nominal_eta2)
37
38 return model
39
40 def compute_init_lam(nlp, x=None, lam_max=1e3):
41 if x is None:
42 x = nlp.init_primals()
43 else:
44 assert x.size == nlp.n_primals()
45 nlp.set_primals(x)
46
47 assert nlp.n_ineq_constraints() == 0, "only supported for equality constrained nlps for now"
48
49 nx = nlp.n_primals()
50 nc = nlp.n_constraints()
51
52 # create Jacobian
53 jac = nlp.evaluate_jacobian()
54
55 # create gradient of objective
56 df = nlp.evaluate_grad_objective()
57
58 # create KKT system
59 kkt = BlockSymMatrix(2)
60 kkt[0, 0] = identity(nx)
61 kkt[1, 0] = jac
62
63 zeros = np.zeros(nc)
64 rhs = BlockVector([-df, zeros])
65
66 flat_kkt = kkt.tocoo().tocsc()
67 flat_rhs = rhs.flatten()
68
69 sol = spsolve(flat_kkt, flat_rhs)
70 return sol[nlp.n_primals() : nlp.n_primals() + nlp.n_constraints()]
71
72 #################################################################
73 m = create_model(4.5, 1.0)
74 opt = pyo.SolverFactory('ipopt')
75 results = opt.solve(m, tee=True)
76
77 #################################################################
78 nlp = PyomoNLP(m)
79 x = nlp.init_primals()
80 y = compute_init_lam(nlp, x=x)
81 nlp.set_primals(x)
82 nlp.set_duals(y)
83
84 J = nlp.evaluate_jacobian()
85 H = nlp.evaluate_hessian_lag()
86
87 M = BlockSymMatrix(2)
88 M[0, 0] = H
89 M[1, 0] = J
90
91 Np = BlockMatrix(2, 1)
92 Np[0, 0] = nlp.extract_submatrix_hessian_lag(pyomo_variables_rows=nlp.get_pyomo_variables(), pyomo_variables_cols=[m.eta1, m.eta2])
93 Np[1, 0] = nlp.extract_submatrix_jacobian(pyomo_variables=[m.eta1, m.eta2], pyomo_constraints=nlp.get_pyomo_constraints())
94
95 ds = spsolve(M.tocsc(), Np.tocsc())
96 print(nlp.variable_names())
97
98 #################################################################
99
100 p0 = np.array([pyo.value(m.nominal_eta1), pyo.value(m.nominal_eta2)])
101 p = np.array([4.45, 1.05])
102 dp = p - p0
103 dx = ds.dot(dp)[0:nlp.n_primals()]
104 new_x = x + dx
105 print(new_x)
106
107 #################################################################
108 m = create_model(4.45, 1.05)
109 opt = pyo.SolverFactory('ipopt')
110 results = opt.solve(m, tee=True)
111 nlp = PyomoNLP(m)
112 print(nlp.init_primals())
113
114
115
[end of pyomo/contrib/pynumero/examples/sensitivity.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/pyomo/contrib/pynumero/examples/sensitivity.py b/pyomo/contrib/pynumero/examples/sensitivity.py
--- a/pyomo/contrib/pynumero/examples/sensitivity.py
+++ b/pyomo/contrib/pynumero/examples/sensitivity.py
@@ -81,34 +81,39 @@
nlp.set_primals(x)
nlp.set_duals(y)
-J = nlp.evaluate_jacobian()
-H = nlp.evaluate_hessian_lag()
+J = nlp.extract_submatrix_jacobian(pyomo_variables=[m.x1, m.x2, m.x3], pyomo_constraints=[m.const1, m.const2])
+H = nlp.extract_submatrix_hessian_lag(pyomo_variables_rows=[m.x1, m.x2, m.x3], pyomo_variables_cols=[m.x1, m.x2, m.x3])
M = BlockSymMatrix(2)
M[0, 0] = H
M[1, 0] = J
Np = BlockMatrix(2, 1)
-Np[0, 0] = nlp.extract_submatrix_hessian_lag(pyomo_variables_rows=nlp.get_pyomo_variables(), pyomo_variables_cols=[m.eta1, m.eta2])
-Np[1, 0] = nlp.extract_submatrix_jacobian(pyomo_variables=[m.eta1, m.eta2], pyomo_constraints=nlp.get_pyomo_constraints())
+Np[0, 0] = nlp.extract_submatrix_hessian_lag(pyomo_variables_rows=[m.x1, m.x2, m.x3], pyomo_variables_cols=[m.eta1, m.eta2])
+Np[1, 0] = nlp.extract_submatrix_jacobian(pyomo_variables=[m.eta1, m.eta2], pyomo_constraints=[m.const1, m.const2])
-ds = spsolve(M.tocsc(), Np.tocsc())
-print(nlp.variable_names())
+ds = spsolve(M.tocsc(), -Np.tocsc())
+print("ds:\n", ds.todense())
#################################################################
p0 = np.array([pyo.value(m.nominal_eta1), pyo.value(m.nominal_eta2)])
p = np.array([4.45, 1.05])
dp = p - p0
-dx = ds.dot(dp)[0:nlp.n_primals()]
-new_x = x + dx
-print(new_x)
+dx = ds.dot(dp)[0:3]
+x_indices = nlp.get_primal_indices([m.x1, m.x2, m.x3])
+x_names = np.array(nlp.variable_names())
+new_x = x[x_indices] + dx
+print("dp:", dp)
+print("dx:", dx)
+print("Variable names: \n",x_names[x_indices])
+print("Sensitivity based x:\n", new_x)
#################################################################
m = create_model(4.45, 1.05)
opt = pyo.SolverFactory('ipopt')
-results = opt.solve(m, tee=True)
+results = opt.solve(m, tee=False)
nlp = PyomoNLP(m)
-print(nlp.init_primals())
-
+new_x = nlp.init_primals()
+print("NLP based x:\n", new_x[nlp.get_primal_indices([m.x1, m.x2, m.x3])])
|
{"golden_diff": "diff --git a/pyomo/contrib/pynumero/examples/sensitivity.py b/pyomo/contrib/pynumero/examples/sensitivity.py\n--- a/pyomo/contrib/pynumero/examples/sensitivity.py\n+++ b/pyomo/contrib/pynumero/examples/sensitivity.py\n@@ -81,34 +81,39 @@\n nlp.set_primals(x)\n nlp.set_duals(y)\n \n-J = nlp.evaluate_jacobian()\n-H = nlp.evaluate_hessian_lag()\n+J = nlp.extract_submatrix_jacobian(pyomo_variables=[m.x1, m.x2, m.x3], pyomo_constraints=[m.const1, m.const2])\n+H = nlp.extract_submatrix_hessian_lag(pyomo_variables_rows=[m.x1, m.x2, m.x3], pyomo_variables_cols=[m.x1, m.x2, m.x3])\n \n M = BlockSymMatrix(2)\n M[0, 0] = H\n M[1, 0] = J\n \n Np = BlockMatrix(2, 1)\n-Np[0, 0] = nlp.extract_submatrix_hessian_lag(pyomo_variables_rows=nlp.get_pyomo_variables(), pyomo_variables_cols=[m.eta1, m.eta2])\n-Np[1, 0] = nlp.extract_submatrix_jacobian(pyomo_variables=[m.eta1, m.eta2], pyomo_constraints=nlp.get_pyomo_constraints())\n+Np[0, 0] = nlp.extract_submatrix_hessian_lag(pyomo_variables_rows=[m.x1, m.x2, m.x3], pyomo_variables_cols=[m.eta1, m.eta2])\n+Np[1, 0] = nlp.extract_submatrix_jacobian(pyomo_variables=[m.eta1, m.eta2], pyomo_constraints=[m.const1, m.const2])\n \n-ds = spsolve(M.tocsc(), Np.tocsc())\n-print(nlp.variable_names())\n+ds = spsolve(M.tocsc(), -Np.tocsc())\n \n+print(\"ds:\\n\", ds.todense())\n #################################################################\n \n p0 = np.array([pyo.value(m.nominal_eta1), pyo.value(m.nominal_eta2)])\n p = np.array([4.45, 1.05])\n dp = p - p0\n-dx = ds.dot(dp)[0:nlp.n_primals()]\n-new_x = x + dx\n-print(new_x)\n+dx = ds.dot(dp)[0:3]\n+x_indices = nlp.get_primal_indices([m.x1, m.x2, m.x3])\n+x_names = np.array(nlp.variable_names())\n+new_x = x[x_indices] + dx\n+print(\"dp:\", dp)\n+print(\"dx:\", dx)\n+print(\"Variable names: \\n\",x_names[x_indices])\n+print(\"Sensitivity based x:\\n\", new_x)\n \n #################################################################\n m = create_model(4.45, 1.05)\n opt = pyo.SolverFactory('ipopt')\n-results = opt.solve(m, tee=True)\n+results = opt.solve(m, tee=False)\n nlp = PyomoNLP(m)\n-print(nlp.init_primals())\n-\n+new_x = nlp.init_primals()\n+print(\"NLP based x:\\n\", new_x[nlp.get_primal_indices([m.x1, m.x2, m.x3])])\n", "issue": "bug in pynumero example: sensitivity.py\nIt seems like the [sensitivity.py](https://github.com/Pyomo/pyomo/blob/master/pyomo/contrib/pynumero/examples/sensitivity.py) code is not calculating the sensitivity correctly. The sensitivity based x_new is a bit different from the result obtained by solving the perturbed NLP in the code. The cause of this seems to be the creation of `Np`\r\n\r\n```\r\nNp = BlockMatrix(2, 1)\r\nNp[0, 0] = nlp.extract_submatrix_hessian_lag(pyomo_variables_rows=nlp.get_pyomo_variables(), pyomo_variables_cols=[m.eta1, m.eta2])\r\nNp[1, 0] = nlp.extract_submatrix_jacobian(pyomo_variables=[m.eta1, m.eta2], pyomo_constraints=nlp.get_pyomo_constraints())\r\n```\r\nIt seems that in this example Np should be 9x2 matrix with all zeros except elements (8, 1) and (9, 2) which should be one (based on eq 13 in this [reference paper](http://www.optimization-online.org/DB_FILE/2011/04/3008.pdf)). \r\n\r\nI have a [jupyter notebook](https://github.com/notesofdabbler/learn_pyomo/blob/master/wk_pynumero/wk_sensitivity.ipynb) that recreates this example and the proposed modification which seems to fix the issue.\n", "before_files": [{"content": "# ___________________________________________________________________________\n#\n# Pyomo: Python Optimization Modeling Objects\n# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC\n# Under the terms of Contract DE-NA0003525 with National Technology and\n# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain\n# rights in this software.\n# This software is distributed under the 3-clause BSD License.\n# ___________________________________________________________________________\nimport pyomo.environ as pyo\nfrom pyomo.contrib.pynumero.interfaces.pyomo_nlp import PyomoNLP\nfrom pyomo.contrib.pynumero.sparse import BlockSymMatrix, BlockMatrix, BlockVector\nfrom scipy.sparse import identity\nfrom scipy.sparse.linalg import spsolve\nimport numpy as np\n\n\ndef create_model(eta1, eta2):\n model = pyo.ConcreteModel()\n # variables\n model.x1 = pyo.Var(initialize=0.15)\n model.x2 = pyo.Var(initialize=0.15)\n model.x3 = pyo.Var(initialize=0.0)\n # parameters\n model.eta1 = pyo.Var()\n model.eta2 = pyo.Var()\n\n model.nominal_eta1 = pyo.Param(initialize=eta1, mutable=True)\n model.nominal_eta2 = pyo.Param(initialize=eta2, mutable=True)\n\n # constraints + objective\n model.const1 = pyo.Constraint(expr=6*model.x1+3*model.x2+2*model.x3 - model.eta1 == 0)\n model.const2 = pyo.Constraint(expr=model.eta2*model.x1+model.x2-model.x3-1 == 0)\n model.cost = pyo.Objective(expr=model.x1**2 + model.x2**2 + model.x3**2)\n model.consteta1 = pyo.Constraint(expr=model.eta1 == model.nominal_eta1)\n model.consteta2 = pyo.Constraint(expr=model.eta2 == model.nominal_eta2)\n\n return model\n\ndef compute_init_lam(nlp, x=None, lam_max=1e3):\n if x is None:\n x = nlp.init_primals()\n else:\n assert x.size == nlp.n_primals()\n nlp.set_primals(x)\n\n assert nlp.n_ineq_constraints() == 0, \"only supported for equality constrained nlps for now\"\n\n nx = nlp.n_primals()\n nc = nlp.n_constraints()\n\n # create Jacobian\n jac = nlp.evaluate_jacobian()\n\n # create gradient of objective\n df = nlp.evaluate_grad_objective()\n\n # create KKT system\n kkt = BlockSymMatrix(2)\n kkt[0, 0] = identity(nx)\n kkt[1, 0] = jac\n\n zeros = np.zeros(nc)\n rhs = BlockVector([-df, zeros])\n\n flat_kkt = kkt.tocoo().tocsc()\n flat_rhs = rhs.flatten()\n\n sol = spsolve(flat_kkt, flat_rhs)\n return sol[nlp.n_primals() : nlp.n_primals() + nlp.n_constraints()]\n\n#################################################################\nm = create_model(4.5, 1.0)\nopt = pyo.SolverFactory('ipopt')\nresults = opt.solve(m, tee=True)\n\n#################################################################\nnlp = PyomoNLP(m)\nx = nlp.init_primals()\ny = compute_init_lam(nlp, x=x)\nnlp.set_primals(x)\nnlp.set_duals(y)\n\nJ = nlp.evaluate_jacobian()\nH = nlp.evaluate_hessian_lag()\n\nM = BlockSymMatrix(2)\nM[0, 0] = H\nM[1, 0] = J\n\nNp = BlockMatrix(2, 1)\nNp[0, 0] = nlp.extract_submatrix_hessian_lag(pyomo_variables_rows=nlp.get_pyomo_variables(), pyomo_variables_cols=[m.eta1, m.eta2])\nNp[1, 0] = nlp.extract_submatrix_jacobian(pyomo_variables=[m.eta1, m.eta2], pyomo_constraints=nlp.get_pyomo_constraints())\n\nds = spsolve(M.tocsc(), Np.tocsc())\nprint(nlp.variable_names())\n\n#################################################################\n\np0 = np.array([pyo.value(m.nominal_eta1), pyo.value(m.nominal_eta2)])\np = np.array([4.45, 1.05])\ndp = p - p0\ndx = ds.dot(dp)[0:nlp.n_primals()]\nnew_x = x + dx\nprint(new_x)\n\n#################################################################\nm = create_model(4.45, 1.05)\nopt = pyo.SolverFactory('ipopt')\nresults = opt.solve(m, tee=True)\nnlp = PyomoNLP(m)\nprint(nlp.init_primals())\n\n\n", "path": "pyomo/contrib/pynumero/examples/sensitivity.py"}]}
| 2,192 | 738 |
gh_patches_debug_28920
|
rasdani/github-patches
|
git_diff
|
iterative__dvc-5652
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
ERROR: unexpected error - list.remove(x): x not in list, if I execute "dvc diff HEAD~", after dvc version is updated from 1.1.15 to 2.0.5
# Bug Report
ERROR: unexpected error - list.remove(x): x not in list, if I execute "dvc diff HEAD~", after dvc version is updated from 1.1.15 to 2.0.5
## Description
"dvc diff" command is wrong in version 2.0.5.
### Reproduce
Step list of how to reproduce the bug
1. I made dvc repository in 1.11.15 and push data into GCS.
2. "pip install dvc --upgrade"
3. Create a file in a directory named foo managed by dvc
4. "dvc add foo"
5. "dvc diff HEAD~"
6. shown "ERROR: unexpected error - list.remove(x): x not in list"
### Expected
"dvc diff" command execute as well as 1.11.15.
looks like below.
```
Added:
bar.txt
```
### Environment information
**Output of `dvc doctor`:**
```console
$ dvc doctor
```
```console
DVC version: 2.0.5 (pip)
---------------------------------
Platform: Python 3.7.9 on Darwin-19.6.0-x86_64-i386-64bit
Supports: gs, hdfs, webhdfs, http, https
Cache types: reflink, hardlink, symlink
Cache directory: apfs on /dev/disk1s2
Caches: local
Remotes: gs
Workspace directory: apfs on /dev/disk1s2
Repo: dvc, git
```
**Additional Information (if any):**
part of error message of ```dvc diff --verbose HEAD~``` is below.
```
Traceback (most recent call last):
File "venv/lib/python3.7/site-packages/dvc/main.py", line 50, in main
ret = cmd.run()
File "<reposistory>/venv/lib/python3.7/site-packages/dvc/command/diff.py", line 138, in run
self.args.a_rev, self.args.b_rev, self.args.targets
File "<reposistory>/venv/lib/python3.7/site-packages/dvc/repo/__init__.py", line 49, in wrapper
return f(repo, *args, **kwargs)
File "<reposistory>/venv/lib/python3.7/site-packages/dvc/repo/diff.py", line 79, in diff
deleted.remove(renamed_item["path"]["old"])
ValueError: list.remove(x): x not in list
```
version 2.0.0 is wrong too.
version 1.11.16 is correct.
Thanks.
</issue>
<code>
[start of dvc/repo/diff.py]
1 import logging
2 import os
3
4 from dvc.exceptions import PathMissingError
5 from dvc.objects.stage import get_file_hash
6 from dvc.objects.stage import stage as ostage
7 from dvc.repo import locked
8
9 logger = logging.getLogger(__name__)
10
11
12 @locked
13 def diff(self, a_rev="HEAD", b_rev=None, targets=None):
14 """
15 By default, it compares the workspace with the last commit's fs.
16
17 This implementation differs from `git diff` since DVC doesn't have
18 the concept of `index`, but it keeps the same interface, thus,
19 `dvc diff` would be the same as `dvc diff HEAD`.
20 """
21
22 if self.scm.no_commits:
23 return {}
24
25 from dvc.fs.repo import RepoFileSystem
26
27 repo_fs = RepoFileSystem(self)
28
29 b_rev = b_rev if b_rev else "workspace"
30 results = {}
31 missing_targets = {}
32 for rev in self.brancher(revs=[a_rev, b_rev]):
33 if rev == "workspace" and rev != b_rev:
34 # brancher always returns workspace, but we only need to compute
35 # workspace paths/checksums if b_rev was None
36 continue
37
38 targets_path_infos = None
39 if targets is not None:
40 # convert targets to path_infos, and capture any missing targets
41 targets_path_infos, missing_targets[rev] = _targets_to_path_infos(
42 repo_fs, targets
43 )
44
45 results[rev] = _paths_checksums(self, repo_fs, targets_path_infos)
46
47 if targets is not None:
48 # check for overlapping missing targets between a_rev and b_rev
49 for target in set(missing_targets[a_rev]) & set(
50 missing_targets[b_rev]
51 ):
52 raise PathMissingError(target, self)
53
54 old = results[a_rev]
55 new = results[b_rev]
56
57 # Compare paths between the old and new fs.
58 # set() efficiently converts dict keys to a set
59 added = sorted(set(new) - set(old))
60 deleted_or_missing = set(old) - set(new)
61 if b_rev == "workspace":
62 # missing status is only applicable when diffing local workspace
63 # against a commit
64 missing = sorted(_filter_missing(repo_fs, deleted_or_missing))
65 else:
66 missing = []
67 deleted = sorted(deleted_or_missing - set(missing))
68 modified = sorted(set(old) & set(new))
69
70 # Cases when file was changed and renamed are resulted
71 # in having deleted and added record
72 # To cover such cases we need to change hashing function
73 # to produce rolling/chunking hash
74
75 renamed = _calculate_renamed(new, old, added, deleted)
76
77 for renamed_item in renamed:
78 added.remove(renamed_item["path"]["new"])
79 deleted.remove(renamed_item["path"]["old"])
80
81 ret = {
82 "added": [{"path": path, "hash": new[path]} for path in added],
83 "deleted": [{"path": path, "hash": old[path]} for path in deleted],
84 "modified": [
85 {"path": path, "hash": {"old": old[path], "new": new[path]}}
86 for path in modified
87 if old[path] != new[path]
88 ],
89 "renamed": renamed,
90 "not in cache": [
91 {"path": path, "hash": old[path]} for path in missing
92 ],
93 }
94
95 return ret if any(ret.values()) else {}
96
97
98 def _paths_checksums(repo, repo_fs, targets):
99 """
100 A dictionary of checksums addressed by relpaths collected from
101 the current fs outputs.
102
103 To help distinguish between a directory and a file output,
104 the former one will come with a trailing slash in the path:
105
106 directory: "data/"
107 file: "data"
108 """
109
110 return dict(_output_paths(repo, repo_fs, targets))
111
112
113 def _output_paths(repo, repo_fs, targets):
114 from dvc.fs.local import LocalFileSystem
115
116 on_working_fs = isinstance(repo.fs, LocalFileSystem)
117
118 def _exists(output):
119 if on_working_fs:
120 return output.exists
121 return True
122
123 def _to_path(output):
124 return (
125 str(output)
126 if not output.is_dir_checksum
127 else os.path.join(str(output), "")
128 )
129
130 def _to_checksum(output):
131 if on_working_fs:
132 return ostage(
133 repo.odb.local, output.path_info, repo.odb.local.fs, "md5",
134 ).hash_info.value
135 return output.hash_info.value
136
137 for stage in repo.stages:
138 for output in stage.outs:
139 if _exists(output):
140 yield_output = targets is None or any(
141 output.path_info.isin_or_eq(target) for target in targets
142 )
143
144 if yield_output:
145 yield _to_path(output), _to_checksum(output)
146
147 if output.is_dir_checksum and (
148 yield_output
149 or any(target.isin(output.path_info) for target in targets)
150 ):
151 yield from _dir_output_paths(repo_fs, output, targets)
152
153
154 def _dir_output_paths(repo_fs, output, targets=None):
155 from dvc.config import NoRemoteError
156
157 try:
158 for fname in repo_fs.walk_files(output.path_info):
159 if targets is None or any(
160 fname.isin_or_eq(target) for target in targets
161 ):
162 yield str(fname), get_file_hash(fname, repo_fs, "md5").value
163 except NoRemoteError:
164 logger.warning("dir cache entry for '%s' is missing", output)
165
166
167 def _filter_missing(repo_fs, paths):
168 for path in paths:
169 try:
170 metadata = repo_fs.metadata(path)
171 if metadata.is_dvc:
172 out = metadata.outs[0]
173 if out.status().get(str(out)) == "not in cache":
174 yield path
175 except FileNotFoundError:
176 pass
177
178
179 def _targets_to_path_infos(repo_fs, targets):
180 path_infos = []
181 missing = []
182
183 for target in targets:
184 if repo_fs.exists(target):
185 path_infos.append(repo_fs.metadata(target).path_info)
186 else:
187 missing.append(target)
188
189 return path_infos, missing
190
191
192 def _calculate_renamed(new, old, added, deleted):
193 old_inverted = {}
194 # It is needed to be dict of lists to cover cases
195 # when repo has paths with same hash
196 for path, path_hash in old.items():
197 bucket = old_inverted.get(path_hash, None)
198 if bucket is None:
199 old_inverted[path_hash] = [path]
200 else:
201 bucket.append(path)
202
203 renamed = []
204 for path in added:
205 path_hash = new[path]
206 old_paths = old_inverted.get(path_hash, None)
207 if not old_paths:
208 continue
209 old_path = None
210 for tmp_old_path in old_paths:
211 if tmp_old_path in deleted:
212 old_path = tmp_old_path
213 break
214 if not old_path:
215 continue
216 renamed.append(
217 {"path": {"old": old_path, "new": path}, "hash": path_hash}
218 )
219
220 return renamed
221
[end of dvc/repo/diff.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/dvc/repo/diff.py b/dvc/repo/diff.py
--- a/dvc/repo/diff.py
+++ b/dvc/repo/diff.py
@@ -1,5 +1,7 @@
import logging
import os
+from collections import defaultdict
+from typing import Dict, List
from dvc.exceptions import PathMissingError
from dvc.objects.stage import get_file_hash
@@ -190,29 +192,23 @@
def _calculate_renamed(new, old, added, deleted):
- old_inverted = {}
+ old_inverted: Dict[str, List[str]] = defaultdict(list)
# It is needed to be dict of lists to cover cases
# when repo has paths with same hash
for path, path_hash in old.items():
- bucket = old_inverted.get(path_hash, None)
- if bucket is None:
- old_inverted[path_hash] = [path]
- else:
- bucket.append(path)
+ old_inverted[path_hash].append(path)
renamed = []
for path in added:
path_hash = new[path]
- old_paths = old_inverted.get(path_hash, None)
- if not old_paths:
- continue
- old_path = None
- for tmp_old_path in old_paths:
- if tmp_old_path in deleted:
- old_path = tmp_old_path
- break
- if not old_path:
+ old_paths = old_inverted[path_hash]
+ try:
+ iterator = enumerate(old_paths)
+ index = next(idx for idx, path in iterator if path in deleted)
+ except StopIteration:
continue
+
+ old_path = old_paths.pop(index)
renamed.append(
{"path": {"old": old_path, "new": path}, "hash": path_hash}
)
|
{"golden_diff": "diff --git a/dvc/repo/diff.py b/dvc/repo/diff.py\n--- a/dvc/repo/diff.py\n+++ b/dvc/repo/diff.py\n@@ -1,5 +1,7 @@\n import logging\n import os\n+from collections import defaultdict\n+from typing import Dict, List\n \n from dvc.exceptions import PathMissingError\n from dvc.objects.stage import get_file_hash\n@@ -190,29 +192,23 @@\n \n \n def _calculate_renamed(new, old, added, deleted):\n- old_inverted = {}\n+ old_inverted: Dict[str, List[str]] = defaultdict(list)\n # It is needed to be dict of lists to cover cases\n # when repo has paths with same hash\n for path, path_hash in old.items():\n- bucket = old_inverted.get(path_hash, None)\n- if bucket is None:\n- old_inverted[path_hash] = [path]\n- else:\n- bucket.append(path)\n+ old_inverted[path_hash].append(path)\n \n renamed = []\n for path in added:\n path_hash = new[path]\n- old_paths = old_inverted.get(path_hash, None)\n- if not old_paths:\n- continue\n- old_path = None\n- for tmp_old_path in old_paths:\n- if tmp_old_path in deleted:\n- old_path = tmp_old_path\n- break\n- if not old_path:\n+ old_paths = old_inverted[path_hash]\n+ try:\n+ iterator = enumerate(old_paths)\n+ index = next(idx for idx, path in iterator if path in deleted)\n+ except StopIteration:\n continue\n+\n+ old_path = old_paths.pop(index)\n renamed.append(\n {\"path\": {\"old\": old_path, \"new\": path}, \"hash\": path_hash}\n )\n", "issue": "ERROR: unexpected error - list.remove(x): x not in list, if I execute \"dvc diff HEAD~\", after dvc version is updated from 1.1.15 to 2.0.5\n# Bug Report\r\n\r\nERROR: unexpected error - list.remove(x): x not in list, if I execute \"dvc diff HEAD~\", after dvc version is updated from 1.1.15 to 2.0.5\r\n\r\n## Description\r\n\r\n\"dvc diff\" command is wrong in version 2.0.5.\r\n\r\n\r\n### Reproduce\r\n\r\nStep list of how to reproduce the bug\r\n\r\n1. I made dvc repository in 1.11.15 and push data into GCS.\r\n2. \"pip install dvc --upgrade\"\r\n3. Create a file in a directory named foo managed by dvc\r\n4. \"dvc add foo\"\r\n5. \"dvc diff HEAD~\"\r\n6. shown \"ERROR: unexpected error - list.remove(x): x not in list\"\r\n\r\n### Expected\r\n\r\n\"dvc diff\" command execute as well as 1.11.15.\r\nlooks like below.\r\n```\r\nAdded:\r\n bar.txt\r\n```\r\n\r\n\r\n### Environment information\r\n\r\n\r\n**Output of `dvc doctor`:**\r\n\r\n```console\r\n$ dvc doctor\r\n```\r\n\r\n```console\r\nDVC version: 2.0.5 (pip)\r\n---------------------------------\r\nPlatform: Python 3.7.9 on Darwin-19.6.0-x86_64-i386-64bit\r\nSupports: gs, hdfs, webhdfs, http, https\r\nCache types: reflink, hardlink, symlink\r\nCache directory: apfs on /dev/disk1s2\r\nCaches: local\r\nRemotes: gs\r\nWorkspace directory: apfs on /dev/disk1s2\r\nRepo: dvc, git\r\n```\r\n\r\n**Additional Information (if any):**\r\n\r\npart of error message of ```dvc diff --verbose HEAD~``` is below.\r\n```\r\nTraceback (most recent call last):\r\n File \"venv/lib/python3.7/site-packages/dvc/main.py\", line 50, in main\r\n ret = cmd.run()\r\n File \"<reposistory>/venv/lib/python3.7/site-packages/dvc/command/diff.py\", line 138, in run\r\n self.args.a_rev, self.args.b_rev, self.args.targets\r\n File \"<reposistory>/venv/lib/python3.7/site-packages/dvc/repo/__init__.py\", line 49, in wrapper\r\n return f(repo, *args, **kwargs)\r\n File \"<reposistory>/venv/lib/python3.7/site-packages/dvc/repo/diff.py\", line 79, in diff\r\n deleted.remove(renamed_item[\"path\"][\"old\"])\r\nValueError: list.remove(x): x not in list\r\n```\r\n\r\nversion 2.0.0 is wrong too.\r\nversion 1.11.16 is correct.\r\n\r\nThanks.\n", "before_files": [{"content": "import logging\nimport os\n\nfrom dvc.exceptions import PathMissingError\nfrom dvc.objects.stage import get_file_hash\nfrom dvc.objects.stage import stage as ostage\nfrom dvc.repo import locked\n\nlogger = logging.getLogger(__name__)\n\n\n@locked\ndef diff(self, a_rev=\"HEAD\", b_rev=None, targets=None):\n \"\"\"\n By default, it compares the workspace with the last commit's fs.\n\n This implementation differs from `git diff` since DVC doesn't have\n the concept of `index`, but it keeps the same interface, thus,\n `dvc diff` would be the same as `dvc diff HEAD`.\n \"\"\"\n\n if self.scm.no_commits:\n return {}\n\n from dvc.fs.repo import RepoFileSystem\n\n repo_fs = RepoFileSystem(self)\n\n b_rev = b_rev if b_rev else \"workspace\"\n results = {}\n missing_targets = {}\n for rev in self.brancher(revs=[a_rev, b_rev]):\n if rev == \"workspace\" and rev != b_rev:\n # brancher always returns workspace, but we only need to compute\n # workspace paths/checksums if b_rev was None\n continue\n\n targets_path_infos = None\n if targets is not None:\n # convert targets to path_infos, and capture any missing targets\n targets_path_infos, missing_targets[rev] = _targets_to_path_infos(\n repo_fs, targets\n )\n\n results[rev] = _paths_checksums(self, repo_fs, targets_path_infos)\n\n if targets is not None:\n # check for overlapping missing targets between a_rev and b_rev\n for target in set(missing_targets[a_rev]) & set(\n missing_targets[b_rev]\n ):\n raise PathMissingError(target, self)\n\n old = results[a_rev]\n new = results[b_rev]\n\n # Compare paths between the old and new fs.\n # set() efficiently converts dict keys to a set\n added = sorted(set(new) - set(old))\n deleted_or_missing = set(old) - set(new)\n if b_rev == \"workspace\":\n # missing status is only applicable when diffing local workspace\n # against a commit\n missing = sorted(_filter_missing(repo_fs, deleted_or_missing))\n else:\n missing = []\n deleted = sorted(deleted_or_missing - set(missing))\n modified = sorted(set(old) & set(new))\n\n # Cases when file was changed and renamed are resulted\n # in having deleted and added record\n # To cover such cases we need to change hashing function\n # to produce rolling/chunking hash\n\n renamed = _calculate_renamed(new, old, added, deleted)\n\n for renamed_item in renamed:\n added.remove(renamed_item[\"path\"][\"new\"])\n deleted.remove(renamed_item[\"path\"][\"old\"])\n\n ret = {\n \"added\": [{\"path\": path, \"hash\": new[path]} for path in added],\n \"deleted\": [{\"path\": path, \"hash\": old[path]} for path in deleted],\n \"modified\": [\n {\"path\": path, \"hash\": {\"old\": old[path], \"new\": new[path]}}\n for path in modified\n if old[path] != new[path]\n ],\n \"renamed\": renamed,\n \"not in cache\": [\n {\"path\": path, \"hash\": old[path]} for path in missing\n ],\n }\n\n return ret if any(ret.values()) else {}\n\n\ndef _paths_checksums(repo, repo_fs, targets):\n \"\"\"\n A dictionary of checksums addressed by relpaths collected from\n the current fs outputs.\n\n To help distinguish between a directory and a file output,\n the former one will come with a trailing slash in the path:\n\n directory: \"data/\"\n file: \"data\"\n \"\"\"\n\n return dict(_output_paths(repo, repo_fs, targets))\n\n\ndef _output_paths(repo, repo_fs, targets):\n from dvc.fs.local import LocalFileSystem\n\n on_working_fs = isinstance(repo.fs, LocalFileSystem)\n\n def _exists(output):\n if on_working_fs:\n return output.exists\n return True\n\n def _to_path(output):\n return (\n str(output)\n if not output.is_dir_checksum\n else os.path.join(str(output), \"\")\n )\n\n def _to_checksum(output):\n if on_working_fs:\n return ostage(\n repo.odb.local, output.path_info, repo.odb.local.fs, \"md5\",\n ).hash_info.value\n return output.hash_info.value\n\n for stage in repo.stages:\n for output in stage.outs:\n if _exists(output):\n yield_output = targets is None or any(\n output.path_info.isin_or_eq(target) for target in targets\n )\n\n if yield_output:\n yield _to_path(output), _to_checksum(output)\n\n if output.is_dir_checksum and (\n yield_output\n or any(target.isin(output.path_info) for target in targets)\n ):\n yield from _dir_output_paths(repo_fs, output, targets)\n\n\ndef _dir_output_paths(repo_fs, output, targets=None):\n from dvc.config import NoRemoteError\n\n try:\n for fname in repo_fs.walk_files(output.path_info):\n if targets is None or any(\n fname.isin_or_eq(target) for target in targets\n ):\n yield str(fname), get_file_hash(fname, repo_fs, \"md5\").value\n except NoRemoteError:\n logger.warning(\"dir cache entry for '%s' is missing\", output)\n\n\ndef _filter_missing(repo_fs, paths):\n for path in paths:\n try:\n metadata = repo_fs.metadata(path)\n if metadata.is_dvc:\n out = metadata.outs[0]\n if out.status().get(str(out)) == \"not in cache\":\n yield path\n except FileNotFoundError:\n pass\n\n\ndef _targets_to_path_infos(repo_fs, targets):\n path_infos = []\n missing = []\n\n for target in targets:\n if repo_fs.exists(target):\n path_infos.append(repo_fs.metadata(target).path_info)\n else:\n missing.append(target)\n\n return path_infos, missing\n\n\ndef _calculate_renamed(new, old, added, deleted):\n old_inverted = {}\n # It is needed to be dict of lists to cover cases\n # when repo has paths with same hash\n for path, path_hash in old.items():\n bucket = old_inverted.get(path_hash, None)\n if bucket is None:\n old_inverted[path_hash] = [path]\n else:\n bucket.append(path)\n\n renamed = []\n for path in added:\n path_hash = new[path]\n old_paths = old_inverted.get(path_hash, None)\n if not old_paths:\n continue\n old_path = None\n for tmp_old_path in old_paths:\n if tmp_old_path in deleted:\n old_path = tmp_old_path\n break\n if not old_path:\n continue\n renamed.append(\n {\"path\": {\"old\": old_path, \"new\": path}, \"hash\": path_hash}\n )\n\n return renamed\n", "path": "dvc/repo/diff.py"}]}
| 3,271 | 405 |
gh_patches_debug_8394
|
rasdani/github-patches
|
git_diff
|
cloudtools__troposphere-1280
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Validator issue in Dynamodb
The validator added in #1243 will fail if you use an If for a property
Code:
```
TableName=If("useTableName", Ref(table_name), Ref(AWS_NO_VALUE)),
```
Error:
```
File "e:\github\troposphere\troposphere\__init__.py", line 247, in to_dict
self.validate()
File "e:\github\troposphere\troposphere\dynamodb.py", line 139, in validate
tput_props.extend([x.properties for x in indexes])
RuntimeError: Failed to build JSON for template DynamoDB: 'If' object has no attribute 'properties'
```
Removing the following line resolves the issue:
https://github.com/cloudtools/troposphere/blob/master/troposphere/dynamodb.py#L139
From what I can tell the validator does not take into account using an `If` to determine if a property is set or if it is set to `AWS_NO_VALUE`.
</issue>
<code>
[start of troposphere/dynamodb.py]
1 # Copyright (c) 2012-2013, Mark Peek <[email protected]>
2 # All rights reserved.
3 #
4 # See LICENSE file for full license.
5
6 from . import AWSObject, AWSProperty, AWSHelperFn, If, Tags
7 from .validators import boolean
8
9
10 def attribute_type_validator(x):
11 valid_types = ["S", "N", "B"]
12 if x not in valid_types:
13 raise ValueError("AttributeType must be one of: %s" %
14 ", ".join(valid_types))
15 return x
16
17
18 def key_type_validator(x):
19 valid_types = ["HASH", "RANGE"]
20 if x not in valid_types:
21 raise ValueError("KeyType must be one of: %s" % ", ".join(valid_types))
22 return x
23
24
25 def projection_type_validator(x):
26 valid_types = ["KEYS_ONLY", "INCLUDE", "ALL"]
27 if x not in valid_types:
28 raise ValueError("ProjectionType must be one of: %s" %
29 ", ".join(valid_types))
30 return x
31
32
33 def billing_mode_validator(x):
34 valid_modes = ['PROVISIONED', 'PAY_PER_REQUEST']
35 if x not in valid_modes:
36 raise ValueError("Table billing mode must be one of: %s" %
37 ", ".join(valid_modes))
38 return x
39
40
41 class AttributeDefinition(AWSProperty):
42 props = {
43 "AttributeName": (basestring, True),
44 "AttributeType": (attribute_type_validator, True),
45 }
46
47
48 class KeySchema(AWSProperty):
49 props = {
50 "AttributeName": (basestring, True),
51 "KeyType": (key_type_validator, True)
52 }
53
54
55 class Key(KeySchema):
56 """ For backwards compatibility. """
57 pass
58
59
60 class ProvisionedThroughput(AWSProperty):
61 props = {
62 "ReadCapacityUnits": (int, True),
63 "WriteCapacityUnits": (int, True),
64 }
65
66
67 class Projection(AWSProperty):
68 props = {
69 "NonKeyAttributes": ([basestring], False),
70 "ProjectionType": (projection_type_validator, False)
71 }
72
73
74 class SSESpecification(AWSProperty):
75 props = {
76 "SSEEnabled": (boolean, True),
77 }
78
79
80 class GlobalSecondaryIndex(AWSProperty):
81 props = {
82 "IndexName": (basestring, True),
83 "KeySchema": ([KeySchema], True),
84 "Projection": (Projection, True),
85 "ProvisionedThroughput": (ProvisionedThroughput, False)
86 }
87
88
89 class LocalSecondaryIndex(AWSProperty):
90 props = {
91 "IndexName": (basestring, True),
92 "KeySchema": ([KeySchema], True),
93 "Projection": (Projection, True),
94 }
95
96
97 class PointInTimeRecoverySpecification(AWSProperty):
98 props = {
99 'PointInTimeRecoveryEnabled': (boolean, False),
100 }
101
102
103 class StreamSpecification(AWSProperty):
104 props = {
105 'StreamViewType': (basestring, True),
106 }
107
108
109 class TimeToLiveSpecification(AWSProperty):
110 props = {
111 'AttributeName': (basestring, True),
112 'Enabled': (boolean, True),
113 }
114
115
116 class Table(AWSObject):
117 resource_type = "AWS::DynamoDB::Table"
118
119 props = {
120 'AttributeDefinitions': ([AttributeDefinition], True),
121 'BillingMode': (billing_mode_validator, False),
122 'GlobalSecondaryIndexes': ([GlobalSecondaryIndex], False),
123 'KeySchema': ([KeySchema], True),
124 'LocalSecondaryIndexes': ([LocalSecondaryIndex], False),
125 'PointInTimeRecoverySpecification':
126 (PointInTimeRecoverySpecification, False),
127 'ProvisionedThroughput': (ProvisionedThroughput, False),
128 'SSESpecification': (SSESpecification, False),
129 'StreamSpecification': (StreamSpecification, False),
130 'TableName': (basestring, False),
131 'Tags': (Tags, False),
132 'TimeToLiveSpecification': (TimeToLiveSpecification, False),
133 }
134
135 def validate(self):
136 billing_mode = self.properties.get('BillingMode', 'PROVISIONED')
137 indexes = self.properties.get('GlobalSecondaryIndexes', [])
138 tput_props = [self.properties]
139 tput_props.extend([x.properties for x in indexes])
140
141 def check_if_all(name, props):
142 validated = []
143 for prop in props:
144 is_helper = isinstance(prop.get(name), AWSHelperFn)
145 validated.append(name in prop or is_helper)
146 return all(validated)
147
148 def check_any(name, props):
149 validated = []
150 for prop in props:
151 is_helper = isinstance(prop.get(name), AWSHelperFn)
152 validated.append(name in prop and not is_helper)
153 return any(validated)
154
155 if isinstance(billing_mode, If):
156 if check_any('ProvisionedThroughput', tput_props):
157 raise ValueError(
158 'Table billing mode is per-request. '
159 'ProvisionedThroughput property is mutually exclusive')
160 return
161
162 if billing_mode == 'PROVISIONED':
163 if not check_if_all('ProvisionedThroughput', tput_props):
164 raise ValueError(
165 'Table billing mode is provisioned. '
166 'ProvisionedThroughput required if available')
167 elif billing_mode == 'PAY_PER_REQUEST':
168 if check_any('ProvisionedThroughput', tput_props):
169 raise ValueError(
170 'Table billing mode is per-request. '
171 'ProvisionedThroughput property is mutually exclusive')
172
[end of troposphere/dynamodb.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/troposphere/dynamodb.py b/troposphere/dynamodb.py
--- a/troposphere/dynamodb.py
+++ b/troposphere/dynamodb.py
@@ -136,7 +136,9 @@
billing_mode = self.properties.get('BillingMode', 'PROVISIONED')
indexes = self.properties.get('GlobalSecondaryIndexes', [])
tput_props = [self.properties]
- tput_props.extend([x.properties for x in indexes])
+ tput_props.extend([
+ x.properties for x in indexes if not isinstance(x, AWSHelperFn)
+ ])
def check_if_all(name, props):
validated = []
|
{"golden_diff": "diff --git a/troposphere/dynamodb.py b/troposphere/dynamodb.py\n--- a/troposphere/dynamodb.py\n+++ b/troposphere/dynamodb.py\n@@ -136,7 +136,9 @@\n billing_mode = self.properties.get('BillingMode', 'PROVISIONED')\n indexes = self.properties.get('GlobalSecondaryIndexes', [])\n tput_props = [self.properties]\n- tput_props.extend([x.properties for x in indexes])\n+ tput_props.extend([\n+ x.properties for x in indexes if not isinstance(x, AWSHelperFn)\n+ ])\n \n def check_if_all(name, props):\n validated = []\n", "issue": "Validator issue in Dynamodb\nThe validator added in #1243 will fail if you use an If for a property\r\n\r\nCode:\r\n```\r\nTableName=If(\"useTableName\", Ref(table_name), Ref(AWS_NO_VALUE)),\r\n```\r\n\r\nError:\r\n\r\n```\r\n File \"e:\\github\\troposphere\\troposphere\\__init__.py\", line 247, in to_dict\r\n self.validate()\r\n File \"e:\\github\\troposphere\\troposphere\\dynamodb.py\", line 139, in validate\r\n tput_props.extend([x.properties for x in indexes])\r\nRuntimeError: Failed to build JSON for template DynamoDB: 'If' object has no attribute 'properties'\r\n```\r\n\r\nRemoving the following line resolves the issue:\r\nhttps://github.com/cloudtools/troposphere/blob/master/troposphere/dynamodb.py#L139\r\n\r\nFrom what I can tell the validator does not take into account using an `If` to determine if a property is set or if it is set to `AWS_NO_VALUE`.\r\n\r\n\r\n\r\n\n", "before_files": [{"content": "# Copyright (c) 2012-2013, Mark Peek <[email protected]>\n# All rights reserved.\n#\n# See LICENSE file for full license.\n\nfrom . import AWSObject, AWSProperty, AWSHelperFn, If, Tags\nfrom .validators import boolean\n\n\ndef attribute_type_validator(x):\n valid_types = [\"S\", \"N\", \"B\"]\n if x not in valid_types:\n raise ValueError(\"AttributeType must be one of: %s\" %\n \", \".join(valid_types))\n return x\n\n\ndef key_type_validator(x):\n valid_types = [\"HASH\", \"RANGE\"]\n if x not in valid_types:\n raise ValueError(\"KeyType must be one of: %s\" % \", \".join(valid_types))\n return x\n\n\ndef projection_type_validator(x):\n valid_types = [\"KEYS_ONLY\", \"INCLUDE\", \"ALL\"]\n if x not in valid_types:\n raise ValueError(\"ProjectionType must be one of: %s\" %\n \", \".join(valid_types))\n return x\n\n\ndef billing_mode_validator(x):\n valid_modes = ['PROVISIONED', 'PAY_PER_REQUEST']\n if x not in valid_modes:\n raise ValueError(\"Table billing mode must be one of: %s\" %\n \", \".join(valid_modes))\n return x\n\n\nclass AttributeDefinition(AWSProperty):\n props = {\n \"AttributeName\": (basestring, True),\n \"AttributeType\": (attribute_type_validator, True),\n }\n\n\nclass KeySchema(AWSProperty):\n props = {\n \"AttributeName\": (basestring, True),\n \"KeyType\": (key_type_validator, True)\n }\n\n\nclass Key(KeySchema):\n \"\"\" For backwards compatibility. \"\"\"\n pass\n\n\nclass ProvisionedThroughput(AWSProperty):\n props = {\n \"ReadCapacityUnits\": (int, True),\n \"WriteCapacityUnits\": (int, True),\n }\n\n\nclass Projection(AWSProperty):\n props = {\n \"NonKeyAttributes\": ([basestring], False),\n \"ProjectionType\": (projection_type_validator, False)\n }\n\n\nclass SSESpecification(AWSProperty):\n props = {\n \"SSEEnabled\": (boolean, True),\n }\n\n\nclass GlobalSecondaryIndex(AWSProperty):\n props = {\n \"IndexName\": (basestring, True),\n \"KeySchema\": ([KeySchema], True),\n \"Projection\": (Projection, True),\n \"ProvisionedThroughput\": (ProvisionedThroughput, False)\n }\n\n\nclass LocalSecondaryIndex(AWSProperty):\n props = {\n \"IndexName\": (basestring, True),\n \"KeySchema\": ([KeySchema], True),\n \"Projection\": (Projection, True),\n }\n\n\nclass PointInTimeRecoverySpecification(AWSProperty):\n props = {\n 'PointInTimeRecoveryEnabled': (boolean, False),\n }\n\n\nclass StreamSpecification(AWSProperty):\n props = {\n 'StreamViewType': (basestring, True),\n }\n\n\nclass TimeToLiveSpecification(AWSProperty):\n props = {\n 'AttributeName': (basestring, True),\n 'Enabled': (boolean, True),\n }\n\n\nclass Table(AWSObject):\n resource_type = \"AWS::DynamoDB::Table\"\n\n props = {\n 'AttributeDefinitions': ([AttributeDefinition], True),\n 'BillingMode': (billing_mode_validator, False),\n 'GlobalSecondaryIndexes': ([GlobalSecondaryIndex], False),\n 'KeySchema': ([KeySchema], True),\n 'LocalSecondaryIndexes': ([LocalSecondaryIndex], False),\n 'PointInTimeRecoverySpecification':\n (PointInTimeRecoverySpecification, False),\n 'ProvisionedThroughput': (ProvisionedThroughput, False),\n 'SSESpecification': (SSESpecification, False),\n 'StreamSpecification': (StreamSpecification, False),\n 'TableName': (basestring, False),\n 'Tags': (Tags, False),\n 'TimeToLiveSpecification': (TimeToLiveSpecification, False),\n }\n\n def validate(self):\n billing_mode = self.properties.get('BillingMode', 'PROVISIONED')\n indexes = self.properties.get('GlobalSecondaryIndexes', [])\n tput_props = [self.properties]\n tput_props.extend([x.properties for x in indexes])\n\n def check_if_all(name, props):\n validated = []\n for prop in props:\n is_helper = isinstance(prop.get(name), AWSHelperFn)\n validated.append(name in prop or is_helper)\n return all(validated)\n\n def check_any(name, props):\n validated = []\n for prop in props:\n is_helper = isinstance(prop.get(name), AWSHelperFn)\n validated.append(name in prop and not is_helper)\n return any(validated)\n\n if isinstance(billing_mode, If):\n if check_any('ProvisionedThroughput', tput_props):\n raise ValueError(\n 'Table billing mode is per-request. '\n 'ProvisionedThroughput property is mutually exclusive')\n return\n\n if billing_mode == 'PROVISIONED':\n if not check_if_all('ProvisionedThroughput', tput_props):\n raise ValueError(\n 'Table billing mode is provisioned. '\n 'ProvisionedThroughput required if available')\n elif billing_mode == 'PAY_PER_REQUEST':\n if check_any('ProvisionedThroughput', tput_props):\n raise ValueError(\n 'Table billing mode is per-request. '\n 'ProvisionedThroughput property is mutually exclusive')\n", "path": "troposphere/dynamodb.py"}]}
| 2,336 | 142 |
gh_patches_debug_42022
|
rasdani/github-patches
|
git_diff
|
PaddlePaddle__PaddleSpeech-47
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Should expose the distance in error_rate.py
</issue>
<code>
[start of utils/error_rate.py]
1 # -*- coding: utf-8 -*-
2 """This module provides functions to calculate error rate in different level.
3 e.g. wer for word-level, cer for char-level.
4 """
5 from __future__ import absolute_import
6 from __future__ import division
7 from __future__ import print_function
8
9 import numpy as np
10
11
12 def _levenshtein_distance(ref, hyp):
13 """Levenshtein distance is a string metric for measuring the difference
14 between two sequences. Informally, the levenshtein disctance is defined as
15 the minimum number of single-character edits (substitutions, insertions or
16 deletions) required to change one word into the other. We can naturally
17 extend the edits to word level when calculate levenshtein disctance for
18 two sentences.
19 """
20 m = len(ref)
21 n = len(hyp)
22
23 # special case
24 if ref == hyp:
25 return 0
26 if m == 0:
27 return n
28 if n == 0:
29 return m
30
31 if m < n:
32 ref, hyp = hyp, ref
33 m, n = n, m
34
35 # use O(min(m, n)) space
36 distance = np.zeros((2, n + 1), dtype=np.int32)
37
38 # initialize distance matrix
39 for j in xrange(n + 1):
40 distance[0][j] = j
41
42 # calculate levenshtein distance
43 for i in xrange(1, m + 1):
44 prev_row_idx = (i - 1) % 2
45 cur_row_idx = i % 2
46 distance[cur_row_idx][0] = i
47 for j in xrange(1, n + 1):
48 if ref[i - 1] == hyp[j - 1]:
49 distance[cur_row_idx][j] = distance[prev_row_idx][j - 1]
50 else:
51 s_num = distance[prev_row_idx][j - 1] + 1
52 i_num = distance[cur_row_idx][j - 1] + 1
53 d_num = distance[prev_row_idx][j] + 1
54 distance[cur_row_idx][j] = min(s_num, i_num, d_num)
55
56 return distance[m % 2][n]
57
58
59 def wer(reference, hypothesis, ignore_case=False, delimiter=' '):
60 """Calculate word error rate (WER). WER compares reference text and
61 hypothesis text in word-level. WER is defined as:
62
63 .. math::
64 WER = (Sw + Dw + Iw) / Nw
65
66 where
67
68 .. code-block:: text
69
70 Sw is the number of words subsituted,
71 Dw is the number of words deleted,
72 Iw is the number of words inserted,
73 Nw is the number of words in the reference
74
75 We can use levenshtein distance to calculate WER. Please draw an attention
76 that empty items will be removed when splitting sentences by delimiter.
77
78 :param reference: The reference sentence.
79 :type reference: basestring
80 :param hypothesis: The hypothesis sentence.
81 :type hypothesis: basestring
82 :param ignore_case: Whether case-sensitive or not.
83 :type ignore_case: bool
84 :param delimiter: Delimiter of input sentences.
85 :type delimiter: char
86 :return: Word error rate.
87 :rtype: float
88 :raises ValueError: If the reference length is zero.
89 """
90 if ignore_case == True:
91 reference = reference.lower()
92 hypothesis = hypothesis.lower()
93
94 ref_words = filter(None, reference.split(delimiter))
95 hyp_words = filter(None, hypothesis.split(delimiter))
96
97 if len(ref_words) == 0:
98 raise ValueError("Reference's word number should be greater than 0.")
99
100 edit_distance = _levenshtein_distance(ref_words, hyp_words)
101 wer = float(edit_distance) / len(ref_words)
102 return wer
103
104
105 def cer(reference, hypothesis, ignore_case=False, remove_space=False):
106 """Calculate charactor error rate (CER). CER compares reference text and
107 hypothesis text in char-level. CER is defined as:
108
109 .. math::
110 CER = (Sc + Dc + Ic) / Nc
111
112 where
113
114 .. code-block:: text
115
116 Sc is the number of characters substituted,
117 Dc is the number of characters deleted,
118 Ic is the number of characters inserted
119 Nc is the number of characters in the reference
120
121 We can use levenshtein distance to calculate CER. Chinese input should be
122 encoded to unicode. Please draw an attention that the leading and tailing
123 space characters will be truncated and multiple consecutive space
124 characters in a sentence will be replaced by one space character.
125
126 :param reference: The reference sentence.
127 :type reference: basestring
128 :param hypothesis: The hypothesis sentence.
129 :type hypothesis: basestring
130 :param ignore_case: Whether case-sensitive or not.
131 :type ignore_case: bool
132 :param remove_space: Whether remove internal space characters
133 :type remove_space: bool
134 :return: Character error rate.
135 :rtype: float
136 :raises ValueError: If the reference length is zero.
137 """
138 if ignore_case == True:
139 reference = reference.lower()
140 hypothesis = hypothesis.lower()
141
142 join_char = ' '
143 if remove_space == True:
144 join_char = ''
145
146 reference = join_char.join(filter(None, reference.split(' ')))
147 hypothesis = join_char.join(filter(None, hypothesis.split(' ')))
148
149 if len(reference) == 0:
150 raise ValueError("Length of reference should be greater than 0.")
151
152 edit_distance = _levenshtein_distance(reference, hypothesis)
153 cer = float(edit_distance) / len(reference)
154 return cer
155
[end of utils/error_rate.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/utils/error_rate.py b/utils/error_rate.py
--- a/utils/error_rate.py
+++ b/utils/error_rate.py
@@ -56,6 +56,62 @@
return distance[m % 2][n]
+def word_errors(reference, hypothesis, ignore_case=False, delimiter=' '):
+ """Compute the levenshtein distance between reference sequence and
+ hypothesis sequence in word-level.
+
+ :param reference: The reference sentence.
+ :type reference: basestring
+ :param hypothesis: The hypothesis sentence.
+ :type hypothesis: basestring
+ :param ignore_case: Whether case-sensitive or not.
+ :type ignore_case: bool
+ :param delimiter: Delimiter of input sentences.
+ :type delimiter: char
+ :return: Levenshtein distance and word number of reference sentence.
+ :rtype: list
+ """
+ if ignore_case == True:
+ reference = reference.lower()
+ hypothesis = hypothesis.lower()
+
+ ref_words = filter(None, reference.split(delimiter))
+ hyp_words = filter(None, hypothesis.split(delimiter))
+
+ edit_distance = _levenshtein_distance(ref_words, hyp_words)
+ return float(edit_distance), len(ref_words)
+
+
+def char_errors(reference, hypothesis, ignore_case=False, remove_space=False):
+ """Compute the levenshtein distance between reference sequence and
+ hypothesis sequence in char-level.
+
+ :param reference: The reference sentence.
+ :type reference: basestring
+ :param hypothesis: The hypothesis sentence.
+ :type hypothesis: basestring
+ :param ignore_case: Whether case-sensitive or not.
+ :type ignore_case: bool
+ :param remove_space: Whether remove internal space characters
+ :type remove_space: bool
+ :return: Levenshtein distance and length of reference sentence.
+ :rtype: list
+ """
+ if ignore_case == True:
+ reference = reference.lower()
+ hypothesis = hypothesis.lower()
+
+ join_char = ' '
+ if remove_space == True:
+ join_char = ''
+
+ reference = join_char.join(filter(None, reference.split(' ')))
+ hypothesis = join_char.join(filter(None, hypothesis.split(' ')))
+
+ edit_distance = _levenshtein_distance(reference, hypothesis)
+ return float(edit_distance), len(reference)
+
+
def wer(reference, hypothesis, ignore_case=False, delimiter=' '):
"""Calculate word error rate (WER). WER compares reference text and
hypothesis text in word-level. WER is defined as:
@@ -85,20 +141,15 @@
:type delimiter: char
:return: Word error rate.
:rtype: float
- :raises ValueError: If the reference length is zero.
+ :raises ValueError: If word number of reference is zero.
"""
- if ignore_case == True:
- reference = reference.lower()
- hypothesis = hypothesis.lower()
+ edit_distance, ref_len = word_errors(reference, hypothesis, ignore_case,
+ delimiter)
- ref_words = filter(None, reference.split(delimiter))
- hyp_words = filter(None, hypothesis.split(delimiter))
-
- if len(ref_words) == 0:
+ if ref_len == 0:
raise ValueError("Reference's word number should be greater than 0.")
- edit_distance = _levenshtein_distance(ref_words, hyp_words)
- wer = float(edit_distance) / len(ref_words)
+ wer = float(edit_distance) / ref_len
return wer
@@ -135,20 +186,11 @@
:rtype: float
:raises ValueError: If the reference length is zero.
"""
- if ignore_case == True:
- reference = reference.lower()
- hypothesis = hypothesis.lower()
+ edit_distance, ref_len = char_errors(reference, hypothesis, ignore_case,
+ remove_space)
- join_char = ' '
- if remove_space == True:
- join_char = ''
-
- reference = join_char.join(filter(None, reference.split(' ')))
- hypothesis = join_char.join(filter(None, hypothesis.split(' ')))
-
- if len(reference) == 0:
+ if ref_len == 0:
raise ValueError("Length of reference should be greater than 0.")
- edit_distance = _levenshtein_distance(reference, hypothesis)
- cer = float(edit_distance) / len(reference)
+ cer = float(edit_distance) / ref_len
return cer
|
{"golden_diff": "diff --git a/utils/error_rate.py b/utils/error_rate.py\n--- a/utils/error_rate.py\n+++ b/utils/error_rate.py\n@@ -56,6 +56,62 @@\n return distance[m % 2][n]\n \n \n+def word_errors(reference, hypothesis, ignore_case=False, delimiter=' '):\n+ \"\"\"Compute the levenshtein distance between reference sequence and\n+ hypothesis sequence in word-level.\n+\n+ :param reference: The reference sentence.\n+ :type reference: basestring\n+ :param hypothesis: The hypothesis sentence.\n+ :type hypothesis: basestring\n+ :param ignore_case: Whether case-sensitive or not.\n+ :type ignore_case: bool\n+ :param delimiter: Delimiter of input sentences.\n+ :type delimiter: char\n+ :return: Levenshtein distance and word number of reference sentence.\n+ :rtype: list\n+ \"\"\"\n+ if ignore_case == True:\n+ reference = reference.lower()\n+ hypothesis = hypothesis.lower()\n+\n+ ref_words = filter(None, reference.split(delimiter))\n+ hyp_words = filter(None, hypothesis.split(delimiter))\n+\n+ edit_distance = _levenshtein_distance(ref_words, hyp_words)\n+ return float(edit_distance), len(ref_words)\n+\n+\n+def char_errors(reference, hypothesis, ignore_case=False, remove_space=False):\n+ \"\"\"Compute the levenshtein distance between reference sequence and\n+ hypothesis sequence in char-level.\n+\n+ :param reference: The reference sentence.\n+ :type reference: basestring\n+ :param hypothesis: The hypothesis sentence.\n+ :type hypothesis: basestring\n+ :param ignore_case: Whether case-sensitive or not.\n+ :type ignore_case: bool\n+ :param remove_space: Whether remove internal space characters\n+ :type remove_space: bool\n+ :return: Levenshtein distance and length of reference sentence.\n+ :rtype: list\n+ \"\"\"\n+ if ignore_case == True:\n+ reference = reference.lower()\n+ hypothesis = hypothesis.lower()\n+\n+ join_char = ' '\n+ if remove_space == True:\n+ join_char = ''\n+\n+ reference = join_char.join(filter(None, reference.split(' ')))\n+ hypothesis = join_char.join(filter(None, hypothesis.split(' ')))\n+\n+ edit_distance = _levenshtein_distance(reference, hypothesis)\n+ return float(edit_distance), len(reference)\n+\n+\n def wer(reference, hypothesis, ignore_case=False, delimiter=' '):\n \"\"\"Calculate word error rate (WER). WER compares reference text and\n hypothesis text in word-level. WER is defined as:\n@@ -85,20 +141,15 @@\n :type delimiter: char\n :return: Word error rate.\n :rtype: float\n- :raises ValueError: If the reference length is zero.\n+ :raises ValueError: If word number of reference is zero.\n \"\"\"\n- if ignore_case == True:\n- reference = reference.lower()\n- hypothesis = hypothesis.lower()\n+ edit_distance, ref_len = word_errors(reference, hypothesis, ignore_case,\n+ delimiter)\n \n- ref_words = filter(None, reference.split(delimiter))\n- hyp_words = filter(None, hypothesis.split(delimiter))\n-\n- if len(ref_words) == 0:\n+ if ref_len == 0:\n raise ValueError(\"Reference's word number should be greater than 0.\")\n \n- edit_distance = _levenshtein_distance(ref_words, hyp_words)\n- wer = float(edit_distance) / len(ref_words)\n+ wer = float(edit_distance) / ref_len\n return wer\n \n \n@@ -135,20 +186,11 @@\n :rtype: float\n :raises ValueError: If the reference length is zero.\n \"\"\"\n- if ignore_case == True:\n- reference = reference.lower()\n- hypothesis = hypothesis.lower()\n+ edit_distance, ref_len = char_errors(reference, hypothesis, ignore_case,\n+ remove_space)\n \n- join_char = ' '\n- if remove_space == True:\n- join_char = ''\n-\n- reference = join_char.join(filter(None, reference.split(' ')))\n- hypothesis = join_char.join(filter(None, hypothesis.split(' ')))\n-\n- if len(reference) == 0:\n+ if ref_len == 0:\n raise ValueError(\"Length of reference should be greater than 0.\")\n \n- edit_distance = _levenshtein_distance(reference, hypothesis)\n- cer = float(edit_distance) / len(reference)\n+ cer = float(edit_distance) / ref_len\n return cer\n", "issue": "Should expose the distance in error_rate.py\n\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n\"\"\"This module provides functions to calculate error rate in different level.\ne.g. wer for word-level, cer for char-level.\n\"\"\"\nfrom __future__ import absolute_import\nfrom __future__ import division\nfrom __future__ import print_function\n\nimport numpy as np\n\n\ndef _levenshtein_distance(ref, hyp):\n \"\"\"Levenshtein distance is a string metric for measuring the difference\n between two sequences. Informally, the levenshtein disctance is defined as\n the minimum number of single-character edits (substitutions, insertions or\n deletions) required to change one word into the other. We can naturally\n extend the edits to word level when calculate levenshtein disctance for\n two sentences.\n \"\"\"\n m = len(ref)\n n = len(hyp)\n\n # special case\n if ref == hyp:\n return 0\n if m == 0:\n return n\n if n == 0:\n return m\n\n if m < n:\n ref, hyp = hyp, ref\n m, n = n, m\n\n # use O(min(m, n)) space\n distance = np.zeros((2, n + 1), dtype=np.int32)\n\n # initialize distance matrix\n for j in xrange(n + 1):\n distance[0][j] = j\n\n # calculate levenshtein distance\n for i in xrange(1, m + 1):\n prev_row_idx = (i - 1) % 2\n cur_row_idx = i % 2\n distance[cur_row_idx][0] = i\n for j in xrange(1, n + 1):\n if ref[i - 1] == hyp[j - 1]:\n distance[cur_row_idx][j] = distance[prev_row_idx][j - 1]\n else:\n s_num = distance[prev_row_idx][j - 1] + 1\n i_num = distance[cur_row_idx][j - 1] + 1\n d_num = distance[prev_row_idx][j] + 1\n distance[cur_row_idx][j] = min(s_num, i_num, d_num)\n\n return distance[m % 2][n]\n\n\ndef wer(reference, hypothesis, ignore_case=False, delimiter=' '):\n \"\"\"Calculate word error rate (WER). WER compares reference text and\n hypothesis text in word-level. WER is defined as:\n\n .. math::\n WER = (Sw + Dw + Iw) / Nw\n\n where\n\n .. code-block:: text\n\n Sw is the number of words subsituted,\n Dw is the number of words deleted,\n Iw is the number of words inserted,\n Nw is the number of words in the reference\n\n We can use levenshtein distance to calculate WER. Please draw an attention\n that empty items will be removed when splitting sentences by delimiter.\n\n :param reference: The reference sentence.\n :type reference: basestring\n :param hypothesis: The hypothesis sentence.\n :type hypothesis: basestring\n :param ignore_case: Whether case-sensitive or not.\n :type ignore_case: bool\n :param delimiter: Delimiter of input sentences.\n :type delimiter: char\n :return: Word error rate.\n :rtype: float\n :raises ValueError: If the reference length is zero.\n \"\"\"\n if ignore_case == True:\n reference = reference.lower()\n hypothesis = hypothesis.lower()\n\n ref_words = filter(None, reference.split(delimiter))\n hyp_words = filter(None, hypothesis.split(delimiter))\n\n if len(ref_words) == 0:\n raise ValueError(\"Reference's word number should be greater than 0.\")\n\n edit_distance = _levenshtein_distance(ref_words, hyp_words)\n wer = float(edit_distance) / len(ref_words)\n return wer\n\n\ndef cer(reference, hypothesis, ignore_case=False, remove_space=False):\n \"\"\"Calculate charactor error rate (CER). CER compares reference text and\n hypothesis text in char-level. CER is defined as:\n\n .. math::\n CER = (Sc + Dc + Ic) / Nc\n\n where\n\n .. code-block:: text\n\n Sc is the number of characters substituted,\n Dc is the number of characters deleted,\n Ic is the number of characters inserted\n Nc is the number of characters in the reference\n\n We can use levenshtein distance to calculate CER. Chinese input should be\n encoded to unicode. Please draw an attention that the leading and tailing\n space characters will be truncated and multiple consecutive space\n characters in a sentence will be replaced by one space character.\n\n :param reference: The reference sentence.\n :type reference: basestring\n :param hypothesis: The hypothesis sentence.\n :type hypothesis: basestring\n :param ignore_case: Whether case-sensitive or not.\n :type ignore_case: bool\n :param remove_space: Whether remove internal space characters\n :type remove_space: bool\n :return: Character error rate.\n :rtype: float\n :raises ValueError: If the reference length is zero.\n \"\"\"\n if ignore_case == True:\n reference = reference.lower()\n hypothesis = hypothesis.lower()\n\n join_char = ' '\n if remove_space == True:\n join_char = ''\n\n reference = join_char.join(filter(None, reference.split(' ')))\n hypothesis = join_char.join(filter(None, hypothesis.split(' ')))\n\n if len(reference) == 0:\n raise ValueError(\"Length of reference should be greater than 0.\")\n\n edit_distance = _levenshtein_distance(reference, hypothesis)\n cer = float(edit_distance) / len(reference)\n return cer\n", "path": "utils/error_rate.py"}]}
| 2,162 | 1,003 |
gh_patches_debug_15205
|
rasdani/github-patches
|
git_diff
|
microsoft__DeepSpeed-2167
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[BUG] DeepSpeed 0.7.0 breaks the Accelerate CI due to pip installation
**Describe the bug**
For Accelerate we have deepspeed as an extra that gets installed during tests. As of 0.7.0 DeepSpeed is unable to be installed if pytorch is not already installed on the system, so doing `pip install -e .[testing]` (which installs torch and deepspeed at once) fails due to a compilation error on DeepSpeed's side.
**To Reproduce**
Steps to reproduce the behavior:
1. In a new environment:
```bash
git clone https://github.com/huggingface/accelerate
cd accelerate
pip install -e .[testing]
```
It won't get past the pip install
**Expected behavior**
Should install just fine
**System info (please complete the following information):**
- OS: Ubuntu 20.04
- GPU count and types: None
- Interconnects (if applicable) [e.g., two machines connected with 100 Gbps IB]
- Python version: 3.8.13
- Any other relevant info about your setup
**Launcher context**
Are you launching your experiment with the `deepspeed` launcher, MPI, or something else?
No
**Docker context**
Are you using a specific docker image that you can share?
No
**Additional context**
Add any other context about the problem here.
Full installation trace:
```bash
(deepspeed) zach@workstation:~/accelerate/accelerate$ pip install -e .[testing]
Obtaining file:///home/zach/accelerate/accelerate
Installing build dependencies ... done
Checking if build backend supports build_editable ... done
Getting requirements to build wheel ... done
Preparing metadata (pyproject.toml) ... done
Requirement already satisfied: numpy>=1.17 in /home/zach/.local/lib/python3.8/site-packages (from accelerate==0.12.0.dev0) (1.23.0)
Requirement already satisfied: packaging>=20.0 in /home/zach/.local/lib/python3.8/site-packages (from accelerate==0.12.0.dev0) (21.3)
Requirement already satisfied: psutil in /home/zach/.local/lib/python3.8/site-packages (from accelerate==0.12.0.dev0) (5.9.1)
Collecting pyyaml
Using cached PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl (701 kB)
Collecting torch>=1.4.0
Downloading torch-1.12.0-cp38-cp38-manylinux1_x86_64.whl (776.3 MB)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 776.3/776.3 MB 4.6 MB/s eta 0:00:00
Collecting deepspeed
Downloading deepspeed-0.7.0.tar.gz (629 kB)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 630.0/630.0 kB 9.2 MB/s eta 0:00:00
Preparing metadata (setup.py) ... error
error: subprocess-exited-with-error
× python setup.py egg_info did not run successfully.
│ exit code: 1
╰─> [12 lines of output]
Traceback (most recent call last):
File "<string>", line 2, in <module>
File "<pip-setuptools-caller>", line 34, in <module>
File "/tmp/pip-install-022a34y9/deepspeed_68937ff3b2bb4dbdbd7449fa5f5103b6/setup.py", line 33, in <module>
from op_builder import ALL_OPS, get_default_compute_capabilities, OpBuilder
File "/tmp/pip-install-022a34y9/deepspeed_68937ff3b2bb4dbdbd7449fa5f5103b6/op_builder/__init__.py", line 13, in <module>
from .transformer_inference import InferenceBuilder
File "/tmp/pip-install-022a34y9/deepspeed_68937ff3b2bb4dbdbd7449fa5f5103b6/op_builder/transformer_inference.py", line 1, in <module>
import torch
ModuleNotFoundError: No module named 'torch'
[WARNING] Unable to import torch, pre-compiling ops will be disabled. Please visit https://pytorch.org/ to see how to properly install torch on your system.
[WARNING] unable to import torch, please install it if you want to pre-compile any deepspeed ops.
[end of output]
note: This error originates from a subprocess, and is likely not a problem with pip.
error: metadata-generation-failed
× Encountered error while generating package metadata.
╰─> See above for output.
note: This is an issue with the package mentioned above, not pip.
hint: See above for details.
```
</issue>
<code>
[start of op_builder/transformer_inference.py]
1 import torch
2 from .builder import CUDAOpBuilder, installed_cuda_version
3
4
5 class InferenceBuilder(CUDAOpBuilder):
6 BUILD_VAR = "DS_BUILD_TRANSFORMER_INFERENCE"
7 NAME = "transformer_inference"
8
9 def __init__(self, name=None):
10 name = self.NAME if name is None else name
11 super().__init__(name=name)
12
13 def absolute_name(self):
14 return f'deepspeed.ops.transformer.inference.{self.NAME}_op'
15
16 def is_compatible(self, verbose=True):
17 cuda_okay = True
18 if not self.is_rocm_pytorch() and torch.cuda.is_available():
19 sys_cuda_major, _ = installed_cuda_version()
20 torch_cuda_major = int(torch.version.cuda.split('.')[0])
21 cuda_capability = torch.cuda.get_device_properties(0).major
22 if cuda_capability >= 8:
23 if torch_cuda_major < 11 or sys_cuda_major < 11:
24 self.warning(
25 "On Ampere and higher architectures please use CUDA 11+")
26 cuda_okay = False
27 return super().is_compatible(verbose) and cuda_okay
28
29 def sources(self):
30 return [
31 'csrc/transformer/inference/csrc/pt_binding.cpp',
32 'csrc/transformer/inference/csrc/gelu.cu',
33 'csrc/transformer/inference/csrc/normalize.cu',
34 'csrc/transformer/inference/csrc/softmax.cu',
35 'csrc/transformer/inference/csrc/dequantize.cu',
36 'csrc/transformer/inference/csrc/apply_rotary_pos_emb.cu',
37 'csrc/transformer/inference/csrc/transform.cu',
38 ]
39
40 def extra_ldflags(self):
41 if not self.is_rocm_pytorch():
42 return ['-lcurand']
43 else:
44 return []
45
46 def include_paths(self):
47 return ['csrc/transformer/inference/includes']
48
[end of op_builder/transformer_inference.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/op_builder/transformer_inference.py b/op_builder/transformer_inference.py
--- a/op_builder/transformer_inference.py
+++ b/op_builder/transformer_inference.py
@@ -1,4 +1,3 @@
-import torch
from .builder import CUDAOpBuilder, installed_cuda_version
@@ -14,6 +13,13 @@
return f'deepspeed.ops.transformer.inference.{self.NAME}_op'
def is_compatible(self, verbose=True):
+ try:
+ import torch
+ except ImportError:
+ self.warning(
+ "Please install torch if trying to pre-compile inference kernels")
+ return False
+
cuda_okay = True
if not self.is_rocm_pytorch() and torch.cuda.is_available():
sys_cuda_major, _ = installed_cuda_version()
|
{"golden_diff": "diff --git a/op_builder/transformer_inference.py b/op_builder/transformer_inference.py\n--- a/op_builder/transformer_inference.py\n+++ b/op_builder/transformer_inference.py\n@@ -1,4 +1,3 @@\n-import torch\n from .builder import CUDAOpBuilder, installed_cuda_version\n \n \n@@ -14,6 +13,13 @@\n return f'deepspeed.ops.transformer.inference.{self.NAME}_op'\n \n def is_compatible(self, verbose=True):\n+ try:\n+ import torch\n+ except ImportError:\n+ self.warning(\n+ \"Please install torch if trying to pre-compile inference kernels\")\n+ return False\n+\n cuda_okay = True\n if not self.is_rocm_pytorch() and torch.cuda.is_available():\n sys_cuda_major, _ = installed_cuda_version()\n", "issue": "[BUG] DeepSpeed 0.7.0 breaks the Accelerate CI due to pip installation\n**Describe the bug**\r\nFor Accelerate we have deepspeed as an extra that gets installed during tests. As of 0.7.0 DeepSpeed is unable to be installed if pytorch is not already installed on the system, so doing `pip install -e .[testing]` (which installs torch and deepspeed at once) fails due to a compilation error on DeepSpeed's side. \r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n1. In a new environment:\r\n```bash\r\ngit clone https://github.com/huggingface/accelerate\r\ncd accelerate\r\npip install -e .[testing]\r\n```\r\nIt won't get past the pip install\r\n\r\n**Expected behavior**\r\nShould install just fine\r\n\r\n**System info (please complete the following information):**\r\n - OS: Ubuntu 20.04\r\n - GPU count and types: None\r\n - Interconnects (if applicable) [e.g., two machines connected with 100 Gbps IB]\r\n - Python version: 3.8.13\r\n - Any other relevant info about your setup\r\n\r\n**Launcher context**\r\nAre you launching your experiment with the `deepspeed` launcher, MPI, or something else?\r\nNo\r\n\r\n**Docker context**\r\nAre you using a specific docker image that you can share?\r\nNo\r\n\r\n**Additional context**\r\nAdd any other context about the problem here.\r\n\r\nFull installation trace:\r\n```bash\r\n(deepspeed) zach@workstation:~/accelerate/accelerate$ pip install -e .[testing]\r\nObtaining file:///home/zach/accelerate/accelerate\r\n Installing build dependencies ... done\r\n Checking if build backend supports build_editable ... done\r\n Getting requirements to build wheel ... done\r\n Preparing metadata (pyproject.toml) ... done\r\nRequirement already satisfied: numpy>=1.17 in /home/zach/.local/lib/python3.8/site-packages (from accelerate==0.12.0.dev0) (1.23.0)\r\nRequirement already satisfied: packaging>=20.0 in /home/zach/.local/lib/python3.8/site-packages (from accelerate==0.12.0.dev0) (21.3)\r\nRequirement already satisfied: psutil in /home/zach/.local/lib/python3.8/site-packages (from accelerate==0.12.0.dev0) (5.9.1)\r\nCollecting pyyaml\r\n Using cached PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl (701 kB)\r\nCollecting torch>=1.4.0\r\n Downloading torch-1.12.0-cp38-cp38-manylinux1_x86_64.whl (776.3 MB)\r\n \u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501 776.3/776.3 MB 4.6 MB/s eta 0:00:00\r\nCollecting deepspeed\r\n Downloading deepspeed-0.7.0.tar.gz (629 kB)\r\n \u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501 630.0/630.0 kB 9.2 MB/s eta 0:00:00\r\n Preparing metadata (setup.py) ... error\r\n error: subprocess-exited-with-error\r\n \r\n \u00d7 python setup.py egg_info did not run successfully.\r\n \u2502 exit code: 1\r\n \u2570\u2500> [12 lines of output]\r\n Traceback (most recent call last):\r\n File \"<string>\", line 2, in <module>\r\n File \"<pip-setuptools-caller>\", line 34, in <module>\r\n File \"/tmp/pip-install-022a34y9/deepspeed_68937ff3b2bb4dbdbd7449fa5f5103b6/setup.py\", line 33, in <module>\r\n from op_builder import ALL_OPS, get_default_compute_capabilities, OpBuilder\r\n File \"/tmp/pip-install-022a34y9/deepspeed_68937ff3b2bb4dbdbd7449fa5f5103b6/op_builder/__init__.py\", line 13, in <module>\r\n from .transformer_inference import InferenceBuilder\r\n File \"/tmp/pip-install-022a34y9/deepspeed_68937ff3b2bb4dbdbd7449fa5f5103b6/op_builder/transformer_inference.py\", line 1, in <module>\r\n import torch\r\n ModuleNotFoundError: No module named 'torch'\r\n [WARNING] Unable to import torch, pre-compiling ops will be disabled. Please visit https://pytorch.org/ to see how to properly install torch on your system.\r\n [WARNING] unable to import torch, please install it if you want to pre-compile any deepspeed ops.\r\n [end of output]\r\n \r\n note: This error originates from a subprocess, and is likely not a problem with pip.\r\nerror: metadata-generation-failed\r\n\r\n\u00d7 Encountered error while generating package metadata.\r\n\u2570\u2500> See above for output.\r\n\r\nnote: This is an issue with the package mentioned above, not pip.\r\nhint: See above for details.\r\n```\n", "before_files": [{"content": "import torch\nfrom .builder import CUDAOpBuilder, installed_cuda_version\n\n\nclass InferenceBuilder(CUDAOpBuilder):\n BUILD_VAR = \"DS_BUILD_TRANSFORMER_INFERENCE\"\n NAME = \"transformer_inference\"\n\n def __init__(self, name=None):\n name = self.NAME if name is None else name\n super().__init__(name=name)\n\n def absolute_name(self):\n return f'deepspeed.ops.transformer.inference.{self.NAME}_op'\n\n def is_compatible(self, verbose=True):\n cuda_okay = True\n if not self.is_rocm_pytorch() and torch.cuda.is_available():\n sys_cuda_major, _ = installed_cuda_version()\n torch_cuda_major = int(torch.version.cuda.split('.')[0])\n cuda_capability = torch.cuda.get_device_properties(0).major\n if cuda_capability >= 8:\n if torch_cuda_major < 11 or sys_cuda_major < 11:\n self.warning(\n \"On Ampere and higher architectures please use CUDA 11+\")\n cuda_okay = False\n return super().is_compatible(verbose) and cuda_okay\n\n def sources(self):\n return [\n 'csrc/transformer/inference/csrc/pt_binding.cpp',\n 'csrc/transformer/inference/csrc/gelu.cu',\n 'csrc/transformer/inference/csrc/normalize.cu',\n 'csrc/transformer/inference/csrc/softmax.cu',\n 'csrc/transformer/inference/csrc/dequantize.cu',\n 'csrc/transformer/inference/csrc/apply_rotary_pos_emb.cu',\n 'csrc/transformer/inference/csrc/transform.cu',\n ]\n\n def extra_ldflags(self):\n if not self.is_rocm_pytorch():\n return ['-lcurand']\n else:\n return []\n\n def include_paths(self):\n return ['csrc/transformer/inference/includes']\n", "path": "op_builder/transformer_inference.py"}]}
| 2,278 | 186 |
gh_patches_debug_25489
|
rasdani/github-patches
|
git_diff
|
zulip__zulip-13866
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
provision: Clean up interface for template_database_status
Following 84edb5c5162e9299ab5fb6a0a59c402484caa98c, it's clear that we should have a cleaner database for how the arguments to `template_database_status` are passed to correctly check whether the target database (whether zulip_test_template, used by `test-backend`, or the ). I think we could do significantly better by defining a class or TypedDict defining the settings for the `zulip_test_template` and `zulip` databases and accessing those. (Or maybe just having there be a single argument for which database we're checking?).
Fundamentally, there's only two valid ways to call `template_database_status`, so it shouldn't take like 5 arguments with defaults, it should take one argument that specifies which database we want to access.
</issue>
<code>
[start of tools/lib/provision_inner.py]
1 #!/usr/bin/env python3
2 import os
3 import sys
4 import argparse
5 import glob
6 import shutil
7
8 ZULIP_PATH = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
9
10 sys.path.append(ZULIP_PATH)
11 from scripts.lib.zulip_tools import run, run_as_root, OKBLUE, ENDC, \
12 get_dev_uuid_var_path, file_or_package_hash_updated
13
14 from version import PROVISION_VERSION
15
16 from tools.setup.generate_zulip_bots_static_files import generate_zulip_bots_static_files
17
18 VENV_PATH = "/srv/zulip-py3-venv"
19 VAR_DIR_PATH = os.path.join(ZULIP_PATH, 'var')
20 LOG_DIR_PATH = os.path.join(VAR_DIR_PATH, 'log')
21 UPLOAD_DIR_PATH = os.path.join(VAR_DIR_PATH, 'uploads')
22 TEST_UPLOAD_DIR_PATH = os.path.join(VAR_DIR_PATH, 'test_uploads')
23 COVERAGE_DIR_PATH = os.path.join(VAR_DIR_PATH, 'coverage')
24 NODE_TEST_COVERAGE_DIR_PATH = os.path.join(VAR_DIR_PATH, 'node-coverage')
25 XUNIT_XML_TEST_RESULTS_DIR_PATH = os.path.join(VAR_DIR_PATH, 'xunit-test-results')
26
27 is_travis = 'TRAVIS' in os.environ
28
29 # TODO: De-duplicate this with emoji_dump.py
30 EMOJI_CACHE_PATH = "/srv/zulip-emoji-cache"
31 if is_travis:
32 # In Travis CI, we don't have root access
33 EMOJI_CACHE_PATH = "/home/travis/zulip-emoji-cache"
34
35 UUID_VAR_PATH = get_dev_uuid_var_path()
36
37 def setup_shell_profile(shell_profile):
38 # type: (str) -> None
39 shell_profile_path = os.path.expanduser(shell_profile)
40
41 def write_command(command):
42 # type: (str) -> None
43 if os.path.exists(shell_profile_path):
44 with open(shell_profile_path, 'r') as shell_profile_file:
45 lines = [line.strip() for line in shell_profile_file.readlines()]
46 if command not in lines:
47 with open(shell_profile_path, 'a+') as shell_profile_file:
48 shell_profile_file.writelines(command + '\n')
49 else:
50 with open(shell_profile_path, 'w') as shell_profile_file:
51 shell_profile_file.writelines(command + '\n')
52
53 source_activate_command = "source " + os.path.join(VENV_PATH, "bin", "activate")
54 write_command(source_activate_command)
55 if os.path.exists('/srv/zulip'):
56 write_command('cd /srv/zulip')
57
58 def setup_bash_profile() -> None:
59 """Select a bash profile file to add setup code to."""
60
61 BASH_PROFILES = [
62 os.path.expanduser(p) for p in
63 ("~/.bash_profile", "~/.bash_login", "~/.profile")
64 ]
65
66 def clear_old_profile() -> None:
67 # An earlier version of this script would output a fresh .bash_profile
68 # even though a .profile existed in the image used. As a convenience to
69 # existing developers (and, perhaps, future developers git-bisecting the
70 # provisioning scripts), check for this situation, and blow away the
71 # created .bash_profile if one is found.
72
73 BASH_PROFILE = BASH_PROFILES[0]
74 DOT_PROFILE = BASH_PROFILES[2]
75 OLD_PROFILE_TEXT = "source /srv/zulip-py3-venv/bin/activate\n" + \
76 "cd /srv/zulip\n"
77
78 if os.path.exists(DOT_PROFILE):
79 try:
80 with open(BASH_PROFILE, "r") as f:
81 profile_contents = f.read()
82 if profile_contents == OLD_PROFILE_TEXT:
83 os.unlink(BASH_PROFILE)
84 except FileNotFoundError:
85 pass
86
87 clear_old_profile()
88
89 for candidate_profile in BASH_PROFILES:
90 if os.path.exists(candidate_profile):
91 setup_shell_profile(candidate_profile)
92 break
93 else:
94 # no existing bash profile found; claim .bash_profile
95 setup_shell_profile(BASH_PROFILES[0])
96
97 def main(options: argparse.Namespace) -> int:
98 setup_bash_profile()
99 setup_shell_profile('~/.zprofile')
100
101 # This needs to happen before anything that imports zproject.settings.
102 run(["scripts/setup/generate_secrets.py", "--development"])
103
104 # create log directory `zulip/var/log`
105 os.makedirs(LOG_DIR_PATH, exist_ok=True)
106 # create upload directory `var/uploads`
107 os.makedirs(UPLOAD_DIR_PATH, exist_ok=True)
108 # create test upload directory `var/test_upload`
109 os.makedirs(TEST_UPLOAD_DIR_PATH, exist_ok=True)
110 # create coverage directory `var/coverage`
111 os.makedirs(COVERAGE_DIR_PATH, exist_ok=True)
112 # create linecoverage directory `var/node-coverage`
113 os.makedirs(NODE_TEST_COVERAGE_DIR_PATH, exist_ok=True)
114 # create XUnit XML test results directory`var/xunit-test-results`
115 os.makedirs(XUNIT_XML_TEST_RESULTS_DIR_PATH, exist_ok=True)
116
117 # The `build_emoji` script requires `emoji-datasource` package
118 # which we install via npm; thus this step is after installing npm
119 # packages.
120 if not os.access(EMOJI_CACHE_PATH, os.W_OK):
121 run_as_root(["mkdir", "-p", EMOJI_CACHE_PATH])
122 run_as_root(["chown", "%s:%s" % (os.getuid(), os.getgid()), EMOJI_CACHE_PATH])
123 run(["tools/setup/emoji/build_emoji"])
124
125 # copy over static files from the zulip_bots package
126 generate_zulip_bots_static_files()
127
128 build_pygments_data_paths = ["tools/setup/build_pygments_data", "tools/setup/lang.json"]
129 from pygments import __version__ as pygments_version
130 if file_or_package_hash_updated(build_pygments_data_paths, "build_pygments_data_hash", options.is_force,
131 [pygments_version]):
132 run(["tools/setup/build_pygments_data"])
133 else:
134 print("No need to run `tools/setup/build_pygments_data`.")
135
136 update_authors_json_paths = ["tools/update-authors-json", "zerver/tests/fixtures/authors.json"]
137 if file_or_package_hash_updated(update_authors_json_paths, "update_authors_json_hash", options.is_force):
138 run(["tools/update-authors-json", "--use-fixture"])
139 else:
140 print("No need to run `tools/update-authors-json`.")
141
142 email_source_paths = ["scripts/setup/inline-email-css", "templates/zerver/emails/email.css"]
143 email_source_paths += glob.glob('templates/zerver/emails/*.source.html')
144 if file_or_package_hash_updated(email_source_paths, "last_email_source_files_hash", options.is_force):
145 run(["scripts/setup/inline-email-css"])
146 else:
147 print("No need to run `scripts/setup/inline-email-css`.")
148
149 if not options.is_production_travis:
150 # The following block is skipped for the production Travis
151 # suite, because that suite doesn't make use of these elements
152 # of the development environment (it just uses the development
153 # environment to build a release tarball).
154
155 # Need to set up Django before using template_database_status
156 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "zproject.settings")
157 import django
158 django.setup()
159
160 from zerver.lib.test_fixtures import template_database_status, run_db_migrations, \
161 destroy_leaked_test_databases
162
163 try:
164 from zerver.lib.queue import SimpleQueueClient
165 SimpleQueueClient()
166 rabbitmq_is_configured = True
167 except Exception:
168 rabbitmq_is_configured = False
169
170 if options.is_force or not rabbitmq_is_configured:
171 run(["scripts/setup/configure-rabbitmq"])
172 else:
173 print("RabbitMQ is already configured.")
174
175 migration_status_path = os.path.join(UUID_VAR_PATH, "migration_status_dev")
176 dev_template_db_status = template_database_status(
177 migration_status=migration_status_path,
178 settings="zproject.settings",
179 database_name="zulip",
180 )
181 if options.is_force or dev_template_db_status == 'needs_rebuild':
182 run(["tools/setup/postgres-init-dev-db"])
183 run(["tools/do-destroy-rebuild-database"])
184 elif dev_template_db_status == 'run_migrations':
185 run_db_migrations('dev')
186 elif dev_template_db_status == 'current':
187 print("No need to regenerate the dev DB.")
188
189 test_template_db_status = template_database_status()
190 if options.is_force or test_template_db_status == 'needs_rebuild':
191 run(["tools/setup/postgres-init-test-db"])
192 run(["tools/do-destroy-rebuild-test-database"])
193 elif test_template_db_status == 'run_migrations':
194 run_db_migrations('test')
195 elif test_template_db_status == 'current':
196 print("No need to regenerate the test DB.")
197
198 # Consider updating generated translations data: both `.mo`
199 # files and `language-options.json`.
200 paths = ['zerver/management/commands/compilemessages.py']
201 paths += glob.glob('locale/*/LC_MESSAGES/*.po')
202 paths += glob.glob('locale/*/translations.json')
203
204 if file_or_package_hash_updated(paths, "last_compilemessages_hash", options.is_force):
205 run(["./manage.py", "compilemessages"])
206 else:
207 print("No need to run `manage.py compilemessages`.")
208
209 destroyed = destroy_leaked_test_databases()
210 if destroyed:
211 print("Dropped %s stale test databases!" % (destroyed,))
212
213 run(["scripts/lib/clean-unused-caches", "--threshold=6"])
214
215 # Keeping this cache file around can cause eslint to throw
216 # random TypeErrors when new/updated dependencies are added
217 if os.path.isfile('.eslintcache'):
218 # Remove this block when
219 # https://github.com/eslint/eslint/issues/11639 is fixed
220 # upstream.
221 os.remove('.eslintcache')
222
223 # Clean up the root of the `var/` directory for various
224 # testing-related files that we have migrated to
225 # `var/<uuid>/test-backend`.
226 print("Cleaning var/ directory files...")
227 var_paths = glob.glob('var/test*')
228 var_paths.append('var/bot_avatar')
229 for path in var_paths:
230 try:
231 if os.path.isdir(path):
232 shutil.rmtree(path)
233 else:
234 os.remove(path)
235 except FileNotFoundError:
236 pass
237
238 version_file = os.path.join(UUID_VAR_PATH, 'provision_version')
239 print('writing to %s\n' % (version_file,))
240 open(version_file, 'w').write(PROVISION_VERSION + '\n')
241
242 print()
243 print(OKBLUE + "Zulip development environment setup succeeded!" + ENDC)
244 return 0
245
246 if __name__ == "__main__":
247 parser = argparse.ArgumentParser()
248 parser.add_argument('--force', action='store_true', dest='is_force',
249 default=False,
250 help="Ignore all provisioning optimizations.")
251
252 parser.add_argument('--production-travis', action='store_true',
253 dest='is_production_travis',
254 default=False,
255 help="Provision for Travis with production settings.")
256
257 options = parser.parse_args()
258 sys.exit(main(options))
259
[end of tools/lib/provision_inner.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/tools/lib/provision_inner.py b/tools/lib/provision_inner.py
--- a/tools/lib/provision_inner.py
+++ b/tools/lib/provision_inner.py
@@ -172,12 +172,7 @@
else:
print("RabbitMQ is already configured.")
- migration_status_path = os.path.join(UUID_VAR_PATH, "migration_status_dev")
- dev_template_db_status = template_database_status(
- migration_status=migration_status_path,
- settings="zproject.settings",
- database_name="zulip",
- )
+ dev_template_db_status = template_database_status('dev')
if options.is_force or dev_template_db_status == 'needs_rebuild':
run(["tools/setup/postgres-init-dev-db"])
run(["tools/do-destroy-rebuild-database"])
@@ -186,7 +181,7 @@
elif dev_template_db_status == 'current':
print("No need to regenerate the dev DB.")
- test_template_db_status = template_database_status()
+ test_template_db_status = template_database_status('test')
if options.is_force or test_template_db_status == 'needs_rebuild':
run(["tools/setup/postgres-init-test-db"])
run(["tools/do-destroy-rebuild-test-database"])
|
{"golden_diff": "diff --git a/tools/lib/provision_inner.py b/tools/lib/provision_inner.py\n--- a/tools/lib/provision_inner.py\n+++ b/tools/lib/provision_inner.py\n@@ -172,12 +172,7 @@\n else:\n print(\"RabbitMQ is already configured.\")\n \n- migration_status_path = os.path.join(UUID_VAR_PATH, \"migration_status_dev\")\n- dev_template_db_status = template_database_status(\n- migration_status=migration_status_path,\n- settings=\"zproject.settings\",\n- database_name=\"zulip\",\n- )\n+ dev_template_db_status = template_database_status('dev')\n if options.is_force or dev_template_db_status == 'needs_rebuild':\n run([\"tools/setup/postgres-init-dev-db\"])\n run([\"tools/do-destroy-rebuild-database\"])\n@@ -186,7 +181,7 @@\n elif dev_template_db_status == 'current':\n print(\"No need to regenerate the dev DB.\")\n \n- test_template_db_status = template_database_status()\n+ test_template_db_status = template_database_status('test')\n if options.is_force or test_template_db_status == 'needs_rebuild':\n run([\"tools/setup/postgres-init-test-db\"])\n run([\"tools/do-destroy-rebuild-test-database\"])\n", "issue": "provision: Clean up interface for template_database_status\nFollowing 84edb5c5162e9299ab5fb6a0a59c402484caa98c, it's clear that we should have a cleaner database for how the arguments to `template_database_status` are passed to correctly check whether the target database (whether zulip_test_template, used by `test-backend`, or the ). I think we could do significantly better by defining a class or TypedDict defining the settings for the `zulip_test_template` and `zulip` databases and accessing those. (Or maybe just having there be a single argument for which database we're checking?). \r\n\r\nFundamentally, there's only two valid ways to call `template_database_status`, so it shouldn't take like 5 arguments with defaults, it should take one argument that specifies which database we want to access.\n", "before_files": [{"content": "#!/usr/bin/env python3\nimport os\nimport sys\nimport argparse\nimport glob\nimport shutil\n\nZULIP_PATH = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))\n\nsys.path.append(ZULIP_PATH)\nfrom scripts.lib.zulip_tools import run, run_as_root, OKBLUE, ENDC, \\\n get_dev_uuid_var_path, file_or_package_hash_updated\n\nfrom version import PROVISION_VERSION\n\nfrom tools.setup.generate_zulip_bots_static_files import generate_zulip_bots_static_files\n\nVENV_PATH = \"/srv/zulip-py3-venv\"\nVAR_DIR_PATH = os.path.join(ZULIP_PATH, 'var')\nLOG_DIR_PATH = os.path.join(VAR_DIR_PATH, 'log')\nUPLOAD_DIR_PATH = os.path.join(VAR_DIR_PATH, 'uploads')\nTEST_UPLOAD_DIR_PATH = os.path.join(VAR_DIR_PATH, 'test_uploads')\nCOVERAGE_DIR_PATH = os.path.join(VAR_DIR_PATH, 'coverage')\nNODE_TEST_COVERAGE_DIR_PATH = os.path.join(VAR_DIR_PATH, 'node-coverage')\nXUNIT_XML_TEST_RESULTS_DIR_PATH = os.path.join(VAR_DIR_PATH, 'xunit-test-results')\n\nis_travis = 'TRAVIS' in os.environ\n\n# TODO: De-duplicate this with emoji_dump.py\nEMOJI_CACHE_PATH = \"/srv/zulip-emoji-cache\"\nif is_travis:\n # In Travis CI, we don't have root access\n EMOJI_CACHE_PATH = \"/home/travis/zulip-emoji-cache\"\n\nUUID_VAR_PATH = get_dev_uuid_var_path()\n\ndef setup_shell_profile(shell_profile):\n # type: (str) -> None\n shell_profile_path = os.path.expanduser(shell_profile)\n\n def write_command(command):\n # type: (str) -> None\n if os.path.exists(shell_profile_path):\n with open(shell_profile_path, 'r') as shell_profile_file:\n lines = [line.strip() for line in shell_profile_file.readlines()]\n if command not in lines:\n with open(shell_profile_path, 'a+') as shell_profile_file:\n shell_profile_file.writelines(command + '\\n')\n else:\n with open(shell_profile_path, 'w') as shell_profile_file:\n shell_profile_file.writelines(command + '\\n')\n\n source_activate_command = \"source \" + os.path.join(VENV_PATH, \"bin\", \"activate\")\n write_command(source_activate_command)\n if os.path.exists('/srv/zulip'):\n write_command('cd /srv/zulip')\n\ndef setup_bash_profile() -> None:\n \"\"\"Select a bash profile file to add setup code to.\"\"\"\n\n BASH_PROFILES = [\n os.path.expanduser(p) for p in\n (\"~/.bash_profile\", \"~/.bash_login\", \"~/.profile\")\n ]\n\n def clear_old_profile() -> None:\n # An earlier version of this script would output a fresh .bash_profile\n # even though a .profile existed in the image used. As a convenience to\n # existing developers (and, perhaps, future developers git-bisecting the\n # provisioning scripts), check for this situation, and blow away the\n # created .bash_profile if one is found.\n\n BASH_PROFILE = BASH_PROFILES[0]\n DOT_PROFILE = BASH_PROFILES[2]\n OLD_PROFILE_TEXT = \"source /srv/zulip-py3-venv/bin/activate\\n\" + \\\n \"cd /srv/zulip\\n\"\n\n if os.path.exists(DOT_PROFILE):\n try:\n with open(BASH_PROFILE, \"r\") as f:\n profile_contents = f.read()\n if profile_contents == OLD_PROFILE_TEXT:\n os.unlink(BASH_PROFILE)\n except FileNotFoundError:\n pass\n\n clear_old_profile()\n\n for candidate_profile in BASH_PROFILES:\n if os.path.exists(candidate_profile):\n setup_shell_profile(candidate_profile)\n break\n else:\n # no existing bash profile found; claim .bash_profile\n setup_shell_profile(BASH_PROFILES[0])\n\ndef main(options: argparse.Namespace) -> int:\n setup_bash_profile()\n setup_shell_profile('~/.zprofile')\n\n # This needs to happen before anything that imports zproject.settings.\n run([\"scripts/setup/generate_secrets.py\", \"--development\"])\n\n # create log directory `zulip/var/log`\n os.makedirs(LOG_DIR_PATH, exist_ok=True)\n # create upload directory `var/uploads`\n os.makedirs(UPLOAD_DIR_PATH, exist_ok=True)\n # create test upload directory `var/test_upload`\n os.makedirs(TEST_UPLOAD_DIR_PATH, exist_ok=True)\n # create coverage directory `var/coverage`\n os.makedirs(COVERAGE_DIR_PATH, exist_ok=True)\n # create linecoverage directory `var/node-coverage`\n os.makedirs(NODE_TEST_COVERAGE_DIR_PATH, exist_ok=True)\n # create XUnit XML test results directory`var/xunit-test-results`\n os.makedirs(XUNIT_XML_TEST_RESULTS_DIR_PATH, exist_ok=True)\n\n # The `build_emoji` script requires `emoji-datasource` package\n # which we install via npm; thus this step is after installing npm\n # packages.\n if not os.access(EMOJI_CACHE_PATH, os.W_OK):\n run_as_root([\"mkdir\", \"-p\", EMOJI_CACHE_PATH])\n run_as_root([\"chown\", \"%s:%s\" % (os.getuid(), os.getgid()), EMOJI_CACHE_PATH])\n run([\"tools/setup/emoji/build_emoji\"])\n\n # copy over static files from the zulip_bots package\n generate_zulip_bots_static_files()\n\n build_pygments_data_paths = [\"tools/setup/build_pygments_data\", \"tools/setup/lang.json\"]\n from pygments import __version__ as pygments_version\n if file_or_package_hash_updated(build_pygments_data_paths, \"build_pygments_data_hash\", options.is_force,\n [pygments_version]):\n run([\"tools/setup/build_pygments_data\"])\n else:\n print(\"No need to run `tools/setup/build_pygments_data`.\")\n\n update_authors_json_paths = [\"tools/update-authors-json\", \"zerver/tests/fixtures/authors.json\"]\n if file_or_package_hash_updated(update_authors_json_paths, \"update_authors_json_hash\", options.is_force):\n run([\"tools/update-authors-json\", \"--use-fixture\"])\n else:\n print(\"No need to run `tools/update-authors-json`.\")\n\n email_source_paths = [\"scripts/setup/inline-email-css\", \"templates/zerver/emails/email.css\"]\n email_source_paths += glob.glob('templates/zerver/emails/*.source.html')\n if file_or_package_hash_updated(email_source_paths, \"last_email_source_files_hash\", options.is_force):\n run([\"scripts/setup/inline-email-css\"])\n else:\n print(\"No need to run `scripts/setup/inline-email-css`.\")\n\n if not options.is_production_travis:\n # The following block is skipped for the production Travis\n # suite, because that suite doesn't make use of these elements\n # of the development environment (it just uses the development\n # environment to build a release tarball).\n\n # Need to set up Django before using template_database_status\n os.environ.setdefault(\"DJANGO_SETTINGS_MODULE\", \"zproject.settings\")\n import django\n django.setup()\n\n from zerver.lib.test_fixtures import template_database_status, run_db_migrations, \\\n destroy_leaked_test_databases\n\n try:\n from zerver.lib.queue import SimpleQueueClient\n SimpleQueueClient()\n rabbitmq_is_configured = True\n except Exception:\n rabbitmq_is_configured = False\n\n if options.is_force or not rabbitmq_is_configured:\n run([\"scripts/setup/configure-rabbitmq\"])\n else:\n print(\"RabbitMQ is already configured.\")\n\n migration_status_path = os.path.join(UUID_VAR_PATH, \"migration_status_dev\")\n dev_template_db_status = template_database_status(\n migration_status=migration_status_path,\n settings=\"zproject.settings\",\n database_name=\"zulip\",\n )\n if options.is_force or dev_template_db_status == 'needs_rebuild':\n run([\"tools/setup/postgres-init-dev-db\"])\n run([\"tools/do-destroy-rebuild-database\"])\n elif dev_template_db_status == 'run_migrations':\n run_db_migrations('dev')\n elif dev_template_db_status == 'current':\n print(\"No need to regenerate the dev DB.\")\n\n test_template_db_status = template_database_status()\n if options.is_force or test_template_db_status == 'needs_rebuild':\n run([\"tools/setup/postgres-init-test-db\"])\n run([\"tools/do-destroy-rebuild-test-database\"])\n elif test_template_db_status == 'run_migrations':\n run_db_migrations('test')\n elif test_template_db_status == 'current':\n print(\"No need to regenerate the test DB.\")\n\n # Consider updating generated translations data: both `.mo`\n # files and `language-options.json`.\n paths = ['zerver/management/commands/compilemessages.py']\n paths += glob.glob('locale/*/LC_MESSAGES/*.po')\n paths += glob.glob('locale/*/translations.json')\n\n if file_or_package_hash_updated(paths, \"last_compilemessages_hash\", options.is_force):\n run([\"./manage.py\", \"compilemessages\"])\n else:\n print(\"No need to run `manage.py compilemessages`.\")\n\n destroyed = destroy_leaked_test_databases()\n if destroyed:\n print(\"Dropped %s stale test databases!\" % (destroyed,))\n\n run([\"scripts/lib/clean-unused-caches\", \"--threshold=6\"])\n\n # Keeping this cache file around can cause eslint to throw\n # random TypeErrors when new/updated dependencies are added\n if os.path.isfile('.eslintcache'):\n # Remove this block when\n # https://github.com/eslint/eslint/issues/11639 is fixed\n # upstream.\n os.remove('.eslintcache')\n\n # Clean up the root of the `var/` directory for various\n # testing-related files that we have migrated to\n # `var/<uuid>/test-backend`.\n print(\"Cleaning var/ directory files...\")\n var_paths = glob.glob('var/test*')\n var_paths.append('var/bot_avatar')\n for path in var_paths:\n try:\n if os.path.isdir(path):\n shutil.rmtree(path)\n else:\n os.remove(path)\n except FileNotFoundError:\n pass\n\n version_file = os.path.join(UUID_VAR_PATH, 'provision_version')\n print('writing to %s\\n' % (version_file,))\n open(version_file, 'w').write(PROVISION_VERSION + '\\n')\n\n print()\n print(OKBLUE + \"Zulip development environment setup succeeded!\" + ENDC)\n return 0\n\nif __name__ == \"__main__\":\n parser = argparse.ArgumentParser()\n parser.add_argument('--force', action='store_true', dest='is_force',\n default=False,\n help=\"Ignore all provisioning optimizations.\")\n\n parser.add_argument('--production-travis', action='store_true',\n dest='is_production_travis',\n default=False,\n help=\"Provision for Travis with production settings.\")\n\n options = parser.parse_args()\n sys.exit(main(options))\n", "path": "tools/lib/provision_inner.py"}]}
| 3,811 | 275 |
gh_patches_debug_38568
|
rasdani/github-patches
|
git_diff
|
Project-MONAI__MONAI-2344
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
UpSample module does not support `size` parameter for `nontrainable` mode
The `size` parameter is used to specify the spatial size of the output for `nontrainable` mode ( see: https://pytorch.org/docs/stable/generated/torch.nn.Upsample.html). I think this parameter should be added into our current UpSample module.
</issue>
<code>
[start of monai/networks/blocks/upsample.py]
1 # Copyright 2020 - 2021 MONAI Consortium
2 # Licensed under the Apache License, Version 2.0 (the "License");
3 # you may not use this file except in compliance with the License.
4 # You may obtain a copy of the License at
5 # http://www.apache.org/licenses/LICENSE-2.0
6 # Unless required by applicable law or agreed to in writing, software
7 # distributed under the License is distributed on an "AS IS" BASIS,
8 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9 # See the License for the specific language governing permissions and
10 # limitations under the License.
11
12 from typing import Optional, Sequence, Union
13
14 import torch
15 import torch.nn as nn
16
17 from monai.networks.layers.factories import Conv, Pad, Pool
18 from monai.networks.utils import icnr_init, pixelshuffle
19 from monai.utils import InterpolateMode, UpsampleMode, ensure_tuple_rep
20
21 __all__ = ["Upsample", "UpSample", "SubpixelUpsample", "Subpixelupsample", "SubpixelUpSample"]
22
23
24 class UpSample(nn.Sequential):
25 """
26 Upsamples data by `scale_factor`.
27 Supported modes are:
28
29 - "deconv": uses a transposed convolution.
30 - "nontrainable": uses :py:class:`torch.nn.Upsample`.
31 - "pixelshuffle": uses :py:class:`monai.networks.blocks.SubpixelUpsample`.
32
33 This module can optionally take a pre-convolution
34 (often used to map the number of features from `in_channels` to `out_channels`).
35 """
36
37 def __init__(
38 self,
39 dimensions: int,
40 in_channels: Optional[int] = None,
41 out_channels: Optional[int] = None,
42 scale_factor: Union[Sequence[float], float] = 2,
43 mode: Union[UpsampleMode, str] = UpsampleMode.DECONV,
44 pre_conv: Optional[Union[nn.Module, str]] = "default",
45 interp_mode: Union[InterpolateMode, str] = InterpolateMode.LINEAR,
46 align_corners: Optional[bool] = True,
47 bias: bool = True,
48 apply_pad_pool: bool = True,
49 ) -> None:
50 """
51 Args:
52 dimensions: number of spatial dimensions of the input image.
53 in_channels: number of channels of the input image.
54 out_channels: number of channels of the output image. Defaults to `in_channels`.
55 scale_factor: multiplier for spatial size. Has to match input size if it is a tuple. Defaults to 2.
56 mode: {``"deconv"``, ``"nontrainable"``, ``"pixelshuffle"``}. Defaults to ``"deconv"``.
57 pre_conv: a conv block applied before upsampling. Defaults to None.
58 When ``conv_block`` is ``"default"``, one reserved conv layer will be utilized when
59 Only used in the "nontrainable" or "pixelshuffle" mode.
60 interp_mode: {``"nearest"``, ``"linear"``, ``"bilinear"``, ``"bicubic"``, ``"trilinear"``}
61 Only used when ``mode`` is ``UpsampleMode.NONTRAINABLE``.
62 If ends with ``"linear"`` will use ``spatial dims`` to determine the correct interpolation.
63 This corresponds to linear, bilinear, trilinear for 1D, 2D, and 3D respectively.
64 The interpolation mode. Defaults to ``"linear"``.
65 See also: https://pytorch.org/docs/stable/nn.html#upsample
66 align_corners: set the align_corners parameter of `torch.nn.Upsample`. Defaults to True.
67 Only used in the nontrainable mode.
68 bias: whether to have a bias term in the default preconv and deconv layers. Defaults to True.
69 apply_pad_pool: if True the upsampled tensor is padded then average pooling is applied with a kernel the
70 size of `scale_factor` with a stride of 1. See also: :py:class:`monai.networks.blocks.SubpixelUpsample`.
71 Only used in the pixelshuffle mode.
72 """
73 super().__init__()
74 scale_factor_ = ensure_tuple_rep(scale_factor, dimensions)
75 up_mode = UpsampleMode(mode)
76 if up_mode == UpsampleMode.DECONV:
77 if not in_channels:
78 raise ValueError(f"in_channels needs to be specified in the '{mode}' mode.")
79 self.add_module(
80 "deconv",
81 Conv[Conv.CONVTRANS, dimensions](
82 in_channels=in_channels,
83 out_channels=out_channels or in_channels,
84 kernel_size=scale_factor_,
85 stride=scale_factor_,
86 bias=bias,
87 ),
88 )
89 elif up_mode == UpsampleMode.NONTRAINABLE:
90 if pre_conv == "default" and (out_channels != in_channels): # defaults to no conv if out_chns==in_chns
91 if not in_channels:
92 raise ValueError(f"in_channels needs to be specified in the '{mode}' mode.")
93 self.add_module(
94 "preconv",
95 Conv[Conv.CONV, dimensions](
96 in_channels=in_channels, out_channels=out_channels or in_channels, kernel_size=1, bias=bias
97 ),
98 )
99 elif pre_conv is not None and pre_conv != "default":
100 self.add_module("preconv", pre_conv) # type: ignore
101
102 interp_mode = InterpolateMode(interp_mode)
103 linear_mode = [InterpolateMode.LINEAR, InterpolateMode.BILINEAR, InterpolateMode.TRILINEAR]
104 if interp_mode in linear_mode: # choose mode based on dimensions
105 interp_mode = linear_mode[dimensions - 1]
106 self.add_module(
107 "upsample_non_trainable",
108 nn.Upsample(scale_factor=scale_factor_, mode=interp_mode.value, align_corners=align_corners),
109 )
110 elif up_mode == UpsampleMode.PIXELSHUFFLE:
111 self.add_module(
112 "pixelshuffle",
113 SubpixelUpsample(
114 dimensions=dimensions,
115 in_channels=in_channels,
116 out_channels=out_channels,
117 scale_factor=scale_factor_[0], # isotropic
118 conv_block=pre_conv,
119 apply_pad_pool=apply_pad_pool,
120 bias=bias,
121 ),
122 )
123 else:
124 raise NotImplementedError(f"Unsupported upsampling mode {mode}.")
125
126
127 class SubpixelUpsample(nn.Module):
128 """
129 Upsample via using a subpixel CNN. This module supports 1D, 2D and 3D input images.
130 The module is consisted with two parts. First of all, a convolutional layer is employed
131 to increase the number of channels into: ``in_channels * (scale_factor ** dimensions)``.
132 Secondly, a pixel shuffle manipulation is utilized to aggregates the feature maps from
133 low resolution space and build the super resolution space.
134 The first part of the module is not fixed, a sequential layers can be used to replace the
135 default single layer.
136
137 See: Shi et al., 2016, "Real-Time Single Image and Video Super-Resolution
138 Using a nEfficient Sub-Pixel Convolutional Neural Network."
139
140 See: Aitken et al., 2017, "Checkerboard artifact free sub-pixel convolution".
141
142 The idea comes from:
143 https://arxiv.org/abs/1609.05158
144
145 The pixel shuffle mechanism refers to:
146 https://github.com/pytorch/pytorch/blob/master/aten/src/ATen/native/PixelShuffle.cpp
147 and:
148 https://github.com/pytorch/pytorch/pull/6340/files
149
150 """
151
152 def __init__(
153 self,
154 dimensions: int,
155 in_channels: Optional[int],
156 out_channels: Optional[int] = None,
157 scale_factor: int = 2,
158 conv_block: Optional[Union[nn.Module, str]] = "default",
159 apply_pad_pool: bool = True,
160 bias: bool = True,
161 ) -> None:
162 """
163 Args:
164 dimensions: number of spatial dimensions of the input image.
165 in_channels: number of channels of the input image.
166 out_channels: optional number of channels of the output image.
167 scale_factor: multiplier for spatial size. Defaults to 2.
168 conv_block: a conv block to extract feature maps before upsampling. Defaults to None.
169
170 - When ``conv_block`` is ``"default"``, one reserved conv layer will be utilized.
171 - When ``conv_block`` is an ``nn.module``,
172 please ensure the output number of channels is divisible ``(scale_factor ** dimensions)``.
173
174 apply_pad_pool: if True the upsampled tensor is padded then average pooling is applied with a kernel the
175 size of `scale_factor` with a stride of 1. This implements the nearest neighbour resize convolution
176 component of subpixel convolutions described in Aitken et al.
177 bias: whether to have a bias term in the default conv_block. Defaults to True.
178 """
179 super().__init__()
180
181 if scale_factor <= 0:
182 raise ValueError(f"The `scale_factor` multiplier must be an integer greater than 0, got {scale_factor}.")
183
184 self.dimensions = dimensions
185 self.scale_factor = scale_factor
186
187 if conv_block == "default":
188 out_channels = out_channels or in_channels
189 if not out_channels:
190 raise ValueError("in_channels need to be specified.")
191 conv_out_channels = out_channels * (scale_factor ** dimensions)
192 self.conv_block = Conv[Conv.CONV, dimensions](
193 in_channels=in_channels, out_channels=conv_out_channels, kernel_size=3, stride=1, padding=1, bias=bias
194 )
195
196 icnr_init(self.conv_block, self.scale_factor)
197 elif conv_block is None:
198 self.conv_block = nn.Identity()
199 else:
200 self.conv_block = conv_block
201
202 self.pad_pool: nn.Module = nn.Identity()
203
204 if apply_pad_pool:
205 pool_type = Pool[Pool.AVG, self.dimensions]
206 pad_type = Pad[Pad.CONSTANTPAD, self.dimensions]
207
208 self.pad_pool = nn.Sequential(
209 pad_type(padding=(self.scale_factor - 1, 0) * self.dimensions, value=0.0),
210 pool_type(kernel_size=self.scale_factor, stride=1),
211 )
212
213 def forward(self, x: torch.Tensor) -> torch.Tensor:
214 """
215 Args:
216 x: Tensor in shape (batch, channel, spatial_1[, spatial_2, ...).
217 """
218 x = self.conv_block(x)
219 if x.shape[1] % (self.scale_factor ** self.dimensions) != 0:
220 raise ValueError(
221 f"Number of channels after `conv_block` ({x.shape[1]}) must be evenly "
222 "divisible by scale_factor ** dimensions "
223 f"({self.scale_factor}^{self.dimensions}={self.scale_factor**self.dimensions})."
224 )
225 x = pixelshuffle(x, self.dimensions, self.scale_factor)
226 x = self.pad_pool(x)
227 return x
228
229
230 Upsample = UpSample
231 Subpixelupsample = SubpixelUpSample = SubpixelUpsample
232
[end of monai/networks/blocks/upsample.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/monai/networks/blocks/upsample.py b/monai/networks/blocks/upsample.py
--- a/monai/networks/blocks/upsample.py
+++ b/monai/networks/blocks/upsample.py
@@ -9,7 +9,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from typing import Optional, Sequence, Union
+from typing import Optional, Sequence, Tuple, Union
import torch
import torch.nn as nn
@@ -40,6 +40,7 @@
in_channels: Optional[int] = None,
out_channels: Optional[int] = None,
scale_factor: Union[Sequence[float], float] = 2,
+ size: Optional[Union[Tuple[int], int]] = None,
mode: Union[UpsampleMode, str] = UpsampleMode.DECONV,
pre_conv: Optional[Union[nn.Module, str]] = "default",
interp_mode: Union[InterpolateMode, str] = InterpolateMode.LINEAR,
@@ -53,6 +54,11 @@
in_channels: number of channels of the input image.
out_channels: number of channels of the output image. Defaults to `in_channels`.
scale_factor: multiplier for spatial size. Has to match input size if it is a tuple. Defaults to 2.
+ size: spatial size of the output image.
+ Only used when ``mode`` is ``UpsampleMode.NONTRAINABLE``.
+ In torch.nn.functional.interpolate, only one of `size` or `scale_factor` should be defined,
+ thus if size is defined, `scale_factor` will not be used.
+ Defaults to None.
mode: {``"deconv"``, ``"nontrainable"``, ``"pixelshuffle"``}. Defaults to ``"deconv"``.
pre_conv: a conv block applied before upsampling. Defaults to None.
When ``conv_block`` is ``"default"``, one reserved conv layer will be utilized when
@@ -105,7 +111,12 @@
interp_mode = linear_mode[dimensions - 1]
self.add_module(
"upsample_non_trainable",
- nn.Upsample(scale_factor=scale_factor_, mode=interp_mode.value, align_corners=align_corners),
+ nn.Upsample(
+ size=size,
+ scale_factor=None if size else scale_factor_,
+ mode=interp_mode.value,
+ align_corners=align_corners,
+ ),
)
elif up_mode == UpsampleMode.PIXELSHUFFLE:
self.add_module(
|
{"golden_diff": "diff --git a/monai/networks/blocks/upsample.py b/monai/networks/blocks/upsample.py\n--- a/monai/networks/blocks/upsample.py\n+++ b/monai/networks/blocks/upsample.py\n@@ -9,7 +9,7 @@\n # See the License for the specific language governing permissions and\n # limitations under the License.\n \n-from typing import Optional, Sequence, Union\n+from typing import Optional, Sequence, Tuple, Union\n \n import torch\n import torch.nn as nn\n@@ -40,6 +40,7 @@\n in_channels: Optional[int] = None,\n out_channels: Optional[int] = None,\n scale_factor: Union[Sequence[float], float] = 2,\n+ size: Optional[Union[Tuple[int], int]] = None,\n mode: Union[UpsampleMode, str] = UpsampleMode.DECONV,\n pre_conv: Optional[Union[nn.Module, str]] = \"default\",\n interp_mode: Union[InterpolateMode, str] = InterpolateMode.LINEAR,\n@@ -53,6 +54,11 @@\n in_channels: number of channels of the input image.\n out_channels: number of channels of the output image. Defaults to `in_channels`.\n scale_factor: multiplier for spatial size. Has to match input size if it is a tuple. Defaults to 2.\n+ size: spatial size of the output image.\n+ Only used when ``mode`` is ``UpsampleMode.NONTRAINABLE``.\n+ In torch.nn.functional.interpolate, only one of `size` or `scale_factor` should be defined,\n+ thus if size is defined, `scale_factor` will not be used.\n+ Defaults to None.\n mode: {``\"deconv\"``, ``\"nontrainable\"``, ``\"pixelshuffle\"``}. Defaults to ``\"deconv\"``.\n pre_conv: a conv block applied before upsampling. Defaults to None.\n When ``conv_block`` is ``\"default\"``, one reserved conv layer will be utilized when\n@@ -105,7 +111,12 @@\n interp_mode = linear_mode[dimensions - 1]\n self.add_module(\n \"upsample_non_trainable\",\n- nn.Upsample(scale_factor=scale_factor_, mode=interp_mode.value, align_corners=align_corners),\n+ nn.Upsample(\n+ size=size,\n+ scale_factor=None if size else scale_factor_,\n+ mode=interp_mode.value,\n+ align_corners=align_corners,\n+ ),\n )\n elif up_mode == UpsampleMode.PIXELSHUFFLE:\n self.add_module(\n", "issue": "UpSample module does not support `size` parameter for `nontrainable` mode\nThe `size` parameter is used to specify the spatial size of the output for `nontrainable` mode ( see: https://pytorch.org/docs/stable/generated/torch.nn.Upsample.html). I think this parameter should be added into our current UpSample module.\n", "before_files": [{"content": "# Copyright 2020 - 2021 MONAI Consortium\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n# http://www.apache.org/licenses/LICENSE-2.0\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nfrom typing import Optional, Sequence, Union\n\nimport torch\nimport torch.nn as nn\n\nfrom monai.networks.layers.factories import Conv, Pad, Pool\nfrom monai.networks.utils import icnr_init, pixelshuffle\nfrom monai.utils import InterpolateMode, UpsampleMode, ensure_tuple_rep\n\n__all__ = [\"Upsample\", \"UpSample\", \"SubpixelUpsample\", \"Subpixelupsample\", \"SubpixelUpSample\"]\n\n\nclass UpSample(nn.Sequential):\n \"\"\"\n Upsamples data by `scale_factor`.\n Supported modes are:\n\n - \"deconv\": uses a transposed convolution.\n - \"nontrainable\": uses :py:class:`torch.nn.Upsample`.\n - \"pixelshuffle\": uses :py:class:`monai.networks.blocks.SubpixelUpsample`.\n\n This module can optionally take a pre-convolution\n (often used to map the number of features from `in_channels` to `out_channels`).\n \"\"\"\n\n def __init__(\n self,\n dimensions: int,\n in_channels: Optional[int] = None,\n out_channels: Optional[int] = None,\n scale_factor: Union[Sequence[float], float] = 2,\n mode: Union[UpsampleMode, str] = UpsampleMode.DECONV,\n pre_conv: Optional[Union[nn.Module, str]] = \"default\",\n interp_mode: Union[InterpolateMode, str] = InterpolateMode.LINEAR,\n align_corners: Optional[bool] = True,\n bias: bool = True,\n apply_pad_pool: bool = True,\n ) -> None:\n \"\"\"\n Args:\n dimensions: number of spatial dimensions of the input image.\n in_channels: number of channels of the input image.\n out_channels: number of channels of the output image. Defaults to `in_channels`.\n scale_factor: multiplier for spatial size. Has to match input size if it is a tuple. Defaults to 2.\n mode: {``\"deconv\"``, ``\"nontrainable\"``, ``\"pixelshuffle\"``}. Defaults to ``\"deconv\"``.\n pre_conv: a conv block applied before upsampling. Defaults to None.\n When ``conv_block`` is ``\"default\"``, one reserved conv layer will be utilized when\n Only used in the \"nontrainable\" or \"pixelshuffle\" mode.\n interp_mode: {``\"nearest\"``, ``\"linear\"``, ``\"bilinear\"``, ``\"bicubic\"``, ``\"trilinear\"``}\n Only used when ``mode`` is ``UpsampleMode.NONTRAINABLE``.\n If ends with ``\"linear\"`` will use ``spatial dims`` to determine the correct interpolation.\n This corresponds to linear, bilinear, trilinear for 1D, 2D, and 3D respectively.\n The interpolation mode. Defaults to ``\"linear\"``.\n See also: https://pytorch.org/docs/stable/nn.html#upsample\n align_corners: set the align_corners parameter of `torch.nn.Upsample`. Defaults to True.\n Only used in the nontrainable mode.\n bias: whether to have a bias term in the default preconv and deconv layers. Defaults to True.\n apply_pad_pool: if True the upsampled tensor is padded then average pooling is applied with a kernel the\n size of `scale_factor` with a stride of 1. See also: :py:class:`monai.networks.blocks.SubpixelUpsample`.\n Only used in the pixelshuffle mode.\n \"\"\"\n super().__init__()\n scale_factor_ = ensure_tuple_rep(scale_factor, dimensions)\n up_mode = UpsampleMode(mode)\n if up_mode == UpsampleMode.DECONV:\n if not in_channels:\n raise ValueError(f\"in_channels needs to be specified in the '{mode}' mode.\")\n self.add_module(\n \"deconv\",\n Conv[Conv.CONVTRANS, dimensions](\n in_channels=in_channels,\n out_channels=out_channels or in_channels,\n kernel_size=scale_factor_,\n stride=scale_factor_,\n bias=bias,\n ),\n )\n elif up_mode == UpsampleMode.NONTRAINABLE:\n if pre_conv == \"default\" and (out_channels != in_channels): # defaults to no conv if out_chns==in_chns\n if not in_channels:\n raise ValueError(f\"in_channels needs to be specified in the '{mode}' mode.\")\n self.add_module(\n \"preconv\",\n Conv[Conv.CONV, dimensions](\n in_channels=in_channels, out_channels=out_channels or in_channels, kernel_size=1, bias=bias\n ),\n )\n elif pre_conv is not None and pre_conv != \"default\":\n self.add_module(\"preconv\", pre_conv) # type: ignore\n\n interp_mode = InterpolateMode(interp_mode)\n linear_mode = [InterpolateMode.LINEAR, InterpolateMode.BILINEAR, InterpolateMode.TRILINEAR]\n if interp_mode in linear_mode: # choose mode based on dimensions\n interp_mode = linear_mode[dimensions - 1]\n self.add_module(\n \"upsample_non_trainable\",\n nn.Upsample(scale_factor=scale_factor_, mode=interp_mode.value, align_corners=align_corners),\n )\n elif up_mode == UpsampleMode.PIXELSHUFFLE:\n self.add_module(\n \"pixelshuffle\",\n SubpixelUpsample(\n dimensions=dimensions,\n in_channels=in_channels,\n out_channels=out_channels,\n scale_factor=scale_factor_[0], # isotropic\n conv_block=pre_conv,\n apply_pad_pool=apply_pad_pool,\n bias=bias,\n ),\n )\n else:\n raise NotImplementedError(f\"Unsupported upsampling mode {mode}.\")\n\n\nclass SubpixelUpsample(nn.Module):\n \"\"\"\n Upsample via using a subpixel CNN. This module supports 1D, 2D and 3D input images.\n The module is consisted with two parts. First of all, a convolutional layer is employed\n to increase the number of channels into: ``in_channels * (scale_factor ** dimensions)``.\n Secondly, a pixel shuffle manipulation is utilized to aggregates the feature maps from\n low resolution space and build the super resolution space.\n The first part of the module is not fixed, a sequential layers can be used to replace the\n default single layer.\n\n See: Shi et al., 2016, \"Real-Time Single Image and Video Super-Resolution\n Using a nEfficient Sub-Pixel Convolutional Neural Network.\"\n\n See: Aitken et al., 2017, \"Checkerboard artifact free sub-pixel convolution\".\n\n The idea comes from:\n https://arxiv.org/abs/1609.05158\n\n The pixel shuffle mechanism refers to:\n https://github.com/pytorch/pytorch/blob/master/aten/src/ATen/native/PixelShuffle.cpp\n and:\n https://github.com/pytorch/pytorch/pull/6340/files\n\n \"\"\"\n\n def __init__(\n self,\n dimensions: int,\n in_channels: Optional[int],\n out_channels: Optional[int] = None,\n scale_factor: int = 2,\n conv_block: Optional[Union[nn.Module, str]] = \"default\",\n apply_pad_pool: bool = True,\n bias: bool = True,\n ) -> None:\n \"\"\"\n Args:\n dimensions: number of spatial dimensions of the input image.\n in_channels: number of channels of the input image.\n out_channels: optional number of channels of the output image.\n scale_factor: multiplier for spatial size. Defaults to 2.\n conv_block: a conv block to extract feature maps before upsampling. Defaults to None.\n\n - When ``conv_block`` is ``\"default\"``, one reserved conv layer will be utilized.\n - When ``conv_block`` is an ``nn.module``,\n please ensure the output number of channels is divisible ``(scale_factor ** dimensions)``.\n\n apply_pad_pool: if True the upsampled tensor is padded then average pooling is applied with a kernel the\n size of `scale_factor` with a stride of 1. This implements the nearest neighbour resize convolution\n component of subpixel convolutions described in Aitken et al.\n bias: whether to have a bias term in the default conv_block. Defaults to True.\n \"\"\"\n super().__init__()\n\n if scale_factor <= 0:\n raise ValueError(f\"The `scale_factor` multiplier must be an integer greater than 0, got {scale_factor}.\")\n\n self.dimensions = dimensions\n self.scale_factor = scale_factor\n\n if conv_block == \"default\":\n out_channels = out_channels or in_channels\n if not out_channels:\n raise ValueError(\"in_channels need to be specified.\")\n conv_out_channels = out_channels * (scale_factor ** dimensions)\n self.conv_block = Conv[Conv.CONV, dimensions](\n in_channels=in_channels, out_channels=conv_out_channels, kernel_size=3, stride=1, padding=1, bias=bias\n )\n\n icnr_init(self.conv_block, self.scale_factor)\n elif conv_block is None:\n self.conv_block = nn.Identity()\n else:\n self.conv_block = conv_block\n\n self.pad_pool: nn.Module = nn.Identity()\n\n if apply_pad_pool:\n pool_type = Pool[Pool.AVG, self.dimensions]\n pad_type = Pad[Pad.CONSTANTPAD, self.dimensions]\n\n self.pad_pool = nn.Sequential(\n pad_type(padding=(self.scale_factor - 1, 0) * self.dimensions, value=0.0),\n pool_type(kernel_size=self.scale_factor, stride=1),\n )\n\n def forward(self, x: torch.Tensor) -> torch.Tensor:\n \"\"\"\n Args:\n x: Tensor in shape (batch, channel, spatial_1[, spatial_2, ...).\n \"\"\"\n x = self.conv_block(x)\n if x.shape[1] % (self.scale_factor ** self.dimensions) != 0:\n raise ValueError(\n f\"Number of channels after `conv_block` ({x.shape[1]}) must be evenly \"\n \"divisible by scale_factor ** dimensions \"\n f\"({self.scale_factor}^{self.dimensions}={self.scale_factor**self.dimensions}).\"\n )\n x = pixelshuffle(x, self.dimensions, self.scale_factor)\n x = self.pad_pool(x)\n return x\n\n\nUpsample = UpSample\nSubpixelupsample = SubpixelUpSample = SubpixelUpsample\n", "path": "monai/networks/blocks/upsample.py"}]}
| 3,603 | 574 |
gh_patches_debug_20245
|
rasdani/github-patches
|
git_diff
|
translate__translate-3405
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Backwards incompatible change in multistring
The behavior of the `multistring` class with respect to string comparisons has changed in 1.14-rc1, more specifically when the `autoencode` class was removed in 4f9ee7edfc9. At least this is the case in Python 2.7.
I have experienced this in some custom Pootle code when testing out TTK from master — a multistring with non-ASCII characters was being compared against the empty byte string `''`, and it resulted in a encoding error. I can reproduce this in a test case:
``` python
from translate.misc import multistring
def test_cmp():
t = multistring.multistring
s1 = t("test")
assert s1.__cmp__("test") == 0
s2 = t(u"téßt")
assert s2.__cmp__("test") > 0
```
(Note that for 1.13.x the multistring constructor needs an `encoding='UTF-8'` parameter in the test).
I'm not sure if this could be considered a bug, after all my understanding is apps/libraries should internally work with code points and not bytes, however this is a breaking change that might potentially affect existing consumer code so I consider it's worth bringing this up to hear people's thoughts.
</issue>
<code>
[start of translate/misc/multistring.py]
1 # -*- coding: utf-8 -*-
2 #
3 # Copyright 2006 Zuza Software Foundation
4 #
5 # This file is part of translate.
6 #
7 # translate is free software; you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation; either version 2 of the License, or
10 # (at your option) any later version.
11 #
12 # translate is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
16 #
17 # You should have received a copy of the GNU General Public License
18 # along with this program; if not, see <http://www.gnu.org/licenses/>.
19
20 """Supports a hybrid Unicode string that can also have a list of alternate
21 strings in the strings attribute"""
22
23 import six
24
25
26 class multistring(six.text_type):
27
28 def __new__(newtype, string=u"", *args, **kwargs):
29 if isinstance(string, list):
30 if not string:
31 raise ValueError("multistring must contain at least one string")
32 mainstring = string[0]
33 newstring = multistring.__new__(newtype, string[0])
34 newstring.strings = [newstring] + [multistring.__new__(newtype, altstring) for altstring in string[1:]]
35 else:
36 newstring = six.text_type.__new__(newtype, string)
37 newstring.strings = [newstring]
38 return newstring
39
40 def __init__(self, *args, **kwargs):
41 super(multistring, self).__init__()
42 if not hasattr(self, "strings"):
43 self.strings = []
44
45 def __cmp__(self, otherstring):
46 def cmp_compat(s1, s2):
47 # Python 3 compatible cmp() equivalent
48 return (s1 > s2) - (s1 < s2)
49 if isinstance(otherstring, multistring):
50 parentcompare = cmp_compat(six.text_type(self), otherstring)
51 if parentcompare:
52 return parentcompare
53 else:
54 return cmp_compat(self.strings[1:], otherstring.strings[1:])
55 elif isinstance(otherstring, six.text_type):
56 return cmp_compat(six.text_type(self), otherstring)
57 elif isinstance(otherstring, bytes):
58 return cmp_compat(bytes(self), otherstring)
59 elif isinstance(otherstring, list) and otherstring:
60 return cmp_compat(self, multistring(otherstring))
61 else:
62 return cmp_compat(str(type(self)), str(type(otherstring)))
63
64 def __hash__(self):
65 return hash(''.join(self.strings))
66
67 def __ne__(self, otherstring):
68 return self.__cmp__(otherstring) != 0
69
70 def __eq__(self, otherstring):
71 return self.__cmp__(otherstring) == 0
72
73 def __repr__(self):
74 return "multistring([" + ",".join(self.strings) + "])"
75
76 def replace(self, old, new, count=None):
77 if count is None:
78 newstr = multistring(super(multistring, self).replace(old, new))
79 else:
80 newstr = multistring(super(multistring, self).replace(old, new, count))
81 for s in self.strings[1:]:
82 if count is None:
83 newstr.strings.append(s.replace(old, new))
84 else:
85 newstr.strings.append(s.replace(old, new, count))
86 return newstr
87
[end of translate/misc/multistring.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/translate/misc/multistring.py b/translate/misc/multistring.py
--- a/translate/misc/multistring.py
+++ b/translate/misc/multistring.py
@@ -55,7 +55,7 @@
elif isinstance(otherstring, six.text_type):
return cmp_compat(six.text_type(self), otherstring)
elif isinstance(otherstring, bytes):
- return cmp_compat(bytes(self), otherstring)
+ return cmp_compat(self.encode('utf-8'), otherstring)
elif isinstance(otherstring, list) and otherstring:
return cmp_compat(self, multistring(otherstring))
else:
@@ -71,7 +71,8 @@
return self.__cmp__(otherstring) == 0
def __repr__(self):
- return "multistring([" + ",".join(self.strings) + "])"
+ _repr = "multistring([" + u",".join(self.strings) + "])"
+ return _repr.encode('utf-8') if six.PY2 else _repr
def replace(self, old, new, count=None):
if count is None:
|
{"golden_diff": "diff --git a/translate/misc/multistring.py b/translate/misc/multistring.py\n--- a/translate/misc/multistring.py\n+++ b/translate/misc/multistring.py\n@@ -55,7 +55,7 @@\n elif isinstance(otherstring, six.text_type):\n return cmp_compat(six.text_type(self), otherstring)\n elif isinstance(otherstring, bytes):\n- return cmp_compat(bytes(self), otherstring)\n+ return cmp_compat(self.encode('utf-8'), otherstring)\n elif isinstance(otherstring, list) and otherstring:\n return cmp_compat(self, multistring(otherstring))\n else:\n@@ -71,7 +71,8 @@\n return self.__cmp__(otherstring) == 0\n \n def __repr__(self):\n- return \"multistring([\" + \",\".join(self.strings) + \"])\"\n+ _repr = \"multistring([\" + u\",\".join(self.strings) + \"])\"\n+ return _repr.encode('utf-8') if six.PY2 else _repr\n \n def replace(self, old, new, count=None):\n if count is None:\n", "issue": "Backwards incompatible change in multistring\nThe behavior of the `multistring` class with respect to string comparisons has changed in 1.14-rc1, more specifically when the `autoencode` class was removed in 4f9ee7edfc9. At least this is the case in Python 2.7.\n\nI have experienced this in some custom Pootle code when testing out TTK from master \u2014 a multistring with non-ASCII characters was being compared against the empty byte string `''`, and it resulted in a encoding error. I can reproduce this in a test case:\n\n``` python\nfrom translate.misc import multistring\n\ndef test_cmp():\n t = multistring.multistring\n s1 = t(\"test\")\n assert s1.__cmp__(\"test\") == 0\n\n s2 = t(u\"t\u00e9\u00dft\")\n assert s2.__cmp__(\"test\") > 0\n```\n\n(Note that for 1.13.x the multistring constructor needs an `encoding='UTF-8'` parameter in the test).\n\nI'm not sure if this could be considered a bug, after all my understanding is apps/libraries should internally work with code points and not bytes, however this is a breaking change that might potentially affect existing consumer code so I consider it's worth bringing this up to hear people's thoughts.\n\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n#\n# Copyright 2006 Zuza Software Foundation\n#\n# This file is part of translate.\n#\n# translate is free software; you can redistribute it and/or modify\n# it under the terms of the GNU General Public License as published by\n# the Free Software Foundation; either version 2 of the License, or\n# (at your option) any later version.\n#\n# translate is distributed in the hope that it will be useful,\n# but WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n# GNU General Public License for more details.\n#\n# You should have received a copy of the GNU General Public License\n# along with this program; if not, see <http://www.gnu.org/licenses/>.\n\n\"\"\"Supports a hybrid Unicode string that can also have a list of alternate\nstrings in the strings attribute\"\"\"\n\nimport six\n\n\nclass multistring(six.text_type):\n\n def __new__(newtype, string=u\"\", *args, **kwargs):\n if isinstance(string, list):\n if not string:\n raise ValueError(\"multistring must contain at least one string\")\n mainstring = string[0]\n newstring = multistring.__new__(newtype, string[0])\n newstring.strings = [newstring] + [multistring.__new__(newtype, altstring) for altstring in string[1:]]\n else:\n newstring = six.text_type.__new__(newtype, string)\n newstring.strings = [newstring]\n return newstring\n\n def __init__(self, *args, **kwargs):\n super(multistring, self).__init__()\n if not hasattr(self, \"strings\"):\n self.strings = []\n\n def __cmp__(self, otherstring):\n def cmp_compat(s1, s2):\n # Python 3 compatible cmp() equivalent\n return (s1 > s2) - (s1 < s2)\n if isinstance(otherstring, multistring):\n parentcompare = cmp_compat(six.text_type(self), otherstring)\n if parentcompare:\n return parentcompare\n else:\n return cmp_compat(self.strings[1:], otherstring.strings[1:])\n elif isinstance(otherstring, six.text_type):\n return cmp_compat(six.text_type(self), otherstring)\n elif isinstance(otherstring, bytes):\n return cmp_compat(bytes(self), otherstring)\n elif isinstance(otherstring, list) and otherstring:\n return cmp_compat(self, multistring(otherstring))\n else:\n return cmp_compat(str(type(self)), str(type(otherstring)))\n\n def __hash__(self):\n return hash(''.join(self.strings))\n\n def __ne__(self, otherstring):\n return self.__cmp__(otherstring) != 0\n\n def __eq__(self, otherstring):\n return self.__cmp__(otherstring) == 0\n\n def __repr__(self):\n return \"multistring([\" + \",\".join(self.strings) + \"])\"\n\n def replace(self, old, new, count=None):\n if count is None:\n newstr = multistring(super(multistring, self).replace(old, new))\n else:\n newstr = multistring(super(multistring, self).replace(old, new, count))\n for s in self.strings[1:]:\n if count is None:\n newstr.strings.append(s.replace(old, new))\n else:\n newstr.strings.append(s.replace(old, new, count))\n return newstr\n", "path": "translate/misc/multistring.py"}]}
| 1,731 | 244 |
gh_patches_debug_15464
|
rasdani/github-patches
|
git_diff
|
open-telemetry__opentelemetry-python-contrib-1870
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Elasticsearch sanitization does not work for bulk queries
**Describe your environment**
Discovered in elasticsearch 5.5.3 and elasticsearch-dsl 5.4.0 and caused by moving to the default sanitization in #1758.
The issue is illustrated here where `body` comes in as a string, not as a dictionary:
<img width="1355" alt="image" src="https://github.com/open-telemetry/opentelemetry-python-contrib/assets/684275/0f49ce7d-9558-4148-a2fd-28dc4bd70983">
This is caseud by the bulk flow specifically as the body gets translated to a string here:
<img width="1174" alt="image" src="https://github.com/open-telemetry/opentelemetry-python-contrib/assets/684275/2106e7aa-2bde-4579-b562-a8dc23007a1c">
which looks like this:
<img width="1144" alt="image" src="https://github.com/open-telemetry/opentelemetry-python-contrib/assets/684275/ae72d60a-5047-4559-ad05-6fc1ddb2658d">
**Steps to reproduce**
I don't have a super straightforward way to reproduce other than to use the bulk API from elasticsearch.
**What is the expected behavior?**
What did you expect to see?
**What is the actual behavior?**
The below stacktrace:
```
File "/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/elasticsearch/helpers/__init__.py", line 95, in _process_bulk_chunk
resp = client.bulk('\n'.join(bulk_actions) + '\n', **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/elasticsearch/client/utils.py", line 73, in _wrapped
return func(*args, params=params, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/elasticsearch/client/__init__.py", line 1173, in bulk
return self.transport.perform_request('POST', _make_path(index,
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/opentelemetry/instrumentation/elasticsearch/__init__.py", line 224, in wrapper
attributes[SpanAttributes.DB_STATEMENT] = sanitize_body(
^^^^^^^^^^^^^^
File "/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/opentelemetry/instrumentation/elasticsearch/utils.py", line 54, in sanitize_body
flatten_body = _flatten_dict(body)
^^^^^^^^^^^^^^^^^^^
File "/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/opentelemetry/instrumentation/elasticsearch/utils.py", line 30, in _flatten_dict
for k, v in d.items():
^^^^^^^
AttributeError: 'str' object has no attribute 'items'
```
**Additional context**
Add any other context about the problem here.
</issue>
<code>
[start of instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py]
1 # Copyright The OpenTelemetry Authors
2 #
3 # Licensed under the Apache License, Version 2.0 (the "License");
4 # you may not use this file except in compliance with the License.
5 # You may obtain a copy of the License at
6 #
7 # http://www.apache.org/licenses/LICENSE-2.0
8 #
9 # Unless required by applicable law or agreed to in writing, software
10 # distributed under the License is distributed on an "AS IS" BASIS,
11 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 # See the License for the specific language governing permissions and
13 # limitations under the License.
14
15 sanitized_keys = (
16 "message",
17 "should",
18 "filter",
19 "query",
20 "queries",
21 "intervals",
22 "match",
23 )
24 sanitized_value = "?"
25
26
27 # pylint: disable=C0103
28 def _flatten_dict(d, parent_key=""):
29 items = []
30 for k, v in d.items():
31 new_key = parent_key + "." + k if parent_key else k
32 # recursive call _flatten_dict for a non-empty dict value
33 if isinstance(v, dict) and v:
34 items.extend(_flatten_dict(v, new_key).items())
35 else:
36 items.append((new_key, v))
37 return dict(items)
38
39
40 def _unflatten_dict(d):
41 res = {}
42 for k, v in d.items():
43 keys = k.split(".")
44 d = res
45 for key in keys[:-1]:
46 if key not in d:
47 d[key] = {}
48 d = d[key]
49 d[keys[-1]] = v
50 return res
51
52
53 def sanitize_body(body) -> str:
54 flatten_body = _flatten_dict(body)
55
56 for key in flatten_body:
57 if key.endswith(sanitized_keys):
58 flatten_body[key] = sanitized_value
59
60 return str(_unflatten_dict(flatten_body))
61
[end of instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py
--- a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py
+++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py
@@ -11,6 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+import json
sanitized_keys = (
"message",
@@ -51,6 +52,9 @@
def sanitize_body(body) -> str:
+ if isinstance(body, str):
+ body = json.loads(body)
+
flatten_body = _flatten_dict(body)
for key in flatten_body:
|
{"golden_diff": "diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py\n--- a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py\n+++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py\n@@ -11,6 +11,7 @@\n # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n # See the License for the specific language governing permissions and\n # limitations under the License.\n+import json\n \n sanitized_keys = (\n \"message\",\n@@ -51,6 +52,9 @@\n \n \n def sanitize_body(body) -> str:\n+ if isinstance(body, str):\n+ body = json.loads(body)\n+\n flatten_body = _flatten_dict(body)\n \n for key in flatten_body:\n", "issue": "Elasticsearch sanitization does not work for bulk queries\n**Describe your environment**\r\n\r\nDiscovered in elasticsearch 5.5.3 and elasticsearch-dsl 5.4.0 and caused by moving to the default sanitization in #1758.\r\n\r\nThe issue is illustrated here where `body` comes in as a string, not as a dictionary:\r\n\r\n<img width=\"1355\" alt=\"image\" src=\"https://github.com/open-telemetry/opentelemetry-python-contrib/assets/684275/0f49ce7d-9558-4148-a2fd-28dc4bd70983\">\r\n\r\nThis is caseud by the bulk flow specifically as the body gets translated to a string here:\r\n\r\n<img width=\"1174\" alt=\"image\" src=\"https://github.com/open-telemetry/opentelemetry-python-contrib/assets/684275/2106e7aa-2bde-4579-b562-a8dc23007a1c\">\r\n\r\nwhich looks like this:\r\n\r\n<img width=\"1144\" alt=\"image\" src=\"https://github.com/open-telemetry/opentelemetry-python-contrib/assets/684275/ae72d60a-5047-4559-ad05-6fc1ddb2658d\">\r\n\r\n\r\n**Steps to reproduce**\r\n\r\nI don't have a super straightforward way to reproduce other than to use the bulk API from elasticsearch.\r\n\r\n\r\n**What is the expected behavior?**\r\nWhat did you expect to see?\r\n\r\n**What is the actual behavior?**\r\n\r\nThe below stacktrace:\r\n\r\n```\r\n File \"/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/elasticsearch/helpers/__init__.py\", line 95, in _process_bulk_chunk\r\n resp = client.bulk('\\n'.join(bulk_actions) + '\\n', **kwargs)\r\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\r\n File \"/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/elasticsearch/client/utils.py\", line 73, in _wrapped\r\n return func(*args, params=params, **kwargs)\r\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\r\n File \"/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/elasticsearch/client/__init__.py\", line 1173, in bulk\r\n return self.transport.perform_request('POST', _make_path(index,\r\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\r\n File \"/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/opentelemetry/instrumentation/elasticsearch/__init__.py\", line 224, in wrapper\r\n attributes[SpanAttributes.DB_STATEMENT] = sanitize_body(\r\n ^^^^^^^^^^^^^^\r\n File \"/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/opentelemetry/instrumentation/elasticsearch/utils.py\", line 54, in sanitize_body\r\n flatten_body = _flatten_dict(body)\r\n ^^^^^^^^^^^^^^^^^^^\r\n File \"/Users/phillip/Library/Caches/pypoetry/virtualenvs/someenv/lib/python3.11/site-packages/opentelemetry/instrumentation/elasticsearch/utils.py\", line 30, in _flatten_dict\r\n for k, v in d.items():\r\n ^^^^^^^\r\nAttributeError: 'str' object has no attribute 'items'\r\n\r\n```\r\n\r\n**Additional context**\r\nAdd any other context about the problem here.\r\n\n", "before_files": [{"content": "# Copyright The OpenTelemetry Authors\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nsanitized_keys = (\n \"message\",\n \"should\",\n \"filter\",\n \"query\",\n \"queries\",\n \"intervals\",\n \"match\",\n)\nsanitized_value = \"?\"\n\n\n# pylint: disable=C0103\ndef _flatten_dict(d, parent_key=\"\"):\n items = []\n for k, v in d.items():\n new_key = parent_key + \".\" + k if parent_key else k\n # recursive call _flatten_dict for a non-empty dict value\n if isinstance(v, dict) and v:\n items.extend(_flatten_dict(v, new_key).items())\n else:\n items.append((new_key, v))\n return dict(items)\n\n\ndef _unflatten_dict(d):\n res = {}\n for k, v in d.items():\n keys = k.split(\".\")\n d = res\n for key in keys[:-1]:\n if key not in d:\n d[key] = {}\n d = d[key]\n d[keys[-1]] = v\n return res\n\n\ndef sanitize_body(body) -> str:\n flatten_body = _flatten_dict(body)\n\n for key in flatten_body:\n if key.endswith(sanitized_keys):\n flatten_body[key] = sanitized_value\n\n return str(_unflatten_dict(flatten_body))\n", "path": "instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py"}]}
| 1,900 | 211 |
gh_patches_debug_37982
|
rasdani/github-patches
|
git_diff
|
microsoft__botbuilder-python-1244
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[PORT] Implement hash for App Insights session ID
> Port this change from botbuilder-dotnet/master branch:
https://github.com/microsoft/botbuilder-dotnet/pull/3317
Addresses this issue reported in JS https://github.com/microsoft/botbuilder-js/issues/1512
App Insights has a maximum session ID of 64 characters, but in some instances for some channels (such as reported with Teams) this may be exceeded due to conversation ID currently being used for session ID. This PR hashes the conversation ID and sets this as the session ID. It also adds an additional telemetry property to ensure we retain the original conversation ID within the telemetry.
The hashed ID is only used for Application Insights and the original conversation ID and activity are left untouched.
# Changed projects
* integration
</issue>
<code>
[start of libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py]
1 # Copyright (c) Microsoft Corporation. All rights reserved.
2 # Licensed under the MIT License.
3 import json
4 from abc import ABC, abstractmethod
5
6
7 class TelemetryProcessor(ABC):
8 """Application Insights Telemetry Processor base class for Bot"""
9
10 @property
11 def activity_json(self) -> json:
12 """Retrieve the request body as json (Activity)."""
13 body_text = self.get_request_body()
14 body = json.loads(body_text) if body_text is not None else None
15 return body
16
17 @abstractmethod
18 def can_process(self) -> bool:
19 """Whether the processor can process the request body.
20 :return: True if the request body can be processed, False otherwise.
21 :rtype: bool
22 """
23 return False
24
25 @abstractmethod
26 def get_request_body(self) -> str: # pylint: disable=inconsistent-return-statements
27 """Retrieve the request body from flask/django middleware component."""
28 raise NotImplementedError()
29
30 def __call__(self, data, context) -> bool:
31 """ Traditional Web user and session ID's don't apply for Bots. This processor
32 replaces the identifiers to be consistent with Bot Framework's notion of
33 user and session id's.
34
35 Each event that gets logged (with this processor added) will contain additional
36 properties.
37
38 The following properties are replaced:
39 - context.user.id - The user ID that Application Insights uses to identify
40 a unique user.
41 - context.session.id - The session ID that APplication Insights uses to
42 identify a unique session.
43
44 In addition, the additional data properties are added:
45 - activityId - The Bot Framework's Activity ID which represents a unique
46 message identifier.
47 - channelId - The Bot Framework "Channel" (ie, slack/facebook/directline/etc)
48 - activityType - The Bot Framework message classification (ie, message)
49
50 :param data: Data from Application Insights
51 :type data: telemetry item
52 :param context: Context from Application Insights
53 :type context: context object
54 :returns: bool -- determines if the event is passed to the server (False = Filtered).
55 """
56
57 post_data = self.activity_json
58 if post_data is None:
59 # If there is no body (not a BOT request or not configured correctly).
60 # We *could* filter here, but we're allowing event to go through.
61 return True
62
63 # Override session and user id
64 from_prop = post_data["from"] if "from" in post_data else None
65 user_id = from_prop["id"] if from_prop is not None else None
66 channel_id = post_data["channelId"] if "channelId" in post_data else None
67 conversation = (
68 post_data["conversation"] if "conversation" in post_data else None
69 )
70 conversation_id = conversation["id"] if "id" in conversation else None
71 context.user.id = channel_id + user_id
72 context.session.id = conversation_id
73
74 # Additional bot-specific properties
75 if "id" in post_data:
76 data.properties["activityId"] = post_data["id"]
77 if "channelId" in post_data:
78 data.properties["channelId"] = post_data["channelId"]
79 if "type" in post_data:
80 data.properties["activityType"] = post_data["type"]
81 return True
82
[end of libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py
--- a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py
+++ b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py
@@ -1,7 +1,9 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
+import base64
import json
from abc import ABC, abstractmethod
+from _sha256 import sha256
class TelemetryProcessor(ABC):
@@ -11,8 +13,9 @@
def activity_json(self) -> json:
"""Retrieve the request body as json (Activity)."""
body_text = self.get_request_body()
- body = json.loads(body_text) if body_text is not None else None
- return body
+ if body_text:
+ return body_text if isinstance(body_text, dict) else json.loads(body_text)
+ return None
@abstractmethod
def can_process(self) -> bool:
@@ -67,15 +70,34 @@
conversation = (
post_data["conversation"] if "conversation" in post_data else None
)
- conversation_id = conversation["id"] if "id" in conversation else None
+
+ session_id = ""
+ if "id" in conversation:
+ conversation_id = conversation["id"]
+ session_id = base64.b64encode(
+ sha256(conversation_id.encode("utf-8")).digest()
+ ).decode()
+
+ # Set the user id on the Application Insights telemetry item.
context.user.id = channel_id + user_id
- context.session.id = conversation_id
- # Additional bot-specific properties
+ # Set the session id on the Application Insights telemetry item.
+ # Hashed ID is used due to max session ID length for App Insights session Id
+ context.session.id = session_id
+
+ # Set the activity id:
+ # https://github.com/Microsoft/botframework-obi/blob/master/botframework-activity/botframework-activity.md#id
if "id" in post_data:
data.properties["activityId"] = post_data["id"]
+
+ # Set the channel id:
+ # https://github.com/Microsoft/botframework-obi/blob/master/botframework-activity/botframework-activity.md#channel-id
if "channelId" in post_data:
data.properties["channelId"] = post_data["channelId"]
+
+ # Set the activity type:
+ # https://github.com/Microsoft/botframework-obi/blob/master/botframework-activity/botframework-activity.md#type
if "type" in post_data:
data.properties["activityType"] = post_data["type"]
+
return True
|
{"golden_diff": "diff --git a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py\n--- a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py\n+++ b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py\n@@ -1,7 +1,9 @@\n # Copyright (c) Microsoft Corporation. All rights reserved.\n # Licensed under the MIT License.\n+import base64\n import json\n from abc import ABC, abstractmethod\n+from _sha256 import sha256\n \n \n class TelemetryProcessor(ABC):\n@@ -11,8 +13,9 @@\n def activity_json(self) -> json:\n \"\"\"Retrieve the request body as json (Activity).\"\"\"\n body_text = self.get_request_body()\n- body = json.loads(body_text) if body_text is not None else None\n- return body\n+ if body_text:\n+ return body_text if isinstance(body_text, dict) else json.loads(body_text)\n+ return None\n \n @abstractmethod\n def can_process(self) -> bool:\n@@ -67,15 +70,34 @@\n conversation = (\n post_data[\"conversation\"] if \"conversation\" in post_data else None\n )\n- conversation_id = conversation[\"id\"] if \"id\" in conversation else None\n+\n+ session_id = \"\"\n+ if \"id\" in conversation:\n+ conversation_id = conversation[\"id\"]\n+ session_id = base64.b64encode(\n+ sha256(conversation_id.encode(\"utf-8\")).digest()\n+ ).decode()\n+\n+ # Set the user id on the Application Insights telemetry item.\n context.user.id = channel_id + user_id\n- context.session.id = conversation_id\n \n- # Additional bot-specific properties\n+ # Set the session id on the Application Insights telemetry item.\n+ # Hashed ID is used due to max session ID length for App Insights session Id\n+ context.session.id = session_id\n+\n+ # Set the activity id:\n+ # https://github.com/Microsoft/botframework-obi/blob/master/botframework-activity/botframework-activity.md#id\n if \"id\" in post_data:\n data.properties[\"activityId\"] = post_data[\"id\"]\n+\n+ # Set the channel id:\n+ # https://github.com/Microsoft/botframework-obi/blob/master/botframework-activity/botframework-activity.md#channel-id\n if \"channelId\" in post_data:\n data.properties[\"channelId\"] = post_data[\"channelId\"]\n+\n+ # Set the activity type:\n+ # https://github.com/Microsoft/botframework-obi/blob/master/botframework-activity/botframework-activity.md#type\n if \"type\" in post_data:\n data.properties[\"activityType\"] = post_data[\"type\"]\n+\n return True\n", "issue": "[PORT] Implement hash for App Insights session ID\n> Port this change from botbuilder-dotnet/master branch:\nhttps://github.com/microsoft/botbuilder-dotnet/pull/3317\n\nAddresses this issue reported in JS https://github.com/microsoft/botbuilder-js/issues/1512\r\n\r\nApp Insights has a maximum session ID of 64 characters, but in some instances for some channels (such as reported with Teams) this may be exceeded due to conversation ID currently being used for session ID. This PR hashes the conversation ID and sets this as the session ID. It also adds an additional telemetry property to ensure we retain the original conversation ID within the telemetry.\r\n\r\nThe hashed ID is only used for Application Insights and the original conversation ID and activity are left untouched.\n\n\r\n# Changed projects\r\n* integration\r\n\r\n\r\n\n\n", "before_files": [{"content": "# Copyright (c) Microsoft Corporation. All rights reserved.\n# Licensed under the MIT License.\nimport json\nfrom abc import ABC, abstractmethod\n\n\nclass TelemetryProcessor(ABC):\n \"\"\"Application Insights Telemetry Processor base class for Bot\"\"\"\n\n @property\n def activity_json(self) -> json:\n \"\"\"Retrieve the request body as json (Activity).\"\"\"\n body_text = self.get_request_body()\n body = json.loads(body_text) if body_text is not None else None\n return body\n\n @abstractmethod\n def can_process(self) -> bool:\n \"\"\"Whether the processor can process the request body.\n :return: True if the request body can be processed, False otherwise.\n :rtype: bool\n \"\"\"\n return False\n\n @abstractmethod\n def get_request_body(self) -> str: # pylint: disable=inconsistent-return-statements\n \"\"\"Retrieve the request body from flask/django middleware component.\"\"\"\n raise NotImplementedError()\n\n def __call__(self, data, context) -> bool:\n \"\"\" Traditional Web user and session ID's don't apply for Bots. This processor\n replaces the identifiers to be consistent with Bot Framework's notion of\n user and session id's.\n\n Each event that gets logged (with this processor added) will contain additional\n properties.\n\n The following properties are replaced:\n - context.user.id - The user ID that Application Insights uses to identify\n a unique user.\n - context.session.id - The session ID that APplication Insights uses to\n identify a unique session.\n\n In addition, the additional data properties are added:\n - activityId - The Bot Framework's Activity ID which represents a unique\n message identifier.\n - channelId - The Bot Framework \"Channel\" (ie, slack/facebook/directline/etc)\n - activityType - The Bot Framework message classification (ie, message)\n\n :param data: Data from Application Insights\n :type data: telemetry item\n :param context: Context from Application Insights\n :type context: context object\n :returns: bool -- determines if the event is passed to the server (False = Filtered).\n \"\"\"\n\n post_data = self.activity_json\n if post_data is None:\n # If there is no body (not a BOT request or not configured correctly).\n # We *could* filter here, but we're allowing event to go through.\n return True\n\n # Override session and user id\n from_prop = post_data[\"from\"] if \"from\" in post_data else None\n user_id = from_prop[\"id\"] if from_prop is not None else None\n channel_id = post_data[\"channelId\"] if \"channelId\" in post_data else None\n conversation = (\n post_data[\"conversation\"] if \"conversation\" in post_data else None\n )\n conversation_id = conversation[\"id\"] if \"id\" in conversation else None\n context.user.id = channel_id + user_id\n context.session.id = conversation_id\n\n # Additional bot-specific properties\n if \"id\" in post_data:\n data.properties[\"activityId\"] = post_data[\"id\"]\n if \"channelId\" in post_data:\n data.properties[\"channelId\"] = post_data[\"channelId\"]\n if \"type\" in post_data:\n data.properties[\"activityType\"] = post_data[\"type\"]\n return True\n", "path": "libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py"}]}
| 1,612 | 661 |
gh_patches_debug_20368
|
rasdani/github-patches
|
git_diff
|
getmoto__moto-1699
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
ECR `list_images` should return exception when repository does not exist
### Actual
`moto` [will return](https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_ListImages.html) an empty list when the ECR repository passed to `list_images` does not exist.
### Expected
The ECR client returns a `RepositoryNotFoundException` exception when the specified repository does not exist in the registry.
See AWS [docs](https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_ListImages.html).
</issue>
<code>
[start of moto/ecr/models.py]
1 from __future__ import unicode_literals
2
3 import hashlib
4 from copy import copy
5 from random import random
6
7 from moto.core import BaseBackend, BaseModel
8 from moto.ec2 import ec2_backends
9 from moto.ecr.exceptions import ImageNotFoundException, RepositoryNotFoundException
10
11 from botocore.exceptions import ParamValidationError
12
13 DEFAULT_REGISTRY_ID = '012345678910'
14
15
16 class BaseObject(BaseModel):
17
18 def camelCase(self, key):
19 words = []
20 for i, word in enumerate(key.split('_')):
21 if i > 0:
22 words.append(word.title())
23 else:
24 words.append(word)
25 return ''.join(words)
26
27 def gen_response_object(self):
28 response_object = copy(self.__dict__)
29 for key, value in response_object.items():
30 if '_' in key:
31 response_object[self.camelCase(key)] = value
32 del response_object[key]
33 return response_object
34
35 @property
36 def response_object(self):
37 return self.gen_response_object()
38
39
40 class Repository(BaseObject):
41
42 def __init__(self, repository_name):
43 self.registry_id = DEFAULT_REGISTRY_ID
44 self.arn = 'arn:aws:ecr:us-east-1:{0}:repository/{1}'.format(
45 self.registry_id, repository_name)
46 self.name = repository_name
47 # self.created = datetime.utcnow()
48 self.uri = '{0}.dkr.ecr.us-east-1.amazonaws.com/{1}'.format(
49 self.registry_id, repository_name)
50 self.images = []
51
52 @property
53 def physical_resource_id(self):
54 return self.name
55
56 @property
57 def response_object(self):
58 response_object = self.gen_response_object()
59
60 response_object['registryId'] = self.registry_id
61 response_object['repositoryArn'] = self.arn
62 response_object['repositoryName'] = self.name
63 response_object['repositoryUri'] = self.uri
64 # response_object['createdAt'] = self.created
65 del response_object['arn'], response_object['name'], response_object['images']
66 return response_object
67
68 @classmethod
69 def create_from_cloudformation_json(cls, resource_name, cloudformation_json, region_name):
70 properties = cloudformation_json['Properties']
71
72 ecr_backend = ecr_backends[region_name]
73 return ecr_backend.create_repository(
74 # RepositoryName is optional in CloudFormation, thus create a random
75 # name if necessary
76 repository_name=properties.get(
77 'RepositoryName', 'ecrrepository{0}'.format(int(random() * 10 ** 6))),
78 )
79
80 @classmethod
81 def update_from_cloudformation_json(cls, original_resource, new_resource_name, cloudformation_json, region_name):
82 properties = cloudformation_json['Properties']
83
84 if original_resource.name != properties['RepositoryName']:
85 ecr_backend = ecr_backends[region_name]
86 ecr_backend.delete_cluster(original_resource.arn)
87 return ecr_backend.create_repository(
88 # RepositoryName is optional in CloudFormation, thus create a
89 # random name if necessary
90 repository_name=properties.get(
91 'RepositoryName', 'RepositoryName{0}'.format(int(random() * 10 ** 6))),
92 )
93 else:
94 # no-op when nothing changed between old and new resources
95 return original_resource
96
97
98 class Image(BaseObject):
99
100 def __init__(self, tag, manifest, repository, registry_id=DEFAULT_REGISTRY_ID):
101 self.image_tag = tag
102 self.image_manifest = manifest
103 self.image_size_in_bytes = 50 * 1024 * 1024
104 self.repository = repository
105 self.registry_id = registry_id
106 self.image_digest = None
107 self.image_pushed_at = None
108
109 def _create_digest(self):
110 image_contents = 'docker_image{0}'.format(int(random() * 10 ** 6))
111 self.image_digest = "sha256:%s" % hashlib.sha256(image_contents.encode('utf-8')).hexdigest()
112
113 def get_image_digest(self):
114 if not self.image_digest:
115 self._create_digest()
116 return self.image_digest
117
118 @property
119 def response_object(self):
120 response_object = self.gen_response_object()
121 response_object['imageId'] = {}
122 response_object['imageId']['imageTag'] = self.image_tag
123 response_object['imageId']['imageDigest'] = self.get_image_digest()
124 response_object['imageManifest'] = self.image_manifest
125 response_object['repositoryName'] = self.repository
126 response_object['registryId'] = self.registry_id
127 return response_object
128
129 @property
130 def response_list_object(self):
131 response_object = self.gen_response_object()
132 response_object['imageTag'] = self.image_tag
133 response_object['imageDigest'] = "i don't know"
134 return response_object
135
136 @property
137 def response_describe_object(self):
138 response_object = self.gen_response_object()
139 response_object['imageTags'] = [self.image_tag]
140 response_object['imageDigest'] = self.get_image_digest()
141 response_object['imageManifest'] = self.image_manifest
142 response_object['repositoryName'] = self.repository
143 response_object['registryId'] = self.registry_id
144 response_object['imageSizeInBytes'] = self.image_size_in_bytes
145 response_object['imagePushedAt'] = '2017-05-09'
146 return response_object
147
148 @property
149 def response_batch_get_image(self):
150 response_object = {}
151 response_object['imageId'] = {}
152 response_object['imageId']['imageTag'] = self.image_tag
153 response_object['imageId']['imageDigest'] = self.get_image_digest()
154 response_object['imageManifest'] = self.image_manifest
155 response_object['repositoryName'] = self.repository
156 response_object['registryId'] = self.registry_id
157 return response_object
158
159
160 class ECRBackend(BaseBackend):
161
162 def __init__(self):
163 self.repositories = {}
164
165 def describe_repositories(self, registry_id=None, repository_names=None):
166 """
167 maxResults and nextToken not implemented
168 """
169 if repository_names:
170 for repository_name in repository_names:
171 if repository_name not in self.repositories:
172 raise RepositoryNotFoundException(repository_name, registry_id or DEFAULT_REGISTRY_ID)
173
174 repositories = []
175 for repository in self.repositories.values():
176 # If a registry_id was supplied, ensure this repository matches
177 if registry_id:
178 if repository.registry_id != registry_id:
179 continue
180 # If a list of repository names was supplied, esure this repository
181 # is in that list
182 if repository_names:
183 if repository.name not in repository_names:
184 continue
185 repositories.append(repository.response_object)
186 return repositories
187
188 def create_repository(self, repository_name):
189 repository = Repository(repository_name)
190 self.repositories[repository_name] = repository
191 return repository
192
193 def delete_repository(self, repository_name, registry_id=None):
194 if repository_name in self.repositories:
195 return self.repositories.pop(repository_name)
196 else:
197 raise RepositoryNotFoundException(repository_name, registry_id or DEFAULT_REGISTRY_ID)
198
199 def list_images(self, repository_name, registry_id=None):
200 """
201 maxResults and filtering not implemented
202 """
203 images = []
204 for repository in self.repositories.values():
205 if repository_name:
206 if repository.name != repository_name:
207 continue
208 if registry_id:
209 if repository.registry_id != registry_id:
210 continue
211
212 for image in repository.images:
213 images.append(image)
214 return images
215
216 def describe_images(self, repository_name, registry_id=None, image_ids=None):
217
218 if repository_name in self.repositories:
219 repository = self.repositories[repository_name]
220 else:
221 raise RepositoryNotFoundException(repository_name, registry_id or DEFAULT_REGISTRY_ID)
222
223 if image_ids:
224 response = set()
225 for image_id in image_ids:
226 found = False
227 for image in repository.images:
228 if (('imageDigest' in image_id and image.get_image_digest() == image_id['imageDigest']) or
229 ('imageTag' in image_id and image.image_tag == image_id['imageTag'])):
230 found = True
231 response.add(image)
232 if not found:
233 image_id_representation = "{imageDigest:'%s', imageTag:'%s'}" % (
234 image_id.get('imageDigest', 'null'),
235 image_id.get('imageTag', 'null'),
236 )
237 raise ImageNotFoundException(
238 image_id=image_id_representation,
239 repository_name=repository_name,
240 registry_id=registry_id or DEFAULT_REGISTRY_ID)
241
242 else:
243 response = []
244 for image in repository.images:
245 response.append(image)
246
247 return response
248
249 def put_image(self, repository_name, image_manifest, image_tag):
250 if repository_name in self.repositories:
251 repository = self.repositories[repository_name]
252 else:
253 raise Exception("{0} is not a repository".format(repository_name))
254
255 image = Image(image_tag, image_manifest, repository_name)
256 repository.images.append(image)
257 return image
258
259 def batch_get_image(self, repository_name, registry_id=None, image_ids=None, accepted_media_types=None):
260 if repository_name in self.repositories:
261 repository = self.repositories[repository_name]
262 else:
263 raise RepositoryNotFoundException(repository_name, registry_id or DEFAULT_REGISTRY_ID)
264
265 if not image_ids:
266 raise ParamValidationError(msg='Missing required parameter in input: "imageIds"')
267
268 response = {
269 'images': [],
270 'failures': [],
271 }
272
273 for image_id in image_ids:
274 found = False
275 for image in repository.images:
276 if (('imageDigest' in image_id and image.get_image_digest() == image_id['imageDigest']) or
277 ('imageTag' in image_id and image.image_tag == image_id['imageTag'])):
278 found = True
279 response['images'].append(image.response_batch_get_image)
280
281 if not found:
282 response['failures'].append({
283 'imageId': {
284 'imageTag': image_id.get('imageTag', 'null')
285 },
286 'failureCode': 'ImageNotFound',
287 'failureReason': 'Requested image not found'
288 })
289
290 return response
291
292
293 ecr_backends = {}
294 for region, ec2_backend in ec2_backends.items():
295 ecr_backends[region] = ECRBackend()
296
[end of moto/ecr/models.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/moto/ecr/models.py b/moto/ecr/models.py
--- a/moto/ecr/models.py
+++ b/moto/ecr/models.py
@@ -200,17 +200,22 @@
"""
maxResults and filtering not implemented
"""
- images = []
- for repository in self.repositories.values():
- if repository_name:
- if repository.name != repository_name:
- continue
+ repository = None
+ found = False
+ if repository_name in self.repositories:
+ repository = self.repositories[repository_name]
if registry_id:
- if repository.registry_id != registry_id:
- continue
+ if repository.registry_id == registry_id:
+ found = True
+ else:
+ found = True
- for image in repository.images:
- images.append(image)
+ if not found:
+ raise RepositoryNotFoundException(repository_name, registry_id or DEFAULT_REGISTRY_ID)
+
+ images = []
+ for image in repository.images:
+ images.append(image)
return images
def describe_images(self, repository_name, registry_id=None, image_ids=None):
|
{"golden_diff": "diff --git a/moto/ecr/models.py b/moto/ecr/models.py\n--- a/moto/ecr/models.py\n+++ b/moto/ecr/models.py\n@@ -200,17 +200,22 @@\n \"\"\"\n maxResults and filtering not implemented\n \"\"\"\n- images = []\n- for repository in self.repositories.values():\n- if repository_name:\n- if repository.name != repository_name:\n- continue\n+ repository = None\n+ found = False\n+ if repository_name in self.repositories:\n+ repository = self.repositories[repository_name]\n if registry_id:\n- if repository.registry_id != registry_id:\n- continue\n+ if repository.registry_id == registry_id:\n+ found = True\n+ else:\n+ found = True\n \n- for image in repository.images:\n- images.append(image)\n+ if not found:\n+ raise RepositoryNotFoundException(repository_name, registry_id or DEFAULT_REGISTRY_ID)\n+\n+ images = []\n+ for image in repository.images:\n+ images.append(image)\n return images\n \n def describe_images(self, repository_name, registry_id=None, image_ids=None):\n", "issue": "ECR `list_images` should return exception when repository does not exist\n\r\n### Actual\r\n`moto` [will return](https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_ListImages.html) an empty list when the ECR repository passed to `list_images` does not exist.\r\n\r\n\r\n### Expected\r\nThe ECR client returns a `RepositoryNotFoundException` exception when the specified repository does not exist in the registry.\r\n\r\nSee AWS [docs](https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_ListImages.html).\r\n\n", "before_files": [{"content": "from __future__ import unicode_literals\n\nimport hashlib\nfrom copy import copy\nfrom random import random\n\nfrom moto.core import BaseBackend, BaseModel\nfrom moto.ec2 import ec2_backends\nfrom moto.ecr.exceptions import ImageNotFoundException, RepositoryNotFoundException\n\nfrom botocore.exceptions import ParamValidationError\n\nDEFAULT_REGISTRY_ID = '012345678910'\n\n\nclass BaseObject(BaseModel):\n\n def camelCase(self, key):\n words = []\n for i, word in enumerate(key.split('_')):\n if i > 0:\n words.append(word.title())\n else:\n words.append(word)\n return ''.join(words)\n\n def gen_response_object(self):\n response_object = copy(self.__dict__)\n for key, value in response_object.items():\n if '_' in key:\n response_object[self.camelCase(key)] = value\n del response_object[key]\n return response_object\n\n @property\n def response_object(self):\n return self.gen_response_object()\n\n\nclass Repository(BaseObject):\n\n def __init__(self, repository_name):\n self.registry_id = DEFAULT_REGISTRY_ID\n self.arn = 'arn:aws:ecr:us-east-1:{0}:repository/{1}'.format(\n self.registry_id, repository_name)\n self.name = repository_name\n # self.created = datetime.utcnow()\n self.uri = '{0}.dkr.ecr.us-east-1.amazonaws.com/{1}'.format(\n self.registry_id, repository_name)\n self.images = []\n\n @property\n def physical_resource_id(self):\n return self.name\n\n @property\n def response_object(self):\n response_object = self.gen_response_object()\n\n response_object['registryId'] = self.registry_id\n response_object['repositoryArn'] = self.arn\n response_object['repositoryName'] = self.name\n response_object['repositoryUri'] = self.uri\n # response_object['createdAt'] = self.created\n del response_object['arn'], response_object['name'], response_object['images']\n return response_object\n\n @classmethod\n def create_from_cloudformation_json(cls, resource_name, cloudformation_json, region_name):\n properties = cloudformation_json['Properties']\n\n ecr_backend = ecr_backends[region_name]\n return ecr_backend.create_repository(\n # RepositoryName is optional in CloudFormation, thus create a random\n # name if necessary\n repository_name=properties.get(\n 'RepositoryName', 'ecrrepository{0}'.format(int(random() * 10 ** 6))),\n )\n\n @classmethod\n def update_from_cloudformation_json(cls, original_resource, new_resource_name, cloudformation_json, region_name):\n properties = cloudformation_json['Properties']\n\n if original_resource.name != properties['RepositoryName']:\n ecr_backend = ecr_backends[region_name]\n ecr_backend.delete_cluster(original_resource.arn)\n return ecr_backend.create_repository(\n # RepositoryName is optional in CloudFormation, thus create a\n # random name if necessary\n repository_name=properties.get(\n 'RepositoryName', 'RepositoryName{0}'.format(int(random() * 10 ** 6))),\n )\n else:\n # no-op when nothing changed between old and new resources\n return original_resource\n\n\nclass Image(BaseObject):\n\n def __init__(self, tag, manifest, repository, registry_id=DEFAULT_REGISTRY_ID):\n self.image_tag = tag\n self.image_manifest = manifest\n self.image_size_in_bytes = 50 * 1024 * 1024\n self.repository = repository\n self.registry_id = registry_id\n self.image_digest = None\n self.image_pushed_at = None\n\n def _create_digest(self):\n image_contents = 'docker_image{0}'.format(int(random() * 10 ** 6))\n self.image_digest = \"sha256:%s\" % hashlib.sha256(image_contents.encode('utf-8')).hexdigest()\n\n def get_image_digest(self):\n if not self.image_digest:\n self._create_digest()\n return self.image_digest\n\n @property\n def response_object(self):\n response_object = self.gen_response_object()\n response_object['imageId'] = {}\n response_object['imageId']['imageTag'] = self.image_tag\n response_object['imageId']['imageDigest'] = self.get_image_digest()\n response_object['imageManifest'] = self.image_manifest\n response_object['repositoryName'] = self.repository\n response_object['registryId'] = self.registry_id\n return response_object\n\n @property\n def response_list_object(self):\n response_object = self.gen_response_object()\n response_object['imageTag'] = self.image_tag\n response_object['imageDigest'] = \"i don't know\"\n return response_object\n\n @property\n def response_describe_object(self):\n response_object = self.gen_response_object()\n response_object['imageTags'] = [self.image_tag]\n response_object['imageDigest'] = self.get_image_digest()\n response_object['imageManifest'] = self.image_manifest\n response_object['repositoryName'] = self.repository\n response_object['registryId'] = self.registry_id\n response_object['imageSizeInBytes'] = self.image_size_in_bytes\n response_object['imagePushedAt'] = '2017-05-09'\n return response_object\n\n @property\n def response_batch_get_image(self):\n response_object = {}\n response_object['imageId'] = {}\n response_object['imageId']['imageTag'] = self.image_tag\n response_object['imageId']['imageDigest'] = self.get_image_digest()\n response_object['imageManifest'] = self.image_manifest\n response_object['repositoryName'] = self.repository\n response_object['registryId'] = self.registry_id\n return response_object\n\n\nclass ECRBackend(BaseBackend):\n\n def __init__(self):\n self.repositories = {}\n\n def describe_repositories(self, registry_id=None, repository_names=None):\n \"\"\"\n maxResults and nextToken not implemented\n \"\"\"\n if repository_names:\n for repository_name in repository_names:\n if repository_name not in self.repositories:\n raise RepositoryNotFoundException(repository_name, registry_id or DEFAULT_REGISTRY_ID)\n\n repositories = []\n for repository in self.repositories.values():\n # If a registry_id was supplied, ensure this repository matches\n if registry_id:\n if repository.registry_id != registry_id:\n continue\n # If a list of repository names was supplied, esure this repository\n # is in that list\n if repository_names:\n if repository.name not in repository_names:\n continue\n repositories.append(repository.response_object)\n return repositories\n\n def create_repository(self, repository_name):\n repository = Repository(repository_name)\n self.repositories[repository_name] = repository\n return repository\n\n def delete_repository(self, repository_name, registry_id=None):\n if repository_name in self.repositories:\n return self.repositories.pop(repository_name)\n else:\n raise RepositoryNotFoundException(repository_name, registry_id or DEFAULT_REGISTRY_ID)\n\n def list_images(self, repository_name, registry_id=None):\n \"\"\"\n maxResults and filtering not implemented\n \"\"\"\n images = []\n for repository in self.repositories.values():\n if repository_name:\n if repository.name != repository_name:\n continue\n if registry_id:\n if repository.registry_id != registry_id:\n continue\n\n for image in repository.images:\n images.append(image)\n return images\n\n def describe_images(self, repository_name, registry_id=None, image_ids=None):\n\n if repository_name in self.repositories:\n repository = self.repositories[repository_name]\n else:\n raise RepositoryNotFoundException(repository_name, registry_id or DEFAULT_REGISTRY_ID)\n\n if image_ids:\n response = set()\n for image_id in image_ids:\n found = False\n for image in repository.images:\n if (('imageDigest' in image_id and image.get_image_digest() == image_id['imageDigest']) or\n ('imageTag' in image_id and image.image_tag == image_id['imageTag'])):\n found = True\n response.add(image)\n if not found:\n image_id_representation = \"{imageDigest:'%s', imageTag:'%s'}\" % (\n image_id.get('imageDigest', 'null'),\n image_id.get('imageTag', 'null'),\n )\n raise ImageNotFoundException(\n image_id=image_id_representation,\n repository_name=repository_name,\n registry_id=registry_id or DEFAULT_REGISTRY_ID)\n\n else:\n response = []\n for image in repository.images:\n response.append(image)\n\n return response\n\n def put_image(self, repository_name, image_manifest, image_tag):\n if repository_name in self.repositories:\n repository = self.repositories[repository_name]\n else:\n raise Exception(\"{0} is not a repository\".format(repository_name))\n\n image = Image(image_tag, image_manifest, repository_name)\n repository.images.append(image)\n return image\n\n def batch_get_image(self, repository_name, registry_id=None, image_ids=None, accepted_media_types=None):\n if repository_name in self.repositories:\n repository = self.repositories[repository_name]\n else:\n raise RepositoryNotFoundException(repository_name, registry_id or DEFAULT_REGISTRY_ID)\n\n if not image_ids:\n raise ParamValidationError(msg='Missing required parameter in input: \"imageIds\"')\n\n response = {\n 'images': [],\n 'failures': [],\n }\n\n for image_id in image_ids:\n found = False\n for image in repository.images:\n if (('imageDigest' in image_id and image.get_image_digest() == image_id['imageDigest']) or\n ('imageTag' in image_id and image.image_tag == image_id['imageTag'])):\n found = True\n response['images'].append(image.response_batch_get_image)\n\n if not found:\n response['failures'].append({\n 'imageId': {\n 'imageTag': image_id.get('imageTag', 'null')\n },\n 'failureCode': 'ImageNotFound',\n 'failureReason': 'Requested image not found'\n })\n\n return response\n\n\necr_backends = {}\nfor region, ec2_backend in ec2_backends.items():\n ecr_backends[region] = ECRBackend()\n", "path": "moto/ecr/models.py"}]}
| 3,639 | 249 |
gh_patches_debug_63084
|
rasdani/github-patches
|
git_diff
|
translate__pootle-5471
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Static page editing save HTML outcome instead of raw text
To reproduce:
1. Server using Markdown for static pages and an existing static page written using Markdown
2. Minor edit the content of the static page (editing the title also seems to do this)
3. Saves fine
4. Edit the page again. Static page text is now all in HTML.
5. View static page on site. Static page is now all garbled HTML
</issue>
<code>
[start of pootle/core/markup/fields.py]
1 # -*- coding: utf-8 -*-
2 #
3 # Copyright (C) Pootle contributors.
4 #
5 # This file is a part of the Pootle project. It is distributed under the GPL3
6 # or later license. See the LICENSE file for a copy of the license and the
7 # AUTHORS file for copyright and authorship information.
8
9 import logging
10
11 from lxml.etree import ParserError
12 from lxml.html.clean import clean_html
13
14 from django.conf import settings
15 from django.core.cache import cache
16 from django.db import models
17 from django.utils.safestring import mark_safe
18
19 from .filters import apply_markup_filter
20 from .widgets import MarkupTextarea
21
22
23 __all__ = ('Markup', 'MarkupField',)
24
25
26 logger = logging.getLogger('pootle.markup')
27
28
29 _rendered_cache_key = lambda obj, pk, field: '_%s_%s_%s_rendered' % \
30 (obj, pk, field)
31
32
33 class Markup(object):
34
35 def __init__(self, instance, field_name, rendered_cache_key):
36 self.instance = instance
37 self.field_name = field_name
38 self.cache_key = rendered_cache_key
39
40 @property
41 def raw(self):
42 return self.instance.__dict__[self.field_name]
43
44 @raw.setter
45 def raw(self, value):
46 setattr(self.instance, self.field_name, value)
47
48 @property
49 def rendered(self):
50 rendered = cache.get(self.cache_key)
51
52 if not rendered:
53 logger.debug(u'Caching rendered output of %r', self.cache_key)
54 rendered = apply_markup_filter(self.raw)
55 cache.set(self.cache_key, rendered,
56 settings.POOTLE_CACHE_TIMEOUT)
57
58 return rendered
59
60 def __unicode__(self):
61 try:
62 return mark_safe(clean_html(self.rendered))
63 except ParserError:
64 return u''
65
66 def __nonzero__(self):
67 return self.raw.strip() != '' and self.raw is not None
68
69
70 class MarkupDescriptor(object):
71
72 def __init__(self, field):
73 self.field = field
74
75 def __get__(self, obj, owner):
76 if obj is None:
77 raise AttributeError('Can only be accessed via an instance.')
78
79 markup = obj.__dict__[self.field.name]
80 if markup is None:
81 return None
82
83 cache_key = _rendered_cache_key(obj.__class__.__name__,
84 obj.pk,
85 self.field.name)
86 return Markup(obj, self.field.name, cache_key)
87
88 def __set__(self, obj, value):
89 if isinstance(value, Markup):
90 obj.__dict__[self.field.name] = value.raw
91 else:
92 obj.__dict__[self.field.name] = value
93
94
95 class MarkupField(models.TextField):
96
97 description = 'Text field supporting different markup formats.'
98
99 def contribute_to_class(self, cls, name):
100 super(MarkupField, self).contribute_to_class(cls, name)
101 setattr(cls, self.name, MarkupDescriptor(self))
102
103 def pre_save(self, model_instance, add):
104 value = super(MarkupField, self).pre_save(model_instance, add)
105
106 if not add:
107 # Invalidate cache to force rendering upon next retrieval
108 cache_key = _rendered_cache_key(model_instance.__class__.__name__,
109 model_instance.pk,
110 self.name)
111 logger.debug('Invalidating cache for %r', cache_key)
112 cache.delete(cache_key)
113
114 return value.raw
115
116 def get_prep_value(self, value):
117 if isinstance(value, Markup):
118 return value.raw
119
120 return value
121
122 def value_to_string(self, obj):
123 value = self._get_val_from_obj(obj)
124 return self.get_prep_value(value)
125
126 def formfield(self, **kwargs):
127 defaults = {'widget': MarkupTextarea}
128 defaults.update(kwargs)
129 return super(MarkupField, self).formfield(**defaults)
130
131 def deconstruct(self):
132 name, path, args, kwargs = super(MarkupField, self).deconstruct()
133 kwargs.pop('help_text', None)
134 return name, path, args, kwargs
135
[end of pootle/core/markup/fields.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/pootle/core/markup/fields.py b/pootle/core/markup/fields.py
--- a/pootle/core/markup/fields.py
+++ b/pootle/core/markup/fields.py
@@ -119,8 +119,11 @@
return value
+ def to_python(self, value):
+ return self.get_prep_value(value)
+
def value_to_string(self, obj):
- value = self._get_val_from_obj(obj)
+ value = self.value_from_object(obj)
return self.get_prep_value(value)
def formfield(self, **kwargs):
|
{"golden_diff": "diff --git a/pootle/core/markup/fields.py b/pootle/core/markup/fields.py\n--- a/pootle/core/markup/fields.py\n+++ b/pootle/core/markup/fields.py\n@@ -119,8 +119,11 @@\n \n return value\n \n+ def to_python(self, value):\n+ return self.get_prep_value(value)\n+\n def value_to_string(self, obj):\n- value = self._get_val_from_obj(obj)\n+ value = self.value_from_object(obj)\n return self.get_prep_value(value)\n \n def formfield(self, **kwargs):\n", "issue": "Static page editing save HTML outcome instead of raw text\nTo reproduce:\r\n\r\n1. Server using Markdown for static pages and an existing static page written using Markdown\r\n2. Minor edit the content of the static page (editing the title also seems to do this)\r\n3. Saves fine\r\n4. Edit the page again. Static page text is now all in HTML. \r\n5. View static page on site. Static page is now all garbled HTML\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n#\n# Copyright (C) Pootle contributors.\n#\n# This file is a part of the Pootle project. It is distributed under the GPL3\n# or later license. See the LICENSE file for a copy of the license and the\n# AUTHORS file for copyright and authorship information.\n\nimport logging\n\nfrom lxml.etree import ParserError\nfrom lxml.html.clean import clean_html\n\nfrom django.conf import settings\nfrom django.core.cache import cache\nfrom django.db import models\nfrom django.utils.safestring import mark_safe\n\nfrom .filters import apply_markup_filter\nfrom .widgets import MarkupTextarea\n\n\n__all__ = ('Markup', 'MarkupField',)\n\n\nlogger = logging.getLogger('pootle.markup')\n\n\n_rendered_cache_key = lambda obj, pk, field: '_%s_%s_%s_rendered' % \\\n (obj, pk, field)\n\n\nclass Markup(object):\n\n def __init__(self, instance, field_name, rendered_cache_key):\n self.instance = instance\n self.field_name = field_name\n self.cache_key = rendered_cache_key\n\n @property\n def raw(self):\n return self.instance.__dict__[self.field_name]\n\n @raw.setter\n def raw(self, value):\n setattr(self.instance, self.field_name, value)\n\n @property\n def rendered(self):\n rendered = cache.get(self.cache_key)\n\n if not rendered:\n logger.debug(u'Caching rendered output of %r', self.cache_key)\n rendered = apply_markup_filter(self.raw)\n cache.set(self.cache_key, rendered,\n settings.POOTLE_CACHE_TIMEOUT)\n\n return rendered\n\n def __unicode__(self):\n try:\n return mark_safe(clean_html(self.rendered))\n except ParserError:\n return u''\n\n def __nonzero__(self):\n return self.raw.strip() != '' and self.raw is not None\n\n\nclass MarkupDescriptor(object):\n\n def __init__(self, field):\n self.field = field\n\n def __get__(self, obj, owner):\n if obj is None:\n raise AttributeError('Can only be accessed via an instance.')\n\n markup = obj.__dict__[self.field.name]\n if markup is None:\n return None\n\n cache_key = _rendered_cache_key(obj.__class__.__name__,\n obj.pk,\n self.field.name)\n return Markup(obj, self.field.name, cache_key)\n\n def __set__(self, obj, value):\n if isinstance(value, Markup):\n obj.__dict__[self.field.name] = value.raw\n else:\n obj.__dict__[self.field.name] = value\n\n\nclass MarkupField(models.TextField):\n\n description = 'Text field supporting different markup formats.'\n\n def contribute_to_class(self, cls, name):\n super(MarkupField, self).contribute_to_class(cls, name)\n setattr(cls, self.name, MarkupDescriptor(self))\n\n def pre_save(self, model_instance, add):\n value = super(MarkupField, self).pre_save(model_instance, add)\n\n if not add:\n # Invalidate cache to force rendering upon next retrieval\n cache_key = _rendered_cache_key(model_instance.__class__.__name__,\n model_instance.pk,\n self.name)\n logger.debug('Invalidating cache for %r', cache_key)\n cache.delete(cache_key)\n\n return value.raw\n\n def get_prep_value(self, value):\n if isinstance(value, Markup):\n return value.raw\n\n return value\n\n def value_to_string(self, obj):\n value = self._get_val_from_obj(obj)\n return self.get_prep_value(value)\n\n def formfield(self, **kwargs):\n defaults = {'widget': MarkupTextarea}\n defaults.update(kwargs)\n return super(MarkupField, self).formfield(**defaults)\n\n def deconstruct(self):\n name, path, args, kwargs = super(MarkupField, self).deconstruct()\n kwargs.pop('help_text', None)\n return name, path, args, kwargs\n", "path": "pootle/core/markup/fields.py"}]}
| 1,804 | 136 |
gh_patches_debug_41418
|
rasdani/github-patches
|
git_diff
|
raspiblitz__raspiblitz-938
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
SSH Tunnel missing support for running non default port
My server for the ssh tunnel is not running on port 22. After recovery the tunnels are not recreated.
</issue>
<code>
[start of home.admin/config.scripts/internet.sshtunnel.py]
1 #!/usr/bin/python3
2
3 import sys, subprocess, re
4 from pathlib import Path
5
6 # IDEA: At the momemt its just Reverse-SSh Tunnels thats why [INTERNAL-PORT]<[EXTERNAL-PORT]
7 # For the future also just local ssh tunnels could be added with [INTERNAL-PORT]-[EXTERNAL-PORT]
8 # for the use case when a server wants to use a RaspiBlitz behind a NAT as Lightning backend
9
10 # display config script info
11 if len(sys.argv) <= 1 or sys.argv[1] == "-h" or sys.argv[1] == "help":
12 print("forward ports from another server to raspiblitz with reverse SSH tunnel")
13 print("internet.sshtunnel.py [on|off|restore] [USER]@[SERVER] \"[INTERNAL-PORT]<[EXTERNAL-PORT]\"")
14 print("note that [INTERNAL-PORT]<[EXTERNAL-PORT] can one or multiple forwardings")
15 sys.exit(1)
16
17 #
18 # CONSTANTS
19 # sudo journalctl -f -u autossh-tunnel
20 #
21
22 SERVICENAME="autossh-tunnel.service"
23 SERVICEFILE="/etc/systemd/system/"+SERVICENAME
24 SERVICETEMPLATE="""# see config script internet.sshtunnel.py
25 [Unit]
26 Description=AutoSSH tunnel service
27 After=network.target
28
29 [Service]
30 User=root
31 Group=root
32 Environment="AUTOSSH_GATETIME=0"
33 ExecStart=/usr/bin/autossh -M 0 -N -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ServerAliveInterval=60 -o ServerAliveCountMax=2 [PLACEHOLDER]
34 StandardOutput=journal
35
36 [Install]
37 WantedBy=multi-user.target
38 """
39
40 # get LND port form lnd.conf
41 LNDPORT = subprocess.getoutput("sudo cat /mnt/hdd/lnd/lnd.conf | grep '^listen=*' | cut -f2 -d':'")
42 if len(LNDPORT) == 0:
43 LNDPORT="9735"
44
45
46
47 #
48 # RESTORE = SWITCHING ON with restore flag on
49 # on restore other external scripts dont need calling
50 #
51
52 forwardingLND = False
53 restoringOnUpdate = False
54 if sys.argv[1] == "restore":
55 print("internet.sshtunnel.py -> running with restore flag")
56 sys.argv[1] = "on"
57 restoringOnUpdate = True
58
59 #
60 # SWITCHING ON
61 #
62
63 if sys.argv[1] == "on":
64
65 # check if already running
66 isRunning = subprocess.getoutput("sudo systemctl --no-pager | grep -c '%s'" % (SERVICENAME))
67 if int(isRunning) > 0:
68 print("SSH TUNNEL SERVICE IS RUNNING - run 'internet.sshtunnel.py off' first to set new tunnel")
69 sys.exit(1)
70
71 # check server address
72 if len(sys.argv) < 3:
73 print("[USER]@[SERVER] missing - use 'internet.sshtunnel.py -h' for help")
74 sys.exit(1)
75 if sys.argv[2].count("@") != 1:
76 print("[USER]@[SERVER] wrong - use 'internet.sshtunnel.py -h' for help")
77 sys.exit(1)
78 ssh_server = sys.argv[2]
79
80 # genenate additional parameter for autossh (forwarding ports)
81 if len(sys.argv) < 4:
82 print("[INTERNAL-PORT]<[EXTERNAL-PORT] missing")
83 sys.exit(1)
84 ssh_ports=""
85 additional_parameters=""
86 i = 3
87 while i < len(sys.argv):
88
89 # check forwarding format
90 if sys.argv[i].count("<") != 1:
91 print("[INTERNAL-PORT]<[EXTERNAL-PORT] wrong format '%s'" % (sys.argv[i]))
92 sys.exit(1)
93
94 # get ports
95 sys.argv[i] = re.sub('"','', sys.argv[i] )
96 ports = sys.argv[i].split("<")
97 port_internal = ports[0]
98 port_external = ports[1]
99 if port_internal.isdigit() == False:
100 print("[INTERNAL-PORT]<[EXTERNAL-PORT] internal not number '%s'" % (sys.argv[i]))
101 sys.exit(1)
102 if port_external.isdigit() == False:
103 print("[INTERNAL-PORT]<[EXTERNAL-PORT] external not number '%s'" % (sys.argv[i]))
104 sys.exit(1)
105 if port_internal == LNDPORT:
106 print("Detected LND Port Forwarding")
107 forwardingLND = True
108 if port_internal != port_external:
109 print("FAIL: When tunneling your local LND port '%s' it needs to be the same on the external server, but is '%s'" % (LNDPORT,port_external))
110 print("Try again by using the same port. If you cant change the external port, change local LND port with: /home/admin/config.scripts/lnd.setport.sh")
111 sys.exit(1)
112
113 ssh_ports = ssh_ports + "\"%s\" " % (sys.argv[i])
114 additional_parameters= additional_parameters + "-R %s:localhost:%s " % (port_external,port_internal)
115 i=i+1
116
117 # genenate additional parameter for autossh (server)
118 ssh_ports = ssh_ports.strip()
119 additional_parameters= additional_parameters + ssh_server
120
121 # generate custom service config
122 service_data = SERVICETEMPLATE.replace("[PLACEHOLDER]", additional_parameters)
123
124 # debug print out service
125 print()
126 print("*** New systemd service: %s" % (SERVICENAME))
127 print(service_data)
128
129 # write service file
130 service_file = open("/home/admin/temp.service", "w")
131 service_file.write(service_data)
132 service_file.close()
133 subprocess.call("sudo mv /home/admin/temp.service %s" % (SERVICEFILE), shell=True)
134
135 # check if SSH keys for root user need to be created
136 print()
137 print("*** Checking root SSH pub keys")
138 ssh_pubkey=""
139 try:
140 ssh_pubkey = subprocess.check_output("sudo cat /root/.ssh/id_rsa.pub", shell=True, universal_newlines=True)
141 print("OK - root id_rsa.pub file exists")
142 except subprocess.CalledProcessError as e:
143 print("Generating root SSH keys ...")
144 subprocess.call("sudo sh -c 'yes y | sudo -u root ssh-keygen -b 2048 -t rsa -f ~/.ssh/id_rsa -q -N \"\"'", shell=True)
145 ssh_pubkey = subprocess.check_output("sudo cat /root/.ssh/id_rsa.pub", shell=True, universal_newlines=True)
146
147 # copy SSH keys for backup (for update with new sd card)
148 print("making backup copy of SSH keys")
149 subprocess.call("sudo cp -r /root/.ssh /mnt/hdd/ssh/root_backup", shell=True)
150 print("DONE")
151
152 # write ssh tunnel data to raspiblitz config (for update with new sd card)
153 print("*** Updating RaspiBlitz Config")
154 with open('/mnt/hdd/raspiblitz.conf') as f:
155 file_content = f.read()
156 if file_content.count("sshtunnel=") == 0:
157 file_content = file_content+"\nsshtunnel=''"
158 file_content = re.sub("sshtunnel=.*", "sshtunnel='%s %s'" % (ssh_server, ssh_ports), file_content)
159 if restoringOnUpdate == False:
160 serverdomain=ssh_server.split("@")[1]
161
162 # make sure serverdomain is set as tls alias
163 print("Setting server as tls alias")
164 oldConfigHash=subprocess.getoutput("sudo shasum -a 256 /mnt/hdd/lnd/lnd.conf")
165 subprocess.call("sudo sed -i \"s/^#tlsextradomain=.*/tlsextradomain=/g\" /mnt/hdd/lnd/lnd.conf", shell=True)
166 subprocess.call("sudo sed -i \"s/^tlsextradomain=.*/tlsextradomain=%s/g\" /mnt/hdd/lnd/lnd.conf" % (serverdomain), shell=True)
167 newConfigHash=subprocess.getoutput("sudo shasum -a 256 /mnt/hdd/lnd/lnd.conf")
168 if oldConfigHash != newConfigHash:
169 print("lnd.conf changed ... generating new TLS cert")
170 subprocess.call("sudo /home/admin/config.scripts/lnd.newtlscert.sh", shell=True)
171 else:
172 print("lnd.conf unchanged... keep TLS cert")
173
174 if forwardingLND:
175 # setting server explicitly on LND if LND port is forwarded
176 print("Setting fixed address for LND with raspiblitz lndAddress")
177 file_content = re.sub("lndAddress=.*", "lndAddress='%s'" % (serverdomain), file_content)
178 else:
179 print("No need to set fixed address for LND with raspiblitz lndAddress")
180 file_content = "".join([s for s in file_content.splitlines(True) if s.strip("\r\n")]) + "\n"
181 print(file_content)
182 with open("/mnt/hdd/raspiblitz.conf", "w") as text_file:
183 text_file.write(file_content)
184 print("DONE")
185
186 # make sure autossh is installed
187 # https://www.everythingcli.org/ssh-tunnelling-for-fun-and-profit-autossh/
188 print()
189 print("*** Install autossh")
190 subprocess.call("sudo apt-get install -y autossh", shell=True)
191
192 # enable service
193 print()
194 print("*** Enabling systemd service: %s" % (SERVICENAME))
195 subprocess.call("sudo systemctl daemon-reload", shell=True)
196 subprocess.call("sudo systemctl enable %s" % (SERVICENAME), shell=True)
197
198 # final info (can be ignored if run by other script)
199 print()
200 print("**************************************")
201 print("*** WIN - SSH TUNNEL SERVICE SETUP ***")
202 print("**************************************")
203 print("See chapter 'How to setup port-forwarding with a SSH tunnel?' in:")
204 print("https://github.com/rootzoll/raspiblitz/blob/master/FAQ.md")
205 print("- Tunnel service needs final reboot to start.")
206 print("- After reboot check logs: sudo journalctl -f -u %s" % (SERVICENAME))
207 print("- Make sure the SSH pub key of this RaspiBlitz is in 'authorized_keys' of %s :" % (ssh_server))
208 print(ssh_pubkey)
209 print()
210
211 #
212 # SWITCHING OFF
213 #
214
215 elif sys.argv[1] == "off":
216
217 print("*** Disabling systemd service: %s" % (SERVICENAME))
218 subprocess.call("sudo systemctl stop %s" % (SERVICENAME), shell=True)
219 subprocess.call("sudo systemctl disable %s" % (SERVICENAME), shell=True)
220 subprocess.call("sudo systemctl reset-failed", shell=True)
221 subprocess.call("sudo rm %s" % (SERVICEFILE), shell=True)
222 subprocess.call("sudo systemctl daemon-reload", shell=True)
223 print("OK Done")
224 print()
225
226 print("*** Removing LND Address")
227 subprocess.call("sudo /home/admin/config.scripts/lnd.setaddress.sh off", shell=True)
228 print()
229
230 print("*** Removing SSH Tunnel data from RaspiBlitz config")
231 with open('/mnt/hdd/raspiblitz.conf') as f:
232 file_content = f.read()
233 file_content = re.sub("sshtunnel=.*", "", file_content)
234 file_content = re.sub("\n\n", "\n", file_content)
235 print(file_content)
236 with open("/mnt/hdd/raspiblitz.conf", "w") as text_file:
237 text_file.write(file_content)
238 print("OK Done")
239
240 #
241 # UNKOWN PARAMETER
242 #
243
244 else:
245 print ("unkown parameter - use 'internet.sshtunnel.py -h' for help")
[end of home.admin/config.scripts/internet.sshtunnel.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/home.admin/config.scripts/internet.sshtunnel.py b/home.admin/config.scripts/internet.sshtunnel.py
--- a/home.admin/config.scripts/internet.sshtunnel.py
+++ b/home.admin/config.scripts/internet.sshtunnel.py
@@ -10,7 +10,7 @@
# display config script info
if len(sys.argv) <= 1 or sys.argv[1] == "-h" or sys.argv[1] == "help":
print("forward ports from another server to raspiblitz with reverse SSH tunnel")
- print("internet.sshtunnel.py [on|off|restore] [USER]@[SERVER] \"[INTERNAL-PORT]<[EXTERNAL-PORT]\"")
+ print("internet.sshtunnel.py [on|off|restore] [USER]@[SERVER:PORT] \"[INTERNAL-PORT]<[EXTERNAL-PORT]\"")
print("note that [INTERNAL-PORT]<[EXTERNAL-PORT] can one or multiple forwardings")
sys.exit(1)
@@ -70,12 +70,21 @@
# check server address
if len(sys.argv) < 3:
- print("[USER]@[SERVER] missing - use 'internet.sshtunnel.py -h' for help")
+ print("[USER]@[SERVER:PORT] missing - use 'internet.sshtunnel.py -h' for help")
sys.exit(1)
if sys.argv[2].count("@") != 1:
- print("[USER]@[SERVER] wrong - use 'internet.sshtunnel.py -h' for help")
+ print("[USER]@[SERVER:PORT] wrong - use 'internet.sshtunnel.py -h' for help")
sys.exit(1)
ssh_server = sys.argv[2]
+ if ssh_server.count(":") == 0:
+ ssh_server_host = ssh_server
+ ssh_server_port = "22"
+ elif ssh_server.count(":") == 1:
+ ssh_server_split = ssh_server.split(":")
+ ssh_server_host = ssh_server_split[0]
+ ssh_server_port = ssh_server_split[1]
+ else:
+ print("[USER]@[SERVER:PORT] wrong - use 'internet.sshtunnel.py -h' for help")
# genenate additional parameter for autossh (forwarding ports)
if len(sys.argv) < 4:
@@ -106,17 +115,17 @@
print("Detected LND Port Forwarding")
forwardingLND = True
if port_internal != port_external:
- print("FAIL: When tunneling your local LND port '%s' it needs to be the same on the external server, but is '%s'" % (LNDPORT,port_external))
+ print("FAIL: When tunneling your local LND port '%s' it needs to be the same on the external server, but is '%s'" % (LNDPORT, port_external))
print("Try again by using the same port. If you cant change the external port, change local LND port with: /home/admin/config.scripts/lnd.setport.sh")
sys.exit(1)
ssh_ports = ssh_ports + "\"%s\" " % (sys.argv[i])
- additional_parameters= additional_parameters + "-R %s:localhost:%s " % (port_external,port_internal)
- i=i+1
+ additional_parameters= additional_parameters + "-R %s:localhost:%s " % (port_external, port_internal)
+ i = i + 1
# genenate additional parameter for autossh (server)
ssh_ports = ssh_ports.strip()
- additional_parameters= additional_parameters + ssh_server
+ additional_parameters = additional_parameters + "-p " + ssh_server_port + " " + ssh_server_host
# generate custom service config
service_data = SERVICETEMPLATE.replace("[PLACEHOLDER]", additional_parameters)
@@ -242,4 +251,4 @@
#
else:
- print ("unkown parameter - use 'internet.sshtunnel.py -h' for help")
\ No newline at end of file
+ print ("unkown parameter - use 'internet.sshtunnel.py -h' for help")
|
{"golden_diff": "diff --git a/home.admin/config.scripts/internet.sshtunnel.py b/home.admin/config.scripts/internet.sshtunnel.py\n--- a/home.admin/config.scripts/internet.sshtunnel.py\n+++ b/home.admin/config.scripts/internet.sshtunnel.py\n@@ -10,7 +10,7 @@\n # display config script info\n if len(sys.argv) <= 1 or sys.argv[1] == \"-h\" or sys.argv[1] == \"help\":\n print(\"forward ports from another server to raspiblitz with reverse SSH tunnel\")\n- print(\"internet.sshtunnel.py [on|off|restore] [USER]@[SERVER] \\\"[INTERNAL-PORT]<[EXTERNAL-PORT]\\\"\")\n+ print(\"internet.sshtunnel.py [on|off|restore] [USER]@[SERVER:PORT] \\\"[INTERNAL-PORT]<[EXTERNAL-PORT]\\\"\")\n print(\"note that [INTERNAL-PORT]<[EXTERNAL-PORT] can one or multiple forwardings\")\n sys.exit(1)\n \n@@ -70,12 +70,21 @@\n \n # check server address\n if len(sys.argv) < 3:\n- print(\"[USER]@[SERVER] missing - use 'internet.sshtunnel.py -h' for help\")\n+ print(\"[USER]@[SERVER:PORT] missing - use 'internet.sshtunnel.py -h' for help\")\n sys.exit(1)\n if sys.argv[2].count(\"@\") != 1:\n- print(\"[USER]@[SERVER] wrong - use 'internet.sshtunnel.py -h' for help\")\n+ print(\"[USER]@[SERVER:PORT] wrong - use 'internet.sshtunnel.py -h' for help\")\n sys.exit(1)\n ssh_server = sys.argv[2]\n+ if ssh_server.count(\":\") == 0:\n+ ssh_server_host = ssh_server\n+ ssh_server_port = \"22\"\n+ elif ssh_server.count(\":\") == 1:\n+ ssh_server_split = ssh_server.split(\":\")\n+ ssh_server_host = ssh_server_split[0]\n+ ssh_server_port = ssh_server_split[1]\n+ else:\n+ print(\"[USER]@[SERVER:PORT] wrong - use 'internet.sshtunnel.py -h' for help\")\n \n # genenate additional parameter for autossh (forwarding ports)\n if len(sys.argv) < 4:\n@@ -106,17 +115,17 @@\n print(\"Detected LND Port Forwarding\")\n forwardingLND = True\n if port_internal != port_external:\n- print(\"FAIL: When tunneling your local LND port '%s' it needs to be the same on the external server, but is '%s'\" % (LNDPORT,port_external))\n+ print(\"FAIL: When tunneling your local LND port '%s' it needs to be the same on the external server, but is '%s'\" % (LNDPORT, port_external))\n print(\"Try again by using the same port. If you cant change the external port, change local LND port with: /home/admin/config.scripts/lnd.setport.sh\")\n sys.exit(1)\n \n ssh_ports = ssh_ports + \"\\\"%s\\\" \" % (sys.argv[i])\n- additional_parameters= additional_parameters + \"-R %s:localhost:%s \" % (port_external,port_internal)\n- i=i+1\n+ additional_parameters= additional_parameters + \"-R %s:localhost:%s \" % (port_external, port_internal)\n+ i = i + 1\n \n # genenate additional parameter for autossh (server)\n ssh_ports = ssh_ports.strip()\n- additional_parameters= additional_parameters + ssh_server\n+ additional_parameters = additional_parameters + \"-p \" + ssh_server_port + \" \" + ssh_server_host\n \n # generate custom service config\n service_data = SERVICETEMPLATE.replace(\"[PLACEHOLDER]\", additional_parameters)\n@@ -242,4 +251,4 @@\n #\n \n else:\n- print (\"unkown parameter - use 'internet.sshtunnel.py -h' for help\")\n\\ No newline at end of file\n+ print (\"unkown parameter - use 'internet.sshtunnel.py -h' for help\")\n", "issue": "SSH Tunnel missing support for running non default port\nMy server for the ssh tunnel is not running on port 22. After recovery the tunnels are not recreated. \n", "before_files": [{"content": "#!/usr/bin/python3\n\nimport sys, subprocess, re\nfrom pathlib import Path\n\n# IDEA: At the momemt its just Reverse-SSh Tunnels thats why [INTERNAL-PORT]<[EXTERNAL-PORT]\n# For the future also just local ssh tunnels could be added with [INTERNAL-PORT]-[EXTERNAL-PORT]\n# for the use case when a server wants to use a RaspiBlitz behind a NAT as Lightning backend\n\n# display config script info\nif len(sys.argv) <= 1 or sys.argv[1] == \"-h\" or sys.argv[1] == \"help\":\n print(\"forward ports from another server to raspiblitz with reverse SSH tunnel\")\n print(\"internet.sshtunnel.py [on|off|restore] [USER]@[SERVER] \\\"[INTERNAL-PORT]<[EXTERNAL-PORT]\\\"\")\n print(\"note that [INTERNAL-PORT]<[EXTERNAL-PORT] can one or multiple forwardings\")\n sys.exit(1)\n\n#\n# CONSTANTS\n# sudo journalctl -f -u autossh-tunnel\n#\n\nSERVICENAME=\"autossh-tunnel.service\"\nSERVICEFILE=\"/etc/systemd/system/\"+SERVICENAME\nSERVICETEMPLATE=\"\"\"# see config script internet.sshtunnel.py\n[Unit]\nDescription=AutoSSH tunnel service\nAfter=network.target\n\n[Service]\nUser=root\nGroup=root\nEnvironment=\"AUTOSSH_GATETIME=0\"\nExecStart=/usr/bin/autossh -M 0 -N -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ServerAliveInterval=60 -o ServerAliveCountMax=2 [PLACEHOLDER]\nStandardOutput=journal\n\n[Install]\nWantedBy=multi-user.target\n\"\"\"\n\n# get LND port form lnd.conf\nLNDPORT = subprocess.getoutput(\"sudo cat /mnt/hdd/lnd/lnd.conf | grep '^listen=*' | cut -f2 -d':'\")\nif len(LNDPORT) == 0:\n LNDPORT=\"9735\"\n\n\n\n#\n# RESTORE = SWITCHING ON with restore flag on\n# on restore other external scripts dont need calling\n#\n\nforwardingLND = False\nrestoringOnUpdate = False\nif sys.argv[1] == \"restore\":\n print(\"internet.sshtunnel.py -> running with restore flag\")\n sys.argv[1] = \"on\"\n restoringOnUpdate = True\n\n#\n# SWITCHING ON\n#\n\nif sys.argv[1] == \"on\":\n\n # check if already running\n isRunning = subprocess.getoutput(\"sudo systemctl --no-pager | grep -c '%s'\" % (SERVICENAME))\n if int(isRunning) > 0:\n print(\"SSH TUNNEL SERVICE IS RUNNING - run 'internet.sshtunnel.py off' first to set new tunnel\")\n sys.exit(1)\n\n # check server address\n if len(sys.argv) < 3:\n print(\"[USER]@[SERVER] missing - use 'internet.sshtunnel.py -h' for help\")\n sys.exit(1)\n if sys.argv[2].count(\"@\") != 1:\n print(\"[USER]@[SERVER] wrong - use 'internet.sshtunnel.py -h' for help\")\n sys.exit(1)\n ssh_server = sys.argv[2]\n\n # genenate additional parameter for autossh (forwarding ports)\n if len(sys.argv) < 4:\n print(\"[INTERNAL-PORT]<[EXTERNAL-PORT] missing\")\n sys.exit(1)\n ssh_ports=\"\"\n additional_parameters=\"\"\n i = 3\n while i < len(sys.argv):\n\n # check forwarding format\n if sys.argv[i].count(\"<\") != 1:\n print(\"[INTERNAL-PORT]<[EXTERNAL-PORT] wrong format '%s'\" % (sys.argv[i]))\n sys.exit(1)\n\n # get ports\n sys.argv[i] = re.sub('\"','', sys.argv[i] )\n ports = sys.argv[i].split(\"<\")\n port_internal = ports[0]\n port_external = ports[1]\n if port_internal.isdigit() == False:\n print(\"[INTERNAL-PORT]<[EXTERNAL-PORT] internal not number '%s'\" % (sys.argv[i]))\n sys.exit(1)\n if port_external.isdigit() == False:\n print(\"[INTERNAL-PORT]<[EXTERNAL-PORT] external not number '%s'\" % (sys.argv[i]))\n sys.exit(1) \n if port_internal == LNDPORT:\n print(\"Detected LND Port Forwarding\")\n forwardingLND = True\n if port_internal != port_external:\n print(\"FAIL: When tunneling your local LND port '%s' it needs to be the same on the external server, but is '%s'\" % (LNDPORT,port_external))\n print(\"Try again by using the same port. If you cant change the external port, change local LND port with: /home/admin/config.scripts/lnd.setport.sh\")\n sys.exit(1)\n\n ssh_ports = ssh_ports + \"\\\"%s\\\" \" % (sys.argv[i])\n additional_parameters= additional_parameters + \"-R %s:localhost:%s \" % (port_external,port_internal)\n i=i+1\n\n # genenate additional parameter for autossh (server)\n ssh_ports = ssh_ports.strip()\n additional_parameters= additional_parameters + ssh_server\n\n # generate custom service config\n service_data = SERVICETEMPLATE.replace(\"[PLACEHOLDER]\", additional_parameters)\n\n # debug print out service\n print()\n print(\"*** New systemd service: %s\" % (SERVICENAME))\n print(service_data)\n\n # write service file\n service_file = open(\"/home/admin/temp.service\", \"w\")\n service_file.write(service_data)\n service_file.close()\n subprocess.call(\"sudo mv /home/admin/temp.service %s\" % (SERVICEFILE), shell=True)\n\n # check if SSH keys for root user need to be created\n print()\n print(\"*** Checking root SSH pub keys\")\n ssh_pubkey=\"\"\n try:\n ssh_pubkey = subprocess.check_output(\"sudo cat /root/.ssh/id_rsa.pub\", shell=True, universal_newlines=True)\n print(\"OK - root id_rsa.pub file exists\")\n except subprocess.CalledProcessError as e:\n print(\"Generating root SSH keys ...\")\n subprocess.call(\"sudo sh -c 'yes y | sudo -u root ssh-keygen -b 2048 -t rsa -f ~/.ssh/id_rsa -q -N \\\"\\\"'\", shell=True)\n ssh_pubkey = subprocess.check_output(\"sudo cat /root/.ssh/id_rsa.pub\", shell=True, universal_newlines=True)\n \n # copy SSH keys for backup (for update with new sd card)\n print(\"making backup copy of SSH keys\")\n subprocess.call(\"sudo cp -r /root/.ssh /mnt/hdd/ssh/root_backup\", shell=True)\n print(\"DONE\")\n \n # write ssh tunnel data to raspiblitz config (for update with new sd card)\n print(\"*** Updating RaspiBlitz Config\")\n with open('/mnt/hdd/raspiblitz.conf') as f:\n file_content = f.read()\n if file_content.count(\"sshtunnel=\") == 0:\n file_content = file_content+\"\\nsshtunnel=''\"\n file_content = re.sub(\"sshtunnel=.*\", \"sshtunnel='%s %s'\" % (ssh_server, ssh_ports), file_content)\n if restoringOnUpdate == False:\n serverdomain=ssh_server.split(\"@\")[1]\n\n # make sure serverdomain is set as tls alias \n print(\"Setting server as tls alias\")\n oldConfigHash=subprocess.getoutput(\"sudo shasum -a 256 /mnt/hdd/lnd/lnd.conf\")\n subprocess.call(\"sudo sed -i \\\"s/^#tlsextradomain=.*/tlsextradomain=/g\\\" /mnt/hdd/lnd/lnd.conf\", shell=True)\n subprocess.call(\"sudo sed -i \\\"s/^tlsextradomain=.*/tlsextradomain=%s/g\\\" /mnt/hdd/lnd/lnd.conf\" % (serverdomain), shell=True)\n newConfigHash=subprocess.getoutput(\"sudo shasum -a 256 /mnt/hdd/lnd/lnd.conf\")\n if oldConfigHash != newConfigHash:\n print(\"lnd.conf changed ... generating new TLS cert\")\n subprocess.call(\"sudo /home/admin/config.scripts/lnd.newtlscert.sh\", shell=True)\n else:\n print(\"lnd.conf unchanged... keep TLS cert\")\n\n if forwardingLND:\n # setting server explicitly on LND if LND port is forwarded\n print(\"Setting fixed address for LND with raspiblitz lndAddress\")\n file_content = re.sub(\"lndAddress=.*\", \"lndAddress='%s'\" % (serverdomain), file_content)\n else:\n print(\"No need to set fixed address for LND with raspiblitz lndAddress\")\n file_content = \"\".join([s for s in file_content.splitlines(True) if s.strip(\"\\r\\n\")]) + \"\\n\"\n print(file_content)\n with open(\"/mnt/hdd/raspiblitz.conf\", \"w\") as text_file:\n text_file.write(file_content)\n print(\"DONE\")\n\n # make sure autossh is installed\n # https://www.everythingcli.org/ssh-tunnelling-for-fun-and-profit-autossh/\n print()\n print(\"*** Install autossh\")\n subprocess.call(\"sudo apt-get install -y autossh\", shell=True)\n \n # enable service\n print()\n print(\"*** Enabling systemd service: %s\" % (SERVICENAME))\n subprocess.call(\"sudo systemctl daemon-reload\", shell=True)\n subprocess.call(\"sudo systemctl enable %s\" % (SERVICENAME), shell=True)\n\n # final info (can be ignored if run by other script)\n print()\n print(\"**************************************\")\n print(\"*** WIN - SSH TUNNEL SERVICE SETUP ***\")\n print(\"**************************************\")\n print(\"See chapter 'How to setup port-forwarding with a SSH tunnel?' in:\")\n print(\"https://github.com/rootzoll/raspiblitz/blob/master/FAQ.md\")\n print(\"- Tunnel service needs final reboot to start.\")\n print(\"- After reboot check logs: sudo journalctl -f -u %s\" % (SERVICENAME))\n print(\"- Make sure the SSH pub key of this RaspiBlitz is in 'authorized_keys' of %s :\" % (ssh_server))\n print(ssh_pubkey)\n print()\n\n#\n# SWITCHING OFF\n#\n\nelif sys.argv[1] == \"off\":\n\n print(\"*** Disabling systemd service: %s\" % (SERVICENAME))\n subprocess.call(\"sudo systemctl stop %s\" % (SERVICENAME), shell=True)\n subprocess.call(\"sudo systemctl disable %s\" % (SERVICENAME), shell=True)\n subprocess.call(\"sudo systemctl reset-failed\", shell=True)\n subprocess.call(\"sudo rm %s\" % (SERVICEFILE), shell=True)\n subprocess.call(\"sudo systemctl daemon-reload\", shell=True)\n print(\"OK Done\")\n print()\n\n print(\"*** Removing LND Address\")\n subprocess.call(\"sudo /home/admin/config.scripts/lnd.setaddress.sh off\", shell=True)\n print()\n\n print(\"*** Removing SSH Tunnel data from RaspiBlitz config\")\n with open('/mnt/hdd/raspiblitz.conf') as f:\n file_content = f.read()\n file_content = re.sub(\"sshtunnel=.*\", \"\", file_content)\n file_content = re.sub(\"\\n\\n\", \"\\n\", file_content)\n print(file_content)\n with open(\"/mnt/hdd/raspiblitz.conf\", \"w\") as text_file:\n text_file.write(file_content)\n print(\"OK Done\")\n\n#\n# UNKOWN PARAMETER\n#\n\nelse:\n print (\"unkown parameter - use 'internet.sshtunnel.py -h' for help\")", "path": "home.admin/config.scripts/internet.sshtunnel.py"}]}
| 3,782 | 919 |
gh_patches_debug_28243
|
rasdani/github-patches
|
git_diff
|
zestedesavoir__zds-site-2145
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
La licence est absente lors de la visualisation d'une partie du tutoriel
Quand on navigue partout dans un tutoriel, on a normalement la licence de celui en haut à droite. Sauf lorsqu'on regarde une partie ([celle-ci](http://beta.zestedesavoir.com/tutoriels/335/creez-des-applications-pour-android/425/annexes/) par exemple).
</issue>
<code>
[start of zds/utils/templatetags/topbar.py]
1 # coding: utf-8
2
3 from collections import OrderedDict
4 from django import template
5 from django.conf import settings
6 import itertools
7 from zds.forum.models import Forum, Topic
8 from zds.tutorial.models import Tutorial
9 from zds.utils.models import CategorySubCategory, Tag
10
11
12 register = template.Library()
13
14
15 @register.filter('top_categories')
16 def top_categories(user):
17 cats = {}
18
19 forums_pub = Forum.objects.filter(group__isnull=True).select_related("category").all()
20 if user and user.is_authenticated():
21 forums_prv = Forum\
22 .objects\
23 .filter(group__isnull=False, group__in=user.groups.all())\
24 .select_related("category").all()
25 forums = list(forums_pub | forums_prv)
26 else:
27 forums = list(forums_pub)
28
29 for forum in forums:
30 key = forum.category.title
31 if key in cats:
32 cats[key].append(forum)
33 else:
34 cats[key] = [forum]
35
36 tgs = Topic.objects\
37 .values('tags', 'pk')\
38 .distinct()\
39 .filter(forum__in=forums, tags__isnull=False)
40
41 cts = {}
42 for key, group in itertools.groupby(tgs, lambda item: item["tags"]):
43 for thing in group:
44 if key in cts:
45 cts[key] += 1
46 else:
47 cts[key] = 1
48
49 cpt = 0
50 top_tag = []
51 sort_list = reversed(sorted(cts.iteritems(), key=lambda k_v: (k_v[1], k_v[0])))
52 for key, value in sort_list:
53 top_tag.append(key)
54 cpt += 1
55 if cpt >= settings.ZDS_APP['forum']['top_tag_max']:
56 break
57
58 tags = Tag.objects.filter(pk__in=top_tag)
59
60 return {"tags": tags, "categories": cats}
61
62
63 @register.filter('top_categories_tuto')
64 def top_categories_tuto(user):
65 """
66 Get all the categories and their related subcategories
67 associed with an existing tutorial. The result is sorted
68 by alphabetic order.
69 """
70
71 # Ordered dict is use to keep order
72 cats = OrderedDict()
73
74 subcats_tutos = Tutorial.objects.values('subcategory').filter(sha_public__isnull=False).all()
75 catsubcats = CategorySubCategory.objects \
76 .filter(is_main=True)\
77 .filter(subcategory__in=subcats_tutos)\
78 .order_by('category__position', 'subcategory__title')\
79 .select_related('subcategory', 'category')\
80 .values('category__title', 'subcategory__title', 'subcategory__slug')\
81 .all()
82
83 for csc in catsubcats:
84 key = csc['category__title']
85
86 if key in cats:
87 cats[key].append((csc['subcategory__title'], csc['subcategory__slug']))
88 else:
89 cats[key] = [(csc['subcategory__title'], csc['subcategory__slug'])]
90
91 return cats
92
93
94 @register.filter('auth_forum')
95 def auth_forum(forum, user):
96 return forum.can_read(user)
97
[end of zds/utils/templatetags/topbar.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/zds/utils/templatetags/topbar.py b/zds/utils/templatetags/topbar.py
--- a/zds/utils/templatetags/topbar.py
+++ b/zds/utils/templatetags/topbar.py
@@ -1,9 +1,12 @@
# coding: utf-8
from collections import OrderedDict
+import itertools
+
from django import template
from django.conf import settings
-import itertools
+
+from zds.article.models import Article
from zds.forum.models import Forum, Topic
from zds.tutorial.models import Tutorial
from zds.utils.models import CategorySubCategory, Tag
@@ -91,6 +94,37 @@
return cats
[email protected]('top_categories_article')
+def top_categories_article(user):
+ """
+ Get all the categories and their related subcategories
+ associed with an existing articles. The result is sorted
+ by alphabetic order.
+ """
+
+ # Ordered dict is use to keep order
+ cats = OrderedDict()
+
+ subcats_articles = Article.objects.values('subcategory').filter(sha_public__isnull=False).all()
+ catsubcats = CategorySubCategory.objects \
+ .filter(is_main=True)\
+ .filter(subcategory__in=subcats_articles)\
+ .order_by('category__position', 'subcategory__title')\
+ .select_related('subcategory', 'category')\
+ .values('category__title', 'subcategory__title', 'subcategory__slug')\
+ .all()
+
+ for csc in catsubcats:
+ key = csc['category__title']
+
+ if key in cats:
+ cats[key].append((csc['subcategory__title'], csc['subcategory__slug']))
+ else:
+ cats[key] = [(csc['subcategory__title'], csc['subcategory__slug'])]
+
+ return cats
+
+
@register.filter('auth_forum')
def auth_forum(forum, user):
return forum.can_read(user)
|
{"golden_diff": "diff --git a/zds/utils/templatetags/topbar.py b/zds/utils/templatetags/topbar.py\n--- a/zds/utils/templatetags/topbar.py\n+++ b/zds/utils/templatetags/topbar.py\n@@ -1,9 +1,12 @@\n # coding: utf-8\n \n from collections import OrderedDict\n+import itertools\n+\n from django import template\n from django.conf import settings\n-import itertools\n+\n+from zds.article.models import Article\n from zds.forum.models import Forum, Topic\n from zds.tutorial.models import Tutorial\n from zds.utils.models import CategorySubCategory, Tag\n@@ -91,6 +94,37 @@\n return cats\n \n \[email protected]('top_categories_article')\n+def top_categories_article(user):\n+ \"\"\"\n+ Get all the categories and their related subcategories\n+ associed with an existing articles. The result is sorted\n+ by alphabetic order.\n+ \"\"\"\n+\n+ # Ordered dict is use to keep order\n+ cats = OrderedDict()\n+\n+ subcats_articles = Article.objects.values('subcategory').filter(sha_public__isnull=False).all()\n+ catsubcats = CategorySubCategory.objects \\\n+ .filter(is_main=True)\\\n+ .filter(subcategory__in=subcats_articles)\\\n+ .order_by('category__position', 'subcategory__title')\\\n+ .select_related('subcategory', 'category')\\\n+ .values('category__title', 'subcategory__title', 'subcategory__slug')\\\n+ .all()\n+\n+ for csc in catsubcats:\n+ key = csc['category__title']\n+\n+ if key in cats:\n+ cats[key].append((csc['subcategory__title'], csc['subcategory__slug']))\n+ else:\n+ cats[key] = [(csc['subcategory__title'], csc['subcategory__slug'])]\n+\n+ return cats\n+\n+\n @register.filter('auth_forum')\n def auth_forum(forum, user):\n return forum.can_read(user)\n", "issue": "La licence est absente lors de la visualisation d'une partie du tutoriel\nQuand on navigue partout dans un tutoriel, on a normalement la licence de celui en haut \u00e0 droite. Sauf lorsqu'on regarde une partie ([celle-ci](http://beta.zestedesavoir.com/tutoriels/335/creez-des-applications-pour-android/425/annexes/) par exemple).\n\n", "before_files": [{"content": "# coding: utf-8\n\nfrom collections import OrderedDict\nfrom django import template\nfrom django.conf import settings\nimport itertools\nfrom zds.forum.models import Forum, Topic\nfrom zds.tutorial.models import Tutorial\nfrom zds.utils.models import CategorySubCategory, Tag\n\n\nregister = template.Library()\n\n\[email protected]('top_categories')\ndef top_categories(user):\n cats = {}\n\n forums_pub = Forum.objects.filter(group__isnull=True).select_related(\"category\").all()\n if user and user.is_authenticated():\n forums_prv = Forum\\\n .objects\\\n .filter(group__isnull=False, group__in=user.groups.all())\\\n .select_related(\"category\").all()\n forums = list(forums_pub | forums_prv)\n else:\n forums = list(forums_pub)\n\n for forum in forums:\n key = forum.category.title\n if key in cats:\n cats[key].append(forum)\n else:\n cats[key] = [forum]\n\n tgs = Topic.objects\\\n .values('tags', 'pk')\\\n .distinct()\\\n .filter(forum__in=forums, tags__isnull=False)\n\n cts = {}\n for key, group in itertools.groupby(tgs, lambda item: item[\"tags\"]):\n for thing in group:\n if key in cts:\n cts[key] += 1\n else:\n cts[key] = 1\n\n cpt = 0\n top_tag = []\n sort_list = reversed(sorted(cts.iteritems(), key=lambda k_v: (k_v[1], k_v[0])))\n for key, value in sort_list:\n top_tag.append(key)\n cpt += 1\n if cpt >= settings.ZDS_APP['forum']['top_tag_max']:\n break\n\n tags = Tag.objects.filter(pk__in=top_tag)\n\n return {\"tags\": tags, \"categories\": cats}\n\n\[email protected]('top_categories_tuto')\ndef top_categories_tuto(user):\n \"\"\"\n Get all the categories and their related subcategories\n associed with an existing tutorial. The result is sorted\n by alphabetic order.\n \"\"\"\n\n # Ordered dict is use to keep order\n cats = OrderedDict()\n\n subcats_tutos = Tutorial.objects.values('subcategory').filter(sha_public__isnull=False).all()\n catsubcats = CategorySubCategory.objects \\\n .filter(is_main=True)\\\n .filter(subcategory__in=subcats_tutos)\\\n .order_by('category__position', 'subcategory__title')\\\n .select_related('subcategory', 'category')\\\n .values('category__title', 'subcategory__title', 'subcategory__slug')\\\n .all()\n\n for csc in catsubcats:\n key = csc['category__title']\n\n if key in cats:\n cats[key].append((csc['subcategory__title'], csc['subcategory__slug']))\n else:\n cats[key] = [(csc['subcategory__title'], csc['subcategory__slug'])]\n\n return cats\n\n\[email protected]('auth_forum')\ndef auth_forum(forum, user):\n return forum.can_read(user)\n", "path": "zds/utils/templatetags/topbar.py"}]}
| 1,510 | 446 |
gh_patches_debug_24481
|
rasdani/github-patches
|
git_diff
|
pyca__cryptography-1206
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Include OpenSSL in our Windows wheels
Installing OpenSSL isn't super easy, even with the binaries for it. Maybe we should bundle it?
</issue>
<code>
[start of cryptography/hazmat/bindings/openssl/binding.py]
1 # Licensed under the Apache License, Version 2.0 (the "License");
2 # you may not use this file except in compliance with the License.
3 # You may obtain a copy of the License at
4 #
5 # http://www.apache.org/licenses/LICENSE-2.0
6 #
7 # Unless required by applicable law or agreed to in writing, software
8 # distributed under the License is distributed on an "AS IS" BASIS,
9 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
10 # implied.
11 # See the License for the specific language governing permissions and
12 # limitations under the License.
13
14 from __future__ import absolute_import, division, print_function
15
16 import sys
17 import threading
18
19 from cryptography.hazmat.bindings.utils import build_ffi
20
21
22 _OSX_PRE_INCLUDE = """
23 #ifdef __APPLE__
24 #include <AvailabilityMacros.h>
25 #define __ORIG_DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER \
26 DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
27 #undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
28 #define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
29 #endif
30 """
31
32 _OSX_POST_INCLUDE = """
33 #ifdef __APPLE__
34 #undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
35 #define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER \
36 __ORIG_DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
37 #endif
38 """
39
40
41 class Binding(object):
42 """
43 OpenSSL API wrapper.
44 """
45 _module_prefix = "cryptography.hazmat.bindings.openssl."
46 _modules = [
47 "aes",
48 "asn1",
49 "bignum",
50 "bio",
51 "cmac",
52 "cms",
53 "conf",
54 "crypto",
55 "dh",
56 "dsa",
57 "ec",
58 "ecdh",
59 "ecdsa",
60 "engine",
61 "err",
62 "evp",
63 "hmac",
64 "nid",
65 "objects",
66 "opensslv",
67 "osrandom_engine",
68 "pem",
69 "pkcs7",
70 "pkcs12",
71 "rand",
72 "rsa",
73 "ssl",
74 "x509",
75 "x509name",
76 "x509v3",
77 "x509_vfy"
78 ]
79
80 _locks = None
81 _lock_cb_handle = None
82 _lock_init_lock = threading.Lock()
83
84 ffi = None
85 lib = None
86
87 def __init__(self):
88 self._ensure_ffi_initialized()
89
90 @classmethod
91 def _ensure_ffi_initialized(cls):
92 if cls.ffi is not None and cls.lib is not None:
93 return
94
95 # OpenSSL goes by a different library name on different operating
96 # systems.
97 if sys.platform != "win32":
98 libraries = ["crypto", "ssl"]
99 else: # pragma: no cover
100 libraries = ["libeay32", "ssleay32", "advapi32"]
101
102 cls.ffi, cls.lib = build_ffi(
103 module_prefix=cls._module_prefix,
104 modules=cls._modules,
105 pre_include=_OSX_PRE_INCLUDE,
106 post_include=_OSX_POST_INCLUDE,
107 libraries=libraries,
108 )
109 res = cls.lib.Cryptography_add_osrandom_engine()
110 assert res != 0
111
112 @classmethod
113 def is_available(cls):
114 # For now, OpenSSL is considered our "default" binding, so we treat it
115 # as always available.
116 return True
117
118 @classmethod
119 def init_static_locks(cls):
120 with cls._lock_init_lock:
121 cls._ensure_ffi_initialized()
122
123 if not cls._lock_cb_handle:
124 cls._lock_cb_handle = cls.ffi.callback(
125 "void(int, int, const char *, int)",
126 cls._lock_cb
127 )
128
129 # Use Python's implementation if available, importing _ssl triggers
130 # the setup for this.
131 __import__("_ssl")
132
133 if cls.lib.CRYPTO_get_locking_callback() != cls.ffi.NULL:
134 return
135
136 # If nothing else has setup a locking callback already, we set up
137 # our own
138 num_locks = cls.lib.CRYPTO_num_locks()
139 cls._locks = [threading.Lock() for n in range(num_locks)]
140
141 cls.lib.CRYPTO_set_locking_callback(cls._lock_cb_handle)
142
143 @classmethod
144 def _lock_cb(cls, mode, n, file, line):
145 lock = cls._locks[n]
146
147 if mode & cls.lib.CRYPTO_LOCK:
148 lock.acquire()
149 elif mode & cls.lib.CRYPTO_UNLOCK:
150 lock.release()
151 else:
152 raise RuntimeError(
153 "Unknown lock mode {0}: lock={1}, file={2}, line={3}.".format(
154 mode, n, file, line
155 )
156 )
157
[end of cryptography/hazmat/bindings/openssl/binding.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/cryptography/hazmat/bindings/openssl/binding.py
--- a/cryptography/hazmat/bindings/openssl/binding.py
+++ b/cryptography/hazmat/bindings/openssl/binding.py
@@ -13,6 +13,7 @@
from __future__ import absolute_import, division, print_function
+import os
import sys
import threading
@@ -97,7 +98,8 @@
if sys.platform != "win32":
libraries = ["crypto", "ssl"]
else: # pragma: no cover
- libraries = ["libeay32", "ssleay32", "advapi32"]
+ link_type = os.environ.get("PYCA_WINDOWS_LINK_TYPE", "static")
+ libraries = _get_windows_libraries(link_type)
cls.ffi, cls.lib = build_ffi(
module_prefix=cls._module_prefix,
@@ -154,3 +156,15 @@
mode, n, file, line
)
)
+
+
+def _get_windows_libraries(link_type):
+ if link_type == "dynamic":
+ return ["libeay32", "ssleay32", "advapi32"]
+ elif link_type == "static" or link_type == "":
+ return ["libeay32mt", "ssleay32mt", "advapi32",
+ "crypt32", "gdi32", "user32", "ws2_32"]
+ else:
+ raise ValueError(
+ "PYCA_WINDOWS_LINK_TYPE must be 'static' or 'dynamic'"
+ )
|
{"golden_diff": "diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/cryptography/hazmat/bindings/openssl/binding.py\n--- a/cryptography/hazmat/bindings/openssl/binding.py\n+++ b/cryptography/hazmat/bindings/openssl/binding.py\n@@ -13,6 +13,7 @@\n \n from __future__ import absolute_import, division, print_function\n \n+import os\n import sys\n import threading\n \n@@ -97,7 +98,8 @@\n if sys.platform != \"win32\":\n libraries = [\"crypto\", \"ssl\"]\n else: # pragma: no cover\n- libraries = [\"libeay32\", \"ssleay32\", \"advapi32\"]\n+ link_type = os.environ.get(\"PYCA_WINDOWS_LINK_TYPE\", \"static\")\n+ libraries = _get_windows_libraries(link_type)\n \n cls.ffi, cls.lib = build_ffi(\n module_prefix=cls._module_prefix,\n@@ -154,3 +156,15 @@\n mode, n, file, line\n )\n )\n+\n+\n+def _get_windows_libraries(link_type):\n+ if link_type == \"dynamic\":\n+ return [\"libeay32\", \"ssleay32\", \"advapi32\"]\n+ elif link_type == \"static\" or link_type == \"\":\n+ return [\"libeay32mt\", \"ssleay32mt\", \"advapi32\",\n+ \"crypt32\", \"gdi32\", \"user32\", \"ws2_32\"]\n+ else:\n+ raise ValueError(\n+ \"PYCA_WINDOWS_LINK_TYPE must be 'static' or 'dynamic'\"\n+ )\n", "issue": "Include OpenSSL in our Windows wheels\nInstalling OpenSSL isn't super easy, even with the binaries for it. Maybe we should bundle it?\n\n", "before_files": [{"content": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n# implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nfrom __future__ import absolute_import, division, print_function\n\nimport sys\nimport threading\n\nfrom cryptography.hazmat.bindings.utils import build_ffi\n\n\n_OSX_PRE_INCLUDE = \"\"\"\n#ifdef __APPLE__\n#include <AvailabilityMacros.h>\n#define __ORIG_DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER \\\n DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER\n#undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER\n#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER\n#endif\n\"\"\"\n\n_OSX_POST_INCLUDE = \"\"\"\n#ifdef __APPLE__\n#undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER\n#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER \\\n __ORIG_DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER\n#endif\n\"\"\"\n\n\nclass Binding(object):\n \"\"\"\n OpenSSL API wrapper.\n \"\"\"\n _module_prefix = \"cryptography.hazmat.bindings.openssl.\"\n _modules = [\n \"aes\",\n \"asn1\",\n \"bignum\",\n \"bio\",\n \"cmac\",\n \"cms\",\n \"conf\",\n \"crypto\",\n \"dh\",\n \"dsa\",\n \"ec\",\n \"ecdh\",\n \"ecdsa\",\n \"engine\",\n \"err\",\n \"evp\",\n \"hmac\",\n \"nid\",\n \"objects\",\n \"opensslv\",\n \"osrandom_engine\",\n \"pem\",\n \"pkcs7\",\n \"pkcs12\",\n \"rand\",\n \"rsa\",\n \"ssl\",\n \"x509\",\n \"x509name\",\n \"x509v3\",\n \"x509_vfy\"\n ]\n\n _locks = None\n _lock_cb_handle = None\n _lock_init_lock = threading.Lock()\n\n ffi = None\n lib = None\n\n def __init__(self):\n self._ensure_ffi_initialized()\n\n @classmethod\n def _ensure_ffi_initialized(cls):\n if cls.ffi is not None and cls.lib is not None:\n return\n\n # OpenSSL goes by a different library name on different operating\n # systems.\n if sys.platform != \"win32\":\n libraries = [\"crypto\", \"ssl\"]\n else: # pragma: no cover\n libraries = [\"libeay32\", \"ssleay32\", \"advapi32\"]\n\n cls.ffi, cls.lib = build_ffi(\n module_prefix=cls._module_prefix,\n modules=cls._modules,\n pre_include=_OSX_PRE_INCLUDE,\n post_include=_OSX_POST_INCLUDE,\n libraries=libraries,\n )\n res = cls.lib.Cryptography_add_osrandom_engine()\n assert res != 0\n\n @classmethod\n def is_available(cls):\n # For now, OpenSSL is considered our \"default\" binding, so we treat it\n # as always available.\n return True\n\n @classmethod\n def init_static_locks(cls):\n with cls._lock_init_lock:\n cls._ensure_ffi_initialized()\n\n if not cls._lock_cb_handle:\n cls._lock_cb_handle = cls.ffi.callback(\n \"void(int, int, const char *, int)\",\n cls._lock_cb\n )\n\n # Use Python's implementation if available, importing _ssl triggers\n # the setup for this.\n __import__(\"_ssl\")\n\n if cls.lib.CRYPTO_get_locking_callback() != cls.ffi.NULL:\n return\n\n # If nothing else has setup a locking callback already, we set up\n # our own\n num_locks = cls.lib.CRYPTO_num_locks()\n cls._locks = [threading.Lock() for n in range(num_locks)]\n\n cls.lib.CRYPTO_set_locking_callback(cls._lock_cb_handle)\n\n @classmethod\n def _lock_cb(cls, mode, n, file, line):\n lock = cls._locks[n]\n\n if mode & cls.lib.CRYPTO_LOCK:\n lock.acquire()\n elif mode & cls.lib.CRYPTO_UNLOCK:\n lock.release()\n else:\n raise RuntimeError(\n \"Unknown lock mode {0}: lock={1}, file={2}, line={3}.\".format(\n mode, n, file, line\n )\n )\n", "path": "cryptography/hazmat/bindings/openssl/binding.py"}]}
| 2,014 | 378 |
gh_patches_debug_3594
|
rasdani/github-patches
|
git_diff
|
encode__httpx-763
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
urllib3.ProxyManager() instantiation is broken.
python 3.7.5
httpx 0.11.0
urllib3 1.25.7
```
$ ipython3 -c 'import httpx; r = httpx.get("https://www.google.com")'
parse_url http://127.0.0.1:1234 <class 'httpx.models.URL'>
---------------------------------------------------------------------------
TypeError Traceback (most recent call last)
<ipython-input-1-d6fe3101235f> in <module>
----> 1 import httpx; r = httpx.get("https://www.google.com")
/usr/local/lib/python3.7/site-packages/httpx/api.py in get(url, params, headers, cookies, auth, allow_redirects, cert, verify, timeout, trust_env)
168 verify=verify,
169 timeout=timeout,
--> 170 trust_env=trust_env,
171 )
172
/usr/local/lib/python3.7/site-packages/httpx/api.py in request(method, url, params, data, files, json, headers, cookies, auth, timeout, allow_redirects, verify, cert, trust_env)
82 """
83 with Client(
---> 84 cert=cert, verify=verify, timeout=timeout, trust_env=trust_env,
85 ) as client:
86 return client.request(
/usr/local/lib/python3.7/site-packages/httpx/client.py in __init__(self, auth, params, headers, cookies, verify, cert, proxies, timeout, pool_limits, max_redirects, base_url, dispatch, app, trust_env)
477 trust_env=trust_env,
478 )
--> 479 for key, proxy in proxy_map.items()
480 }
481
/usr/local/lib/python3.7/site-packages/httpx/client.py in <dictcomp>(.0)
477 trust_env=trust_env,
478 )
--> 479 for key, proxy in proxy_map.items()
480 }
481
/usr/local/lib/python3.7/site-packages/httpx/client.py in init_proxy_dispatch(self, proxy, verify, cert, pool_limits, trust_env)
512 cert=cert,
513 pool_limits=pool_limits,
--> 514 trust_env=trust_env,
515 )
516
/usr/local/lib/python3.7/site-packages/httpx/dispatch/urllib3.py in __init__(self, proxy, verify, cert, trust_env, pool_limits)
58 num_pools=num_pools,
59 maxsize=maxsize,
---> 60 block=block,
61 )
62
/usr/local/lib/python3.7/site-packages/httpx/dispatch/urllib3.py in init_pool_manager(self, proxy, ssl_context, num_pools, maxsize, block)
83 num_pools=num_pools,
84 maxsize=maxsize,
---> 85 block=block,
86 )
87
/usr/local/lib/python3.7/site-packages/urllib3/poolmanager.py in __init__(self, proxy_url, num_pools, headers, proxy_headers, **connection_pool_kw)
412 proxy_url.port,
413 )
--> 414 proxy = parse_url(proxy_url)
415 if not proxy.port:
416 port = port_by_scheme.get(proxy.scheme, 80)
/usr/local/lib/python3.7/site-packages/urllib3/util/url.py in parse_url(url)
361 print('parse_url', url, type(url))
362 source_url = url
--> 363 if not SCHEME_RE.search(url):
364 url = "//" + url
365
TypeError: expected string or bytes-like object
```
</issue>
<code>
[start of httpx/dispatch/urllib3.py]
1 import math
2 import socket
3 import ssl
4 import typing
5
6 import urllib3
7 from urllib3.exceptions import MaxRetryError, SSLError
8
9 from ..config import (
10 DEFAULT_POOL_LIMITS,
11 CertTypes,
12 PoolLimits,
13 Proxy,
14 SSLConfig,
15 Timeout,
16 VerifyTypes,
17 )
18 from ..content_streams import IteratorStream
19 from ..models import Request, Response
20 from ..utils import as_network_error
21 from .base import SyncDispatcher
22
23
24 class URLLib3Dispatcher(SyncDispatcher):
25 def __init__(
26 self,
27 *,
28 proxy: Proxy = None,
29 verify: VerifyTypes = True,
30 cert: CertTypes = None,
31 trust_env: bool = None,
32 pool_limits: PoolLimits = DEFAULT_POOL_LIMITS,
33 ):
34 ssl_config = SSLConfig(
35 verify=verify, cert=cert, trust_env=trust_env, http2=False
36 )
37 hard_limit = pool_limits.hard_limit
38 soft_limit = pool_limits.soft_limit
39
40 # Our connection pool configuration doesn't quite match up with urllib3's
41 # controls, but we can put sensible mappings in place:
42 if hard_limit is None:
43 block = False
44 if soft_limit is None:
45 num_pools = 1000
46 maxsize = 1000
47 else:
48 num_pools = int(math.sqrt(soft_limit))
49 maxsize = int(math.sqrt(soft_limit))
50 else:
51 block = True
52 num_pools = int(math.sqrt(hard_limit))
53 maxsize = int(math.sqrt(hard_limit))
54
55 self.pool = self.init_pool_manager(
56 proxy=proxy,
57 ssl_context=ssl_config.ssl_context,
58 num_pools=num_pools,
59 maxsize=maxsize,
60 block=block,
61 )
62
63 def init_pool_manager(
64 self,
65 proxy: typing.Optional[Proxy],
66 ssl_context: ssl.SSLContext,
67 num_pools: int,
68 maxsize: int,
69 block: bool,
70 ) -> typing.Union[urllib3.PoolManager, urllib3.ProxyManager]:
71 if proxy is None:
72 return urllib3.PoolManager(
73 ssl_context=ssl_context,
74 num_pools=num_pools,
75 maxsize=maxsize,
76 block=block,
77 )
78 else:
79 return urllib3.ProxyManager(
80 proxy_url=proxy.url,
81 proxy_headers=dict(proxy.headers),
82 ssl_context=ssl_context,
83 num_pools=num_pools,
84 maxsize=maxsize,
85 block=block,
86 )
87
88 def send(self, request: Request, timeout: Timeout = None) -> Response:
89 timeout = Timeout() if timeout is None else timeout
90 urllib3_timeout = urllib3.util.Timeout(
91 connect=timeout.connect_timeout, read=timeout.read_timeout
92 )
93 chunked = request.headers.get("Transfer-Encoding") == "chunked"
94 content_length = int(request.headers.get("Content-Length", "0"))
95 body = request.stream if chunked or content_length else None
96
97 with as_network_error(MaxRetryError, SSLError, socket.error):
98 conn = self.pool.urlopen(
99 method=request.method,
100 url=str(request.url),
101 headers=dict(request.headers),
102 body=body,
103 redirect=False,
104 assert_same_host=False,
105 retries=0,
106 preload_content=False,
107 chunked=chunked,
108 timeout=urllib3_timeout,
109 pool_timeout=timeout.pool_timeout,
110 )
111
112 def response_bytes() -> typing.Iterator[bytes]:
113 with as_network_error(socket.error):
114 for chunk in conn.stream(4096, decode_content=False):
115 yield chunk
116
117 return Response(
118 status_code=conn.status,
119 http_version="HTTP/1.1",
120 headers=list(conn.headers.items()),
121 stream=IteratorStream(
122 iterator=response_bytes(), close_func=conn.release_conn
123 ),
124 request=request,
125 )
126
127 def close(self) -> None:
128 self.pool.clear()
129
[end of httpx/dispatch/urllib3.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/httpx/dispatch/urllib3.py b/httpx/dispatch/urllib3.py
--- a/httpx/dispatch/urllib3.py
+++ b/httpx/dispatch/urllib3.py
@@ -77,7 +77,7 @@
)
else:
return urllib3.ProxyManager(
- proxy_url=proxy.url,
+ proxy_url=str(proxy.url),
proxy_headers=dict(proxy.headers),
ssl_context=ssl_context,
num_pools=num_pools,
|
{"golden_diff": "diff --git a/httpx/dispatch/urllib3.py b/httpx/dispatch/urllib3.py\n--- a/httpx/dispatch/urllib3.py\n+++ b/httpx/dispatch/urllib3.py\n@@ -77,7 +77,7 @@\n )\n else:\n return urllib3.ProxyManager(\n- proxy_url=proxy.url,\n+ proxy_url=str(proxy.url),\n proxy_headers=dict(proxy.headers),\n ssl_context=ssl_context,\n num_pools=num_pools,\n", "issue": "urllib3.ProxyManager() instantiation is broken.\npython 3.7.5\r\nhttpx 0.11.0\r\nurllib3 1.25.7\r\n\r\n```\r\n$ ipython3 -c 'import httpx; r = httpx.get(\"https://www.google.com\")'\r\nparse_url http://127.0.0.1:1234 <class 'httpx.models.URL'>\r\n---------------------------------------------------------------------------\r\nTypeError Traceback (most recent call last)\r\n<ipython-input-1-d6fe3101235f> in <module>\r\n----> 1 import httpx; r = httpx.get(\"https://www.google.com\")\r\n\r\n/usr/local/lib/python3.7/site-packages/httpx/api.py in get(url, params, headers, cookies, auth, allow_redirects, cert, verify, timeout, trust_env)\r\n 168 verify=verify,\r\n 169 timeout=timeout,\r\n--> 170 trust_env=trust_env,\r\n 171 )\r\n 172\r\n\r\n/usr/local/lib/python3.7/site-packages/httpx/api.py in request(method, url, params, data, files, json, headers, cookies, auth, timeout, allow_redirects, verify, cert, trust_env)\r\n 82 \"\"\"\r\n 83 with Client(\r\n---> 84 cert=cert, verify=verify, timeout=timeout, trust_env=trust_env,\r\n 85 ) as client:\r\n 86 return client.request(\r\n\r\n/usr/local/lib/python3.7/site-packages/httpx/client.py in __init__(self, auth, params, headers, cookies, verify, cert, proxies, timeout, pool_limits, max_redirects, base_url, dispatch, app, trust_env)\r\n 477 trust_env=trust_env,\r\n 478 )\r\n--> 479 for key, proxy in proxy_map.items()\r\n 480 }\r\n 481\r\n\r\n/usr/local/lib/python3.7/site-packages/httpx/client.py in <dictcomp>(.0)\r\n 477 trust_env=trust_env,\r\n 478 )\r\n--> 479 for key, proxy in proxy_map.items()\r\n 480 }\r\n 481\r\n\r\n/usr/local/lib/python3.7/site-packages/httpx/client.py in init_proxy_dispatch(self, proxy, verify, cert, pool_limits, trust_env)\r\n 512 cert=cert,\r\n 513 pool_limits=pool_limits,\r\n--> 514 trust_env=trust_env,\r\n 515 )\r\n 516\r\n\r\n/usr/local/lib/python3.7/site-packages/httpx/dispatch/urllib3.py in __init__(self, proxy, verify, cert, trust_env, pool_limits)\r\n 58 num_pools=num_pools,\r\n 59 maxsize=maxsize,\r\n---> 60 block=block,\r\n 61 )\r\n 62\r\n\r\n/usr/local/lib/python3.7/site-packages/httpx/dispatch/urllib3.py in init_pool_manager(self, proxy, ssl_context, num_pools, maxsize, block)\r\n 83 num_pools=num_pools,\r\n 84 maxsize=maxsize,\r\n---> 85 block=block,\r\n 86 )\r\n 87\r\n\r\n/usr/local/lib/python3.7/site-packages/urllib3/poolmanager.py in __init__(self, proxy_url, num_pools, headers, proxy_headers, **connection_pool_kw)\r\n 412 proxy_url.port,\r\n 413 )\r\n--> 414 proxy = parse_url(proxy_url)\r\n 415 if not proxy.port:\r\n 416 port = port_by_scheme.get(proxy.scheme, 80)\r\n\r\n/usr/local/lib/python3.7/site-packages/urllib3/util/url.py in parse_url(url)\r\n 361 print('parse_url', url, type(url))\r\n 362 source_url = url\r\n--> 363 if not SCHEME_RE.search(url):\r\n 364 url = \"//\" + url\r\n 365\r\n\r\nTypeError: expected string or bytes-like object\r\n```\n", "before_files": [{"content": "import math\nimport socket\nimport ssl\nimport typing\n\nimport urllib3\nfrom urllib3.exceptions import MaxRetryError, SSLError\n\nfrom ..config import (\n DEFAULT_POOL_LIMITS,\n CertTypes,\n PoolLimits,\n Proxy,\n SSLConfig,\n Timeout,\n VerifyTypes,\n)\nfrom ..content_streams import IteratorStream\nfrom ..models import Request, Response\nfrom ..utils import as_network_error\nfrom .base import SyncDispatcher\n\n\nclass URLLib3Dispatcher(SyncDispatcher):\n def __init__(\n self,\n *,\n proxy: Proxy = None,\n verify: VerifyTypes = True,\n cert: CertTypes = None,\n trust_env: bool = None,\n pool_limits: PoolLimits = DEFAULT_POOL_LIMITS,\n ):\n ssl_config = SSLConfig(\n verify=verify, cert=cert, trust_env=trust_env, http2=False\n )\n hard_limit = pool_limits.hard_limit\n soft_limit = pool_limits.soft_limit\n\n # Our connection pool configuration doesn't quite match up with urllib3's\n # controls, but we can put sensible mappings in place:\n if hard_limit is None:\n block = False\n if soft_limit is None:\n num_pools = 1000\n maxsize = 1000\n else:\n num_pools = int(math.sqrt(soft_limit))\n maxsize = int(math.sqrt(soft_limit))\n else:\n block = True\n num_pools = int(math.sqrt(hard_limit))\n maxsize = int(math.sqrt(hard_limit))\n\n self.pool = self.init_pool_manager(\n proxy=proxy,\n ssl_context=ssl_config.ssl_context,\n num_pools=num_pools,\n maxsize=maxsize,\n block=block,\n )\n\n def init_pool_manager(\n self,\n proxy: typing.Optional[Proxy],\n ssl_context: ssl.SSLContext,\n num_pools: int,\n maxsize: int,\n block: bool,\n ) -> typing.Union[urllib3.PoolManager, urllib3.ProxyManager]:\n if proxy is None:\n return urllib3.PoolManager(\n ssl_context=ssl_context,\n num_pools=num_pools,\n maxsize=maxsize,\n block=block,\n )\n else:\n return urllib3.ProxyManager(\n proxy_url=proxy.url,\n proxy_headers=dict(proxy.headers),\n ssl_context=ssl_context,\n num_pools=num_pools,\n maxsize=maxsize,\n block=block,\n )\n\n def send(self, request: Request, timeout: Timeout = None) -> Response:\n timeout = Timeout() if timeout is None else timeout\n urllib3_timeout = urllib3.util.Timeout(\n connect=timeout.connect_timeout, read=timeout.read_timeout\n )\n chunked = request.headers.get(\"Transfer-Encoding\") == \"chunked\"\n content_length = int(request.headers.get(\"Content-Length\", \"0\"))\n body = request.stream if chunked or content_length else None\n\n with as_network_error(MaxRetryError, SSLError, socket.error):\n conn = self.pool.urlopen(\n method=request.method,\n url=str(request.url),\n headers=dict(request.headers),\n body=body,\n redirect=False,\n assert_same_host=False,\n retries=0,\n preload_content=False,\n chunked=chunked,\n timeout=urllib3_timeout,\n pool_timeout=timeout.pool_timeout,\n )\n\n def response_bytes() -> typing.Iterator[bytes]:\n with as_network_error(socket.error):\n for chunk in conn.stream(4096, decode_content=False):\n yield chunk\n\n return Response(\n status_code=conn.status,\n http_version=\"HTTP/1.1\",\n headers=list(conn.headers.items()),\n stream=IteratorStream(\n iterator=response_bytes(), close_func=conn.release_conn\n ),\n request=request,\n )\n\n def close(self) -> None:\n self.pool.clear()\n", "path": "httpx/dispatch/urllib3.py"}]}
| 2,587 | 110 |
gh_patches_debug_22187
|
rasdani/github-patches
|
git_diff
|
joke2k__faker-808
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Ensure words() returns a unique list of words without duplicates
When calling `words(10)` there is no guarantee that the returned list of elements is unique. While I could do `set(words(10))`, this may only return 9 items when I am in need of 10.
If creating a list of words with potential duplicates is a useful feature to some, maybe adding an optional parameter called `unique` to the `words` generator could prove useful.
</issue>
<code>
[start of faker/providers/lorem/__init__.py]
1 localized = True
2
3 # 'Latin' is the default locale
4 default_locale = 'la'
5
6
7 from .. import BaseProvider
8
9
10 class Provider(BaseProvider):
11 """Will provide methods to retrieve lorem content
12
13 Attributes:
14 sentence_punctuation (str): End of sentence punctuation
15 word_connector (str): Default connector between words
16
17 Methods:
18 word: Generate a random word
19 words: Generate a list containing random words
20 sentence: Generate a random sentence
21 sentences: Generate a list containing sentences
22 paragraph: Generate a single paragraph
23 paragraphs: Generate many paragraphs
24 text: Generate a text string.
25 """
26 word_connector = ' '
27 sentence_punctuation = '.'
28
29 def words(self, nb=3, ext_word_list=None):
30 """
31 :returns: An array of random words. for example: ['Lorem', 'ipsum', 'dolor']
32
33 Keyword arguments:
34 :param nb: how many words to return
35 :param ext_word_list: a list of words you would like to have instead of
36 'Lorem ipsum'
37
38 :rtype: list
39 """
40 word_list = ext_word_list if ext_word_list else self.word_list
41 return self.random_choices(word_list, length=nb)
42
43 def word(self, ext_word_list=None):
44 """
45 :returns: A random word, eg: 'lorem'
46
47 :param ext_word_list: a list of words you would like to have instead of
48 'Lorem ipsum'
49
50 :rtype: str
51 """
52 return self.words(1, ext_word_list)[0]
53
54 def sentence(self, nb_words=6, variable_nb_words=True, ext_word_list=None):
55 """
56 Generate a random sentence
57 :example 'Lorem ipsum dolor sit amet.'
58
59 :param nb_words: around how many words the sentence should contain
60 :param variable_nb_words: set to false if you want exactly ``nb``
61 words returned, otherwise the result may include a number of words
62 of ``nb`` +/-40% (with a minimum of 1)
63 :param ext_word_list: a list of words you would like to have instead of
64 'Lorem ipsum'.
65
66 :rtype: str
67 """
68 if nb_words <= 0:
69 return ''
70
71 if variable_nb_words:
72 nb_words = self.randomize_nb_elements(nb_words, min=1)
73
74 words = self.words(nb=nb_words, ext_word_list=ext_word_list)
75 words[0] = words[0].title()
76
77 return self.word_connector.join(words) + self.sentence_punctuation
78
79 def sentences(self, nb=3, ext_word_list=None):
80 """
81 Generate an array of sentences
82 :example ['Lorem ipsum dolor sit amet.', 'Consectetur adipisicing eli.']
83
84 Keyword arguments:
85 :param nb: how many sentences to return
86 :param ext_word_list: a list of words you would like to have instead of
87 'Lorem ipsum'.
88
89 :rtype: list
90 """
91 return [self.sentence(ext_word_list=ext_word_list)
92 for _ in range(0, nb)]
93
94 def paragraph(
95 self,
96 nb_sentences=3,
97 variable_nb_sentences=True,
98 ext_word_list=None):
99 """
100 :returns: A single paragraph. For example: 'Sapiente sunt omnis. Ut
101 pariatur ad autem ducimus et. Voluptas rem voluptas sint modi dolorem amet.'
102
103 Keyword arguments:
104 :param nb_sentences: around how many sentences the paragraph should contain
105 :param variable_nb_sentences: set to false if you want exactly ``nb``
106 sentences returned, otherwise the result may include a number of
107 sentences of ``nb`` +/-40% (with a minimum of 1)
108 :param ext_word_list: a list of words you would like to have instead of
109 'Lorem ipsum'.
110
111 :rtype: str
112 """
113 if nb_sentences <= 0:
114 return ''
115
116 if variable_nb_sentences:
117 nb_sentences = self.randomize_nb_elements(nb_sentences, min=1)
118
119 para = self.word_connector.join(self.sentences(
120 nb_sentences, ext_word_list=ext_word_list
121 ))
122
123 return para
124
125 def paragraphs(self, nb=3, ext_word_list=None):
126 """
127 Generate an array of paragraphs
128 :example [paragraph1, paragraph2, paragraph3]
129 :param nb: how many paragraphs to return
130 :param ext_word_list: a list of words you would like to have instead of
131 'Lorem ipsum'.
132
133 :rtype: list
134 """
135
136 return [self.paragraph(ext_word_list=ext_word_list)
137 for _ in range(0, nb)]
138
139 def text(self, max_nb_chars=200, ext_word_list=None):
140 """
141 Generate a text string.
142 Depending on the ``max_nb_chars, returns a string made of words, sentences, or paragraphs.
143 :example 'Sapiente sunt omnis. Ut pariatur ad autem ducimus et. Voluptas rem voluptas sint modi dolorem amet.'
144
145 Keyword arguments:
146 :param max_nb_chars: Maximum number of characters the text should contain (minimum 5)
147 :param ext_word_list: a list of words you would like to have instead of 'Lorem ipsum'.
148
149 :rtype str
150 """
151 text = []
152 if max_nb_chars < 5:
153 raise ValueError(
154 'text() can only generate text of at least 5 characters')
155
156 if max_nb_chars < 25:
157 # join words
158 while not text:
159 size = 0
160 # determine how many words are needed to reach the $max_nb_chars
161 # once;
162 while size < max_nb_chars:
163 word = (self.word_connector if size else '') + \
164 self.word(ext_word_list=ext_word_list)
165 text.append(word)
166 size += len(word)
167 text.pop()
168 text[0] = text[0][0].upper() + text[0][1:]
169 last_index = len(text) - 1
170 text[last_index] += self.sentence_punctuation
171 elif max_nb_chars < 100:
172 # join sentences
173 while not text:
174 size = 0
175 # determine how many sentences are needed to reach the
176 # $max_nb_chars once
177 while size < max_nb_chars:
178 sentence = (self.word_connector if size else '') + \
179 self.sentence(ext_word_list=ext_word_list)
180 text.append(sentence)
181 size += len(sentence)
182 text.pop()
183 else:
184 # join paragraphs
185 while not text:
186 size = 0
187 # determine how many paragraphs are needed to reach the
188 # $max_nb_chars once
189 while size < max_nb_chars:
190 paragraph = ('\n' if size else '') + \
191 self.paragraph(ext_word_list=ext_word_list)
192 text.append(paragraph)
193 size += len(paragraph)
194 text.pop()
195
196 return "".join(text)
197
[end of faker/providers/lorem/__init__.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/faker/providers/lorem/__init__.py b/faker/providers/lorem/__init__.py
--- a/faker/providers/lorem/__init__.py
+++ b/faker/providers/lorem/__init__.py
@@ -26,7 +26,7 @@
word_connector = ' '
sentence_punctuation = '.'
- def words(self, nb=3, ext_word_list=None):
+ def words(self, nb=3, ext_word_list=None, unique=False):
"""
:returns: An array of random words. for example: ['Lorem', 'ipsum', 'dolor']
@@ -34,10 +34,13 @@
:param nb: how many words to return
:param ext_word_list: a list of words you would like to have instead of
'Lorem ipsum'
+ :param unique: If True, the returned word list will contain unique words
:rtype: list
"""
word_list = ext_word_list if ext_word_list else self.word_list
+ if unique:
+ return self.random_sample(word_list, length=nb)
return self.random_choices(word_list, length=nb)
def word(self, ext_word_list=None):
|
{"golden_diff": "diff --git a/faker/providers/lorem/__init__.py b/faker/providers/lorem/__init__.py\n--- a/faker/providers/lorem/__init__.py\n+++ b/faker/providers/lorem/__init__.py\n@@ -26,7 +26,7 @@\n word_connector = ' '\n sentence_punctuation = '.'\n \n- def words(self, nb=3, ext_word_list=None):\n+ def words(self, nb=3, ext_word_list=None, unique=False):\n \"\"\"\n :returns: An array of random words. for example: ['Lorem', 'ipsum', 'dolor']\n \n@@ -34,10 +34,13 @@\n :param nb: how many words to return\n :param ext_word_list: a list of words you would like to have instead of\n 'Lorem ipsum'\n+ :param unique: If True, the returned word list will contain unique words\n \n :rtype: list\n \"\"\"\n word_list = ext_word_list if ext_word_list else self.word_list\n+ if unique:\n+ return self.random_sample(word_list, length=nb)\n return self.random_choices(word_list, length=nb)\n \n def word(self, ext_word_list=None):\n", "issue": "Ensure words() returns a unique list of words without duplicates\nWhen calling `words(10)` there is no guarantee that the returned list of elements is unique. While I could do `set(words(10))`, this may only return 9 items when I am in need of 10.\r\n\r\nIf creating a list of words with potential duplicates is a useful feature to some, maybe adding an optional parameter called `unique` to the `words` generator could prove useful.\n", "before_files": [{"content": "localized = True\n\n# 'Latin' is the default locale\ndefault_locale = 'la'\n\n\nfrom .. import BaseProvider\n\n\nclass Provider(BaseProvider):\n \"\"\"Will provide methods to retrieve lorem content\n\n Attributes:\n sentence_punctuation (str): End of sentence punctuation\n word_connector (str): Default connector between words\n\n Methods:\n word: Generate a random word\n words: Generate a list containing random words\n sentence: Generate a random sentence\n sentences: Generate a list containing sentences\n paragraph: Generate a single paragraph\n paragraphs: Generate many paragraphs\n text: Generate a text string.\n \"\"\"\n word_connector = ' '\n sentence_punctuation = '.'\n\n def words(self, nb=3, ext_word_list=None):\n \"\"\"\n :returns: An array of random words. for example: ['Lorem', 'ipsum', 'dolor']\n\n Keyword arguments:\n :param nb: how many words to return\n :param ext_word_list: a list of words you would like to have instead of\n 'Lorem ipsum'\n\n :rtype: list\n \"\"\"\n word_list = ext_word_list if ext_word_list else self.word_list\n return self.random_choices(word_list, length=nb)\n\n def word(self, ext_word_list=None):\n \"\"\"\n :returns: A random word, eg: 'lorem'\n\n :param ext_word_list: a list of words you would like to have instead of\n 'Lorem ipsum'\n\n :rtype: str\n \"\"\"\n return self.words(1, ext_word_list)[0]\n\n def sentence(self, nb_words=6, variable_nb_words=True, ext_word_list=None):\n \"\"\"\n Generate a random sentence\n :example 'Lorem ipsum dolor sit amet.'\n\n :param nb_words: around how many words the sentence should contain\n :param variable_nb_words: set to false if you want exactly ``nb``\n words returned, otherwise the result may include a number of words\n of ``nb`` +/-40% (with a minimum of 1)\n :param ext_word_list: a list of words you would like to have instead of\n 'Lorem ipsum'.\n\n :rtype: str\n \"\"\"\n if nb_words <= 0:\n return ''\n\n if variable_nb_words:\n nb_words = self.randomize_nb_elements(nb_words, min=1)\n\n words = self.words(nb=nb_words, ext_word_list=ext_word_list)\n words[0] = words[0].title()\n\n return self.word_connector.join(words) + self.sentence_punctuation\n\n def sentences(self, nb=3, ext_word_list=None):\n \"\"\"\n Generate an array of sentences\n :example ['Lorem ipsum dolor sit amet.', 'Consectetur adipisicing eli.']\n\n Keyword arguments:\n :param nb: how many sentences to return\n :param ext_word_list: a list of words you would like to have instead of\n 'Lorem ipsum'.\n\n :rtype: list\n \"\"\"\n return [self.sentence(ext_word_list=ext_word_list)\n for _ in range(0, nb)]\n\n def paragraph(\n self,\n nb_sentences=3,\n variable_nb_sentences=True,\n ext_word_list=None):\n \"\"\"\n :returns: A single paragraph. For example: 'Sapiente sunt omnis. Ut\n pariatur ad autem ducimus et. Voluptas rem voluptas sint modi dolorem amet.'\n\n Keyword arguments:\n :param nb_sentences: around how many sentences the paragraph should contain\n :param variable_nb_sentences: set to false if you want exactly ``nb``\n sentences returned, otherwise the result may include a number of\n sentences of ``nb`` +/-40% (with a minimum of 1)\n :param ext_word_list: a list of words you would like to have instead of\n 'Lorem ipsum'.\n\n :rtype: str\n \"\"\"\n if nb_sentences <= 0:\n return ''\n\n if variable_nb_sentences:\n nb_sentences = self.randomize_nb_elements(nb_sentences, min=1)\n\n para = self.word_connector.join(self.sentences(\n nb_sentences, ext_word_list=ext_word_list\n ))\n\n return para\n\n def paragraphs(self, nb=3, ext_word_list=None):\n \"\"\"\n Generate an array of paragraphs\n :example [paragraph1, paragraph2, paragraph3]\n :param nb: how many paragraphs to return\n :param ext_word_list: a list of words you would like to have instead of\n 'Lorem ipsum'.\n\n :rtype: list\n \"\"\"\n\n return [self.paragraph(ext_word_list=ext_word_list)\n for _ in range(0, nb)]\n\n def text(self, max_nb_chars=200, ext_word_list=None):\n \"\"\"\n Generate a text string.\n Depending on the ``max_nb_chars, returns a string made of words, sentences, or paragraphs.\n :example 'Sapiente sunt omnis. Ut pariatur ad autem ducimus et. Voluptas rem voluptas sint modi dolorem amet.'\n\n Keyword arguments:\n :param max_nb_chars: Maximum number of characters the text should contain (minimum 5)\n :param ext_word_list: a list of words you would like to have instead of 'Lorem ipsum'.\n\n :rtype str\n \"\"\"\n text = []\n if max_nb_chars < 5:\n raise ValueError(\n 'text() can only generate text of at least 5 characters')\n\n if max_nb_chars < 25:\n # join words\n while not text:\n size = 0\n # determine how many words are needed to reach the $max_nb_chars\n # once;\n while size < max_nb_chars:\n word = (self.word_connector if size else '') + \\\n self.word(ext_word_list=ext_word_list)\n text.append(word)\n size += len(word)\n text.pop()\n text[0] = text[0][0].upper() + text[0][1:]\n last_index = len(text) - 1\n text[last_index] += self.sentence_punctuation\n elif max_nb_chars < 100:\n # join sentences\n while not text:\n size = 0\n # determine how many sentences are needed to reach the\n # $max_nb_chars once\n while size < max_nb_chars:\n sentence = (self.word_connector if size else '') + \\\n self.sentence(ext_word_list=ext_word_list)\n text.append(sentence)\n size += len(sentence)\n text.pop()\n else:\n # join paragraphs\n while not text:\n size = 0\n # determine how many paragraphs are needed to reach the\n # $max_nb_chars once\n while size < max_nb_chars:\n paragraph = ('\\n' if size else '') + \\\n self.paragraph(ext_word_list=ext_word_list)\n text.append(paragraph)\n size += len(paragraph)\n text.pop()\n\n return \"\".join(text)\n", "path": "faker/providers/lorem/__init__.py"}]}
| 2,641 | 270 |
gh_patches_debug_19067
|
rasdani/github-patches
|
git_diff
|
voxel51__fiftyone-157
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
fiftyone fails to import if not installed in a virtual environment
Due to at least https://github.com/voxel51/fiftyone/blob/v0.1.3/fiftyone/constants.py#L32
</issue>
<code>
[start of fiftyone/constants.py]
1 """
2 Package-wide constants.
3
4 | Copyright 2017-2020, Voxel51, Inc.
5 | `voxel51.com <https://voxel51.com/>`_
6 |
7 """
8 # pragma pylint: disable=redefined-builtin
9 # pragma pylint: disable=unused-wildcard-import
10 # pragma pylint: disable=wildcard-import
11 from __future__ import absolute_import
12 from __future__ import division
13 from __future__ import print_function
14 from __future__ import unicode_literals
15 from builtins import *
16
17 # pragma pylint: enable=redefined-builtin
18 # pragma pylint: enable=unused-wildcard-import
19 # pragma pylint: enable=wildcard-import
20
21 import os
22 import sys
23
24 try:
25 from importlib.metadata import metadata # Python 3.8
26 except ImportError:
27 from importlib_metadata import metadata # Python < 3.8
28
29
30 # Directories
31 FIFTYONE_DIR = os.path.abspath(os.path.dirname(__file__))
32 FIFTYONE_ENV = os.environ["VIRTUAL_ENV"]
33 FIFTYONE_CONFIG_DIR = os.path.join(os.path.expanduser("~"), ".fiftyone")
34 FIFTYONE_CONFIG_PATH = os.path.join(FIFTYONE_CONFIG_DIR, "config.json")
35 BASE_DIR = os.path.dirname(FIFTYONE_DIR)
36 EXAMPLES_DIR = os.path.join(FIFTYONE_DIR, "examples")
37 if not os.path.isdir(EXAMPLES_DIR):
38 EXAMPLES_DIR = os.path.join(BASE_DIR, "examples")
39
40 # Package metadata
41 _META = metadata("fiftyone")
42 NAME = _META["name"]
43 VERSION = _META["version"]
44 DESCRIPTION = _META["summary"]
45 AUTHOR = _META["author"]
46 AUTHOR_EMAIL = _META["author-email"]
47 URL = _META["home-page"]
48 LICENSE = _META["license"]
49 VERSION_LONG = "%s v%s, %s" % (NAME, VERSION, AUTHOR)
50
51 # MongoDB setup
52 try:
53 from fiftyone.db import FIFTYONE_DB_BIN_DIR
54 except ImportError:
55 # development installation
56 FIFTYONE_DB_BIN_DIR = os.path.join(FIFTYONE_CONFIG_DIR, "bin")
57 DB_PATH = os.path.join(FIFTYONE_CONFIG_DIR, "var/lib/mongo")
58 DB_BIN_PATH = os.path.join(FIFTYONE_DB_BIN_DIR, "mongod")
59 DB_CLIENT_BIN_PATH = os.path.join(FIFTYONE_DB_BIN_DIR, "mongo")
60 DB_LOG_PATH = os.path.join(FIFTYONE_CONFIG_DIR, "var/log/mongodb/mongo.log")
61 os.environ["PATH"] = os.pathsep.join([FIFTYONE_CONFIG_DIR, os.environ["PATH"]])
62 START_DB = [
63 DB_BIN_PATH,
64 "--dbpath",
65 DB_PATH,
66 "--logpath",
67 DB_LOG_PATH,
68 "--fork",
69 ]
70 STOP_DB = " ".join(
71 [
72 DB_CLIENT_BIN_PATH,
73 "--eval",
74 '''"db.getSiblingDB('admin').shutdownServer()"''',
75 ">/dev/null 2>&1",
76 ]
77 )
78
79 if sys.platform.startswith("linux"):
80 _STOP_SERVICE = "fuser -k %d/tcp >/dev/null 2>&1"
81
82 elif sys.platform == "darwin":
83 _STOP_SERVICE = (
84 "lsof -i tcp:%d | grep -v PID | awk '{print $2}' | xargs kill"
85 )
86
87 else:
88 raise OSError("Unsupported OS: %s" % sys.platform)
89
90 # Server setup
91 SERVER_DIR = os.path.join(FIFTYONE_DIR, "server")
92 SERVER_ADDR = "http://127.0.0.1:%d"
93 START_SERVER = [
94 "gunicorn",
95 "-w",
96 "1",
97 "--worker-class",
98 "eventlet",
99 "-b",
100 "127.0.0.1:%d",
101 "main:app",
102 "--daemon",
103 "--reload",
104 ]
105
106 STOP_SERVER = _STOP_SERVICE
107
108 # App setup
109 try:
110 from fiftyone.gui import FIFTYONE_APP_DIR
111 except ImportError:
112 FIFTYONE_APP_DIR = os.path.join(FIFTYONE_DIR, "../electron")
113
[end of fiftyone/constants.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/fiftyone/constants.py b/fiftyone/constants.py
--- a/fiftyone/constants.py
+++ b/fiftyone/constants.py
@@ -29,7 +29,6 @@
# Directories
FIFTYONE_DIR = os.path.abspath(os.path.dirname(__file__))
-FIFTYONE_ENV = os.environ["VIRTUAL_ENV"]
FIFTYONE_CONFIG_DIR = os.path.join(os.path.expanduser("~"), ".fiftyone")
FIFTYONE_CONFIG_PATH = os.path.join(FIFTYONE_CONFIG_DIR, "config.json")
BASE_DIR = os.path.dirname(FIFTYONE_DIR)
@@ -58,7 +57,6 @@
DB_BIN_PATH = os.path.join(FIFTYONE_DB_BIN_DIR, "mongod")
DB_CLIENT_BIN_PATH = os.path.join(FIFTYONE_DB_BIN_DIR, "mongo")
DB_LOG_PATH = os.path.join(FIFTYONE_CONFIG_DIR, "var/log/mongodb/mongo.log")
-os.environ["PATH"] = os.pathsep.join([FIFTYONE_CONFIG_DIR, os.environ["PATH"]])
START_DB = [
DB_BIN_PATH,
"--dbpath",
|
{"golden_diff": "diff --git a/fiftyone/constants.py b/fiftyone/constants.py\n--- a/fiftyone/constants.py\n+++ b/fiftyone/constants.py\n@@ -29,7 +29,6 @@\n \n # Directories\n FIFTYONE_DIR = os.path.abspath(os.path.dirname(__file__))\n-FIFTYONE_ENV = os.environ[\"VIRTUAL_ENV\"]\n FIFTYONE_CONFIG_DIR = os.path.join(os.path.expanduser(\"~\"), \".fiftyone\")\n FIFTYONE_CONFIG_PATH = os.path.join(FIFTYONE_CONFIG_DIR, \"config.json\")\n BASE_DIR = os.path.dirname(FIFTYONE_DIR)\n@@ -58,7 +57,6 @@\n DB_BIN_PATH = os.path.join(FIFTYONE_DB_BIN_DIR, \"mongod\")\n DB_CLIENT_BIN_PATH = os.path.join(FIFTYONE_DB_BIN_DIR, \"mongo\")\n DB_LOG_PATH = os.path.join(FIFTYONE_CONFIG_DIR, \"var/log/mongodb/mongo.log\")\n-os.environ[\"PATH\"] = os.pathsep.join([FIFTYONE_CONFIG_DIR, os.environ[\"PATH\"]])\n START_DB = [\n DB_BIN_PATH,\n \"--dbpath\",\n", "issue": "fiftyone fails to import if not installed in a virtual environment\nDue to at least https://github.com/voxel51/fiftyone/blob/v0.1.3/fiftyone/constants.py#L32\n", "before_files": [{"content": "\"\"\"\nPackage-wide constants.\n\n| Copyright 2017-2020, Voxel51, Inc.\n| `voxel51.com <https://voxel51.com/>`_\n|\n\"\"\"\n# pragma pylint: disable=redefined-builtin\n# pragma pylint: disable=unused-wildcard-import\n# pragma pylint: disable=wildcard-import\nfrom __future__ import absolute_import\nfrom __future__ import division\nfrom __future__ import print_function\nfrom __future__ import unicode_literals\nfrom builtins import *\n\n# pragma pylint: enable=redefined-builtin\n# pragma pylint: enable=unused-wildcard-import\n# pragma pylint: enable=wildcard-import\n\nimport os\nimport sys\n\ntry:\n from importlib.metadata import metadata # Python 3.8\nexcept ImportError:\n from importlib_metadata import metadata # Python < 3.8\n\n\n# Directories\nFIFTYONE_DIR = os.path.abspath(os.path.dirname(__file__))\nFIFTYONE_ENV = os.environ[\"VIRTUAL_ENV\"]\nFIFTYONE_CONFIG_DIR = os.path.join(os.path.expanduser(\"~\"), \".fiftyone\")\nFIFTYONE_CONFIG_PATH = os.path.join(FIFTYONE_CONFIG_DIR, \"config.json\")\nBASE_DIR = os.path.dirname(FIFTYONE_DIR)\nEXAMPLES_DIR = os.path.join(FIFTYONE_DIR, \"examples\")\nif not os.path.isdir(EXAMPLES_DIR):\n EXAMPLES_DIR = os.path.join(BASE_DIR, \"examples\")\n\n# Package metadata\n_META = metadata(\"fiftyone\")\nNAME = _META[\"name\"]\nVERSION = _META[\"version\"]\nDESCRIPTION = _META[\"summary\"]\nAUTHOR = _META[\"author\"]\nAUTHOR_EMAIL = _META[\"author-email\"]\nURL = _META[\"home-page\"]\nLICENSE = _META[\"license\"]\nVERSION_LONG = \"%s v%s, %s\" % (NAME, VERSION, AUTHOR)\n\n# MongoDB setup\ntry:\n from fiftyone.db import FIFTYONE_DB_BIN_DIR\nexcept ImportError:\n # development installation\n FIFTYONE_DB_BIN_DIR = os.path.join(FIFTYONE_CONFIG_DIR, \"bin\")\nDB_PATH = os.path.join(FIFTYONE_CONFIG_DIR, \"var/lib/mongo\")\nDB_BIN_PATH = os.path.join(FIFTYONE_DB_BIN_DIR, \"mongod\")\nDB_CLIENT_BIN_PATH = os.path.join(FIFTYONE_DB_BIN_DIR, \"mongo\")\nDB_LOG_PATH = os.path.join(FIFTYONE_CONFIG_DIR, \"var/log/mongodb/mongo.log\")\nos.environ[\"PATH\"] = os.pathsep.join([FIFTYONE_CONFIG_DIR, os.environ[\"PATH\"]])\nSTART_DB = [\n DB_BIN_PATH,\n \"--dbpath\",\n DB_PATH,\n \"--logpath\",\n DB_LOG_PATH,\n \"--fork\",\n]\nSTOP_DB = \" \".join(\n [\n DB_CLIENT_BIN_PATH,\n \"--eval\",\n '''\"db.getSiblingDB('admin').shutdownServer()\"''',\n \">/dev/null 2>&1\",\n ]\n)\n\nif sys.platform.startswith(\"linux\"):\n _STOP_SERVICE = \"fuser -k %d/tcp >/dev/null 2>&1\"\n\nelif sys.platform == \"darwin\":\n _STOP_SERVICE = (\n \"lsof -i tcp:%d | grep -v PID | awk '{print $2}' | xargs kill\"\n )\n\nelse:\n raise OSError(\"Unsupported OS: %s\" % sys.platform)\n\n# Server setup\nSERVER_DIR = os.path.join(FIFTYONE_DIR, \"server\")\nSERVER_ADDR = \"http://127.0.0.1:%d\"\nSTART_SERVER = [\n \"gunicorn\",\n \"-w\",\n \"1\",\n \"--worker-class\",\n \"eventlet\",\n \"-b\",\n \"127.0.0.1:%d\",\n \"main:app\",\n \"--daemon\",\n \"--reload\",\n]\n\nSTOP_SERVER = _STOP_SERVICE\n\n# App setup\ntry:\n from fiftyone.gui import FIFTYONE_APP_DIR\nexcept ImportError:\n FIFTYONE_APP_DIR = os.path.join(FIFTYONE_DIR, \"../electron\")\n", "path": "fiftyone/constants.py"}]}
| 1,687 | 241 |
gh_patches_debug_11987
|
rasdani/github-patches
|
git_diff
|
benoitc__gunicorn-2879
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Wrong HTTP status code on Request Header Fields Too Large
When the request header gets too large (e.g. a lot of cookies), gunicorn returns HTTP 400 instead of HTTP 431, which can mask the real problem through proxies. Gunicorn should return the right HTTP error code.
</issue>
<code>
[start of gunicorn/workers/base.py]
1 # -*- coding: utf-8 -
2 #
3 # This file is part of gunicorn released under the MIT license.
4 # See the NOTICE for more information.
5
6 import io
7 import os
8 import signal
9 import sys
10 import time
11 import traceback
12 from datetime import datetime
13 from random import randint
14 from ssl import SSLError
15
16 from gunicorn import util
17 from gunicorn.http.errors import (
18 ForbiddenProxyRequest, InvalidHeader,
19 InvalidHeaderName, InvalidHTTPVersion,
20 InvalidProxyLine, InvalidRequestLine,
21 InvalidRequestMethod, InvalidSchemeHeaders,
22 LimitRequestHeaders, LimitRequestLine,
23 )
24 from gunicorn.http.wsgi import Response, default_environ
25 from gunicorn.reloader import reloader_engines
26 from gunicorn.workers.workertmp import WorkerTmp
27
28
29 class Worker(object):
30
31 SIGNALS = [getattr(signal, "SIG%s" % x) for x in (
32 "ABRT HUP QUIT INT TERM USR1 USR2 WINCH CHLD".split()
33 )]
34
35 PIPE = []
36
37 def __init__(self, age, ppid, sockets, app, timeout, cfg, log):
38 """\
39 This is called pre-fork so it shouldn't do anything to the
40 current process. If there's a need to make process wide
41 changes you'll want to do that in ``self.init_process()``.
42 """
43 self.age = age
44 self.pid = "[booting]"
45 self.ppid = ppid
46 self.sockets = sockets
47 self.app = app
48 self.timeout = timeout
49 self.cfg = cfg
50 self.booted = False
51 self.aborted = False
52 self.reloader = None
53
54 self.nr = 0
55
56 if cfg.max_requests > 0:
57 jitter = randint(0, cfg.max_requests_jitter)
58 self.max_requests = cfg.max_requests + jitter
59 else:
60 self.max_requests = sys.maxsize
61
62 self.alive = True
63 self.log = log
64 self.tmp = WorkerTmp(cfg)
65
66 def __str__(self):
67 return "<Worker %s>" % self.pid
68
69 def notify(self):
70 """\
71 Your worker subclass must arrange to have this method called
72 once every ``self.timeout`` seconds. If you fail in accomplishing
73 this task, the master process will murder your workers.
74 """
75 self.tmp.notify()
76
77 def run(self):
78 """\
79 This is the mainloop of a worker process. You should override
80 this method in a subclass to provide the intended behaviour
81 for your particular evil schemes.
82 """
83 raise NotImplementedError()
84
85 def init_process(self):
86 """\
87 If you override this method in a subclass, the last statement
88 in the function should be to call this method with
89 super().init_process() so that the ``run()`` loop is initiated.
90 """
91
92 # set environment' variables
93 if self.cfg.env:
94 for k, v in self.cfg.env.items():
95 os.environ[k] = v
96
97 util.set_owner_process(self.cfg.uid, self.cfg.gid,
98 initgroups=self.cfg.initgroups)
99
100 # Reseed the random number generator
101 util.seed()
102
103 # For waking ourselves up
104 self.PIPE = os.pipe()
105 for p in self.PIPE:
106 util.set_non_blocking(p)
107 util.close_on_exec(p)
108
109 # Prevent fd inheritance
110 for s in self.sockets:
111 util.close_on_exec(s)
112 util.close_on_exec(self.tmp.fileno())
113
114 self.wait_fds = self.sockets + [self.PIPE[0]]
115
116 self.log.close_on_exec()
117
118 self.init_signals()
119
120 # start the reloader
121 if self.cfg.reload:
122 def changed(fname):
123 self.log.info("Worker reloading: %s modified", fname)
124 self.alive = False
125 os.write(self.PIPE[1], b"1")
126 self.cfg.worker_int(self)
127 time.sleep(0.1)
128 sys.exit(0)
129
130 reloader_cls = reloader_engines[self.cfg.reload_engine]
131 self.reloader = reloader_cls(extra_files=self.cfg.reload_extra_files,
132 callback=changed)
133
134 self.load_wsgi()
135 if self.reloader:
136 self.reloader.start()
137
138 self.cfg.post_worker_init(self)
139
140 # Enter main run loop
141 self.booted = True
142 self.run()
143
144 def load_wsgi(self):
145 try:
146 self.wsgi = self.app.wsgi()
147 except SyntaxError as e:
148 if not self.cfg.reload:
149 raise
150
151 self.log.exception(e)
152
153 # fix from PR #1228
154 # storing the traceback into exc_tb will create a circular reference.
155 # per https://docs.python.org/2/library/sys.html#sys.exc_info warning,
156 # delete the traceback after use.
157 try:
158 _, exc_val, exc_tb = sys.exc_info()
159 self.reloader.add_extra_file(exc_val.filename)
160
161 tb_string = io.StringIO()
162 traceback.print_tb(exc_tb, file=tb_string)
163 self.wsgi = util.make_fail_app(tb_string.getvalue())
164 finally:
165 del exc_tb
166
167 def init_signals(self):
168 # reset signaling
169 for s in self.SIGNALS:
170 signal.signal(s, signal.SIG_DFL)
171 # init new signaling
172 signal.signal(signal.SIGQUIT, self.handle_quit)
173 signal.signal(signal.SIGTERM, self.handle_exit)
174 signal.signal(signal.SIGINT, self.handle_quit)
175 signal.signal(signal.SIGWINCH, self.handle_winch)
176 signal.signal(signal.SIGUSR1, self.handle_usr1)
177 signal.signal(signal.SIGABRT, self.handle_abort)
178
179 # Don't let SIGTERM and SIGUSR1 disturb active requests
180 # by interrupting system calls
181 signal.siginterrupt(signal.SIGTERM, False)
182 signal.siginterrupt(signal.SIGUSR1, False)
183
184 if hasattr(signal, 'set_wakeup_fd'):
185 signal.set_wakeup_fd(self.PIPE[1])
186
187 def handle_usr1(self, sig, frame):
188 self.log.reopen_files()
189
190 def handle_exit(self, sig, frame):
191 self.alive = False
192
193 def handle_quit(self, sig, frame):
194 self.alive = False
195 # worker_int callback
196 self.cfg.worker_int(self)
197 time.sleep(0.1)
198 sys.exit(0)
199
200 def handle_abort(self, sig, frame):
201 self.alive = False
202 self.cfg.worker_abort(self)
203 sys.exit(1)
204
205 def handle_error(self, req, client, addr, exc):
206 request_start = datetime.now()
207 addr = addr or ('', -1) # unix socket case
208 if isinstance(exc, (
209 InvalidRequestLine, InvalidRequestMethod,
210 InvalidHTTPVersion, InvalidHeader, InvalidHeaderName,
211 LimitRequestLine, LimitRequestHeaders,
212 InvalidProxyLine, ForbiddenProxyRequest,
213 InvalidSchemeHeaders,
214 SSLError,
215 )):
216
217 status_int = 400
218 reason = "Bad Request"
219
220 if isinstance(exc, InvalidRequestLine):
221 mesg = "Invalid Request Line '%s'" % str(exc)
222 elif isinstance(exc, InvalidRequestMethod):
223 mesg = "Invalid Method '%s'" % str(exc)
224 elif isinstance(exc, InvalidHTTPVersion):
225 mesg = "Invalid HTTP Version '%s'" % str(exc)
226 elif isinstance(exc, (InvalidHeaderName, InvalidHeader,)):
227 mesg = "%s" % str(exc)
228 if not req and hasattr(exc, "req"):
229 req = exc.req # for access log
230 elif isinstance(exc, LimitRequestLine):
231 mesg = "%s" % str(exc)
232 elif isinstance(exc, LimitRequestHeaders):
233 mesg = "Error parsing headers: '%s'" % str(exc)
234 elif isinstance(exc, InvalidProxyLine):
235 mesg = "'%s'" % str(exc)
236 elif isinstance(exc, ForbiddenProxyRequest):
237 reason = "Forbidden"
238 mesg = "Request forbidden"
239 status_int = 403
240 elif isinstance(exc, InvalidSchemeHeaders):
241 mesg = "%s" % str(exc)
242 elif isinstance(exc, SSLError):
243 reason = "Forbidden"
244 mesg = "'%s'" % str(exc)
245 status_int = 403
246
247 msg = "Invalid request from ip={ip}: {error}"
248 self.log.debug(msg.format(ip=addr[0], error=str(exc)))
249 else:
250 if hasattr(req, "uri"):
251 self.log.exception("Error handling request %s", req.uri)
252 status_int = 500
253 reason = "Internal Server Error"
254 mesg = ""
255
256 if req is not None:
257 request_time = datetime.now() - request_start
258 environ = default_environ(req, client, self.cfg)
259 environ['REMOTE_ADDR'] = addr[0]
260 environ['REMOTE_PORT'] = str(addr[1])
261 resp = Response(req, client, self.cfg)
262 resp.status = "%s %s" % (status_int, reason)
263 resp.response_length = len(mesg)
264 self.log.access(resp, req, environ, request_time)
265
266 try:
267 util.write_error(client, status_int, reason, mesg)
268 except Exception:
269 self.log.debug("Failed to send error message.")
270
271 def handle_winch(self, sig, fname):
272 # Ignore SIGWINCH in worker. Fixes a crash on OpenBSD.
273 self.log.debug("worker: SIGWINCH ignored.")
274
[end of gunicorn/workers/base.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/gunicorn/workers/base.py b/gunicorn/workers/base.py
--- a/gunicorn/workers/base.py
+++ b/gunicorn/workers/base.py
@@ -230,7 +230,9 @@
elif isinstance(exc, LimitRequestLine):
mesg = "%s" % str(exc)
elif isinstance(exc, LimitRequestHeaders):
+ reason = "Request Header Fields Too Large"
mesg = "Error parsing headers: '%s'" % str(exc)
+ status_int = 431
elif isinstance(exc, InvalidProxyLine):
mesg = "'%s'" % str(exc)
elif isinstance(exc, ForbiddenProxyRequest):
|
{"golden_diff": "diff --git a/gunicorn/workers/base.py b/gunicorn/workers/base.py\n--- a/gunicorn/workers/base.py\n+++ b/gunicorn/workers/base.py\n@@ -230,7 +230,9 @@\n elif isinstance(exc, LimitRequestLine):\n mesg = \"%s\" % str(exc)\n elif isinstance(exc, LimitRequestHeaders):\n+ reason = \"Request Header Fields Too Large\"\n mesg = \"Error parsing headers: '%s'\" % str(exc)\n+ status_int = 431\n elif isinstance(exc, InvalidProxyLine):\n mesg = \"'%s'\" % str(exc)\n elif isinstance(exc, ForbiddenProxyRequest):\n", "issue": "Wrong HTTP status code on Request Header Fields Too Large\nWhen the request header gets too large (e.g. a lot of cookies), gunicorn returns HTTP 400 instead of HTTP 431, which can mask the real problem through proxies. Gunicorn should return the right HTTP error code.\n", "before_files": [{"content": "# -*- coding: utf-8 -\n#\n# This file is part of gunicorn released under the MIT license.\n# See the NOTICE for more information.\n\nimport io\nimport os\nimport signal\nimport sys\nimport time\nimport traceback\nfrom datetime import datetime\nfrom random import randint\nfrom ssl import SSLError\n\nfrom gunicorn import util\nfrom gunicorn.http.errors import (\n ForbiddenProxyRequest, InvalidHeader,\n InvalidHeaderName, InvalidHTTPVersion,\n InvalidProxyLine, InvalidRequestLine,\n InvalidRequestMethod, InvalidSchemeHeaders,\n LimitRequestHeaders, LimitRequestLine,\n)\nfrom gunicorn.http.wsgi import Response, default_environ\nfrom gunicorn.reloader import reloader_engines\nfrom gunicorn.workers.workertmp import WorkerTmp\n\n\nclass Worker(object):\n\n SIGNALS = [getattr(signal, \"SIG%s\" % x) for x in (\n \"ABRT HUP QUIT INT TERM USR1 USR2 WINCH CHLD\".split()\n )]\n\n PIPE = []\n\n def __init__(self, age, ppid, sockets, app, timeout, cfg, log):\n \"\"\"\\\n This is called pre-fork so it shouldn't do anything to the\n current process. If there's a need to make process wide\n changes you'll want to do that in ``self.init_process()``.\n \"\"\"\n self.age = age\n self.pid = \"[booting]\"\n self.ppid = ppid\n self.sockets = sockets\n self.app = app\n self.timeout = timeout\n self.cfg = cfg\n self.booted = False\n self.aborted = False\n self.reloader = None\n\n self.nr = 0\n\n if cfg.max_requests > 0:\n jitter = randint(0, cfg.max_requests_jitter)\n self.max_requests = cfg.max_requests + jitter\n else:\n self.max_requests = sys.maxsize\n\n self.alive = True\n self.log = log\n self.tmp = WorkerTmp(cfg)\n\n def __str__(self):\n return \"<Worker %s>\" % self.pid\n\n def notify(self):\n \"\"\"\\\n Your worker subclass must arrange to have this method called\n once every ``self.timeout`` seconds. If you fail in accomplishing\n this task, the master process will murder your workers.\n \"\"\"\n self.tmp.notify()\n\n def run(self):\n \"\"\"\\\n This is the mainloop of a worker process. You should override\n this method in a subclass to provide the intended behaviour\n for your particular evil schemes.\n \"\"\"\n raise NotImplementedError()\n\n def init_process(self):\n \"\"\"\\\n If you override this method in a subclass, the last statement\n in the function should be to call this method with\n super().init_process() so that the ``run()`` loop is initiated.\n \"\"\"\n\n # set environment' variables\n if self.cfg.env:\n for k, v in self.cfg.env.items():\n os.environ[k] = v\n\n util.set_owner_process(self.cfg.uid, self.cfg.gid,\n initgroups=self.cfg.initgroups)\n\n # Reseed the random number generator\n util.seed()\n\n # For waking ourselves up\n self.PIPE = os.pipe()\n for p in self.PIPE:\n util.set_non_blocking(p)\n util.close_on_exec(p)\n\n # Prevent fd inheritance\n for s in self.sockets:\n util.close_on_exec(s)\n util.close_on_exec(self.tmp.fileno())\n\n self.wait_fds = self.sockets + [self.PIPE[0]]\n\n self.log.close_on_exec()\n\n self.init_signals()\n\n # start the reloader\n if self.cfg.reload:\n def changed(fname):\n self.log.info(\"Worker reloading: %s modified\", fname)\n self.alive = False\n os.write(self.PIPE[1], b\"1\")\n self.cfg.worker_int(self)\n time.sleep(0.1)\n sys.exit(0)\n\n reloader_cls = reloader_engines[self.cfg.reload_engine]\n self.reloader = reloader_cls(extra_files=self.cfg.reload_extra_files,\n callback=changed)\n\n self.load_wsgi()\n if self.reloader:\n self.reloader.start()\n\n self.cfg.post_worker_init(self)\n\n # Enter main run loop\n self.booted = True\n self.run()\n\n def load_wsgi(self):\n try:\n self.wsgi = self.app.wsgi()\n except SyntaxError as e:\n if not self.cfg.reload:\n raise\n\n self.log.exception(e)\n\n # fix from PR #1228\n # storing the traceback into exc_tb will create a circular reference.\n # per https://docs.python.org/2/library/sys.html#sys.exc_info warning,\n # delete the traceback after use.\n try:\n _, exc_val, exc_tb = sys.exc_info()\n self.reloader.add_extra_file(exc_val.filename)\n\n tb_string = io.StringIO()\n traceback.print_tb(exc_tb, file=tb_string)\n self.wsgi = util.make_fail_app(tb_string.getvalue())\n finally:\n del exc_tb\n\n def init_signals(self):\n # reset signaling\n for s in self.SIGNALS:\n signal.signal(s, signal.SIG_DFL)\n # init new signaling\n signal.signal(signal.SIGQUIT, self.handle_quit)\n signal.signal(signal.SIGTERM, self.handle_exit)\n signal.signal(signal.SIGINT, self.handle_quit)\n signal.signal(signal.SIGWINCH, self.handle_winch)\n signal.signal(signal.SIGUSR1, self.handle_usr1)\n signal.signal(signal.SIGABRT, self.handle_abort)\n\n # Don't let SIGTERM and SIGUSR1 disturb active requests\n # by interrupting system calls\n signal.siginterrupt(signal.SIGTERM, False)\n signal.siginterrupt(signal.SIGUSR1, False)\n\n if hasattr(signal, 'set_wakeup_fd'):\n signal.set_wakeup_fd(self.PIPE[1])\n\n def handle_usr1(self, sig, frame):\n self.log.reopen_files()\n\n def handle_exit(self, sig, frame):\n self.alive = False\n\n def handle_quit(self, sig, frame):\n self.alive = False\n # worker_int callback\n self.cfg.worker_int(self)\n time.sleep(0.1)\n sys.exit(0)\n\n def handle_abort(self, sig, frame):\n self.alive = False\n self.cfg.worker_abort(self)\n sys.exit(1)\n\n def handle_error(self, req, client, addr, exc):\n request_start = datetime.now()\n addr = addr or ('', -1) # unix socket case\n if isinstance(exc, (\n InvalidRequestLine, InvalidRequestMethod,\n InvalidHTTPVersion, InvalidHeader, InvalidHeaderName,\n LimitRequestLine, LimitRequestHeaders,\n InvalidProxyLine, ForbiddenProxyRequest,\n InvalidSchemeHeaders,\n SSLError,\n )):\n\n status_int = 400\n reason = \"Bad Request\"\n\n if isinstance(exc, InvalidRequestLine):\n mesg = \"Invalid Request Line '%s'\" % str(exc)\n elif isinstance(exc, InvalidRequestMethod):\n mesg = \"Invalid Method '%s'\" % str(exc)\n elif isinstance(exc, InvalidHTTPVersion):\n mesg = \"Invalid HTTP Version '%s'\" % str(exc)\n elif isinstance(exc, (InvalidHeaderName, InvalidHeader,)):\n mesg = \"%s\" % str(exc)\n if not req and hasattr(exc, \"req\"):\n req = exc.req # for access log\n elif isinstance(exc, LimitRequestLine):\n mesg = \"%s\" % str(exc)\n elif isinstance(exc, LimitRequestHeaders):\n mesg = \"Error parsing headers: '%s'\" % str(exc)\n elif isinstance(exc, InvalidProxyLine):\n mesg = \"'%s'\" % str(exc)\n elif isinstance(exc, ForbiddenProxyRequest):\n reason = \"Forbidden\"\n mesg = \"Request forbidden\"\n status_int = 403\n elif isinstance(exc, InvalidSchemeHeaders):\n mesg = \"%s\" % str(exc)\n elif isinstance(exc, SSLError):\n reason = \"Forbidden\"\n mesg = \"'%s'\" % str(exc)\n status_int = 403\n\n msg = \"Invalid request from ip={ip}: {error}\"\n self.log.debug(msg.format(ip=addr[0], error=str(exc)))\n else:\n if hasattr(req, \"uri\"):\n self.log.exception(\"Error handling request %s\", req.uri)\n status_int = 500\n reason = \"Internal Server Error\"\n mesg = \"\"\n\n if req is not None:\n request_time = datetime.now() - request_start\n environ = default_environ(req, client, self.cfg)\n environ['REMOTE_ADDR'] = addr[0]\n environ['REMOTE_PORT'] = str(addr[1])\n resp = Response(req, client, self.cfg)\n resp.status = \"%s %s\" % (status_int, reason)\n resp.response_length = len(mesg)\n self.log.access(resp, req, environ, request_time)\n\n try:\n util.write_error(client, status_int, reason, mesg)\n except Exception:\n self.log.debug(\"Failed to send error message.\")\n\n def handle_winch(self, sig, fname):\n # Ignore SIGWINCH in worker. Fixes a crash on OpenBSD.\n self.log.debug(\"worker: SIGWINCH ignored.\")\n", "path": "gunicorn/workers/base.py"}]}
| 3,343 | 146 |
gh_patches_debug_14988
|
rasdani/github-patches
|
git_diff
|
saleor__saleor-13683
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Filter warehouses by metadata
There are stores that have hundreds of warehouses, for performing updates metadata can be useful as a lookup mechanism instead of using externalReference
</issue>
<code>
[start of saleor/graphql/warehouse/filters.py]
1 import django_filters
2 import graphene
3 from django.db.models import Exists, OuterRef, Q
4
5 from ...account.models import Address
6 from ...product.models import Product, ProductVariant
7 from ...warehouse import WarehouseClickAndCollectOption
8 from ...warehouse.models import Stock, Warehouse
9 from ..channel.types import Channel
10 from ..core.doc_category import DOC_CATEGORY_PRODUCTS
11 from ..core.filters import (
12 EnumFilter,
13 GlobalIDMultipleChoiceFilter,
14 ListObjectTypeFilter,
15 filter_slug_list,
16 )
17 from ..core.types import FilterInputObjectType
18 from ..utils import resolve_global_ids_to_primary_keys
19 from ..warehouse.enums import WarehouseClickAndCollectOptionEnum
20
21
22 def prefech_qs_for_filter(qs):
23 return qs.prefetch_related("address")
24
25
26 def filter_search_warehouse(qs, _, value):
27 if value:
28 addresses = Address.objects.filter(
29 Q(company_name__ilike=value)
30 | Q(street_address_1__ilike=value)
31 | Q(street_address_2__ilike=value)
32 | Q(city__ilike=value)
33 | Q(postal_code__ilike=value)
34 | Q(phone__ilike=value)
35 ).values("pk")
36 qs = qs.filter(
37 Q(name__ilike=value)
38 | Q(email__ilike=value)
39 | Q(Exists(addresses.filter(pk=OuterRef("address_id"))))
40 )
41 return qs
42
43
44 def filter_click_and_collect_option(qs, _, value):
45 if value == WarehouseClickAndCollectOptionEnum.LOCAL.value:
46 qs = qs.filter(
47 click_and_collect_option=WarehouseClickAndCollectOption.LOCAL_STOCK
48 )
49 elif value == WarehouseClickAndCollectOptionEnum.ALL.value:
50 qs = qs.filter(
51 click_and_collect_option=WarehouseClickAndCollectOption.ALL_WAREHOUSES
52 )
53 elif value == WarehouseClickAndCollectOptionEnum.DISABLED.value:
54 qs = qs.filter(click_and_collect_option=WarehouseClickAndCollectOption.DISABLED)
55 return qs
56
57
58 def filter_channels(qs, _, values):
59 if values:
60 _, channels_ids = resolve_global_ids_to_primary_keys(values, Channel)
61 WarehouseChannel = Warehouse.channels.through
62 warehouse_channels = WarehouseChannel.objects.filter(
63 channel_id__in=channels_ids
64 )
65 qs = qs.filter(Exists(warehouse_channels.filter(warehouse_id=OuterRef("id"))))
66 return qs
67
68
69 def filter_search_stock(qs, _, value):
70 if value:
71 products = Product.objects.filter(name__ilike=value).values("pk")
72 variants = ProductVariant.objects.filter(
73 Q(name__ilike=value) | Q(Exists(products.filter(pk=OuterRef("product_id"))))
74 ).values("pk")
75 addresses = Address.objects.filter(company_name__ilike=value)
76 warehouses = Warehouse.objects.filter(
77 Q(name__ilike=value)
78 | Q(Exists(addresses.filter(id=OuterRef("address_id"))))
79 ).values("pk")
80 return qs.filter(
81 Q(Exists(variants.filter(pk=OuterRef("product_variant_id"))))
82 | Q(Exists(warehouses.filter(stock=OuterRef("pk"))))
83 )
84 return qs
85
86
87 class WarehouseFilter(django_filters.FilterSet):
88 search = django_filters.CharFilter(method=filter_search_warehouse)
89 ids = GlobalIDMultipleChoiceFilter(field_name="id")
90 is_private = django_filters.BooleanFilter(field_name="is_private")
91 click_and_collect_option = EnumFilter(
92 input_class=WarehouseClickAndCollectOptionEnum,
93 method=filter_click_and_collect_option,
94 )
95 channels = GlobalIDMultipleChoiceFilter(method=filter_channels)
96 slugs = ListObjectTypeFilter(input_class=graphene.String, method=filter_slug_list)
97
98 class Meta:
99 model = Warehouse
100 fields = ["click_and_collect_option"]
101
102
103 class WarehouseFilterInput(FilterInputObjectType):
104 class Meta:
105 doc_category = DOC_CATEGORY_PRODUCTS
106 filterset_class = WarehouseFilter
107
108
109 class StockFilter(django_filters.FilterSet):
110 search = django_filters.CharFilter(method=filter_search_stock)
111
112 class Meta:
113 model = Stock
114 fields = ["quantity"]
115
116
117 class StockFilterInput(FilterInputObjectType):
118 class Meta:
119 doc_category = DOC_CATEGORY_PRODUCTS
120 filterset_class = StockFilter
121
[end of saleor/graphql/warehouse/filters.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/saleor/graphql/warehouse/filters.py b/saleor/graphql/warehouse/filters.py
--- a/saleor/graphql/warehouse/filters.py
+++ b/saleor/graphql/warehouse/filters.py
@@ -12,6 +12,7 @@
EnumFilter,
GlobalIDMultipleChoiceFilter,
ListObjectTypeFilter,
+ MetadataFilterBase,
filter_slug_list,
)
from ..core.types import FilterInputObjectType
@@ -84,7 +85,7 @@
return qs
-class WarehouseFilter(django_filters.FilterSet):
+class WarehouseFilter(MetadataFilterBase):
search = django_filters.CharFilter(method=filter_search_warehouse)
ids = GlobalIDMultipleChoiceFilter(field_name="id")
is_private = django_filters.BooleanFilter(field_name="is_private")
|
{"golden_diff": "diff --git a/saleor/graphql/warehouse/filters.py b/saleor/graphql/warehouse/filters.py\n--- a/saleor/graphql/warehouse/filters.py\n+++ b/saleor/graphql/warehouse/filters.py\n@@ -12,6 +12,7 @@\n EnumFilter,\n GlobalIDMultipleChoiceFilter,\n ListObjectTypeFilter,\n+ MetadataFilterBase,\n filter_slug_list,\n )\n from ..core.types import FilterInputObjectType\n@@ -84,7 +85,7 @@\n return qs\n \n \n-class WarehouseFilter(django_filters.FilterSet):\n+class WarehouseFilter(MetadataFilterBase):\n search = django_filters.CharFilter(method=filter_search_warehouse)\n ids = GlobalIDMultipleChoiceFilter(field_name=\"id\")\n is_private = django_filters.BooleanFilter(field_name=\"is_private\")\n", "issue": "Filter warehouses by metadata\nThere are stores that have hundreds of warehouses, for performing updates metadata can be useful as a lookup mechanism instead of using externalReference\n", "before_files": [{"content": "import django_filters\nimport graphene\nfrom django.db.models import Exists, OuterRef, Q\n\nfrom ...account.models import Address\nfrom ...product.models import Product, ProductVariant\nfrom ...warehouse import WarehouseClickAndCollectOption\nfrom ...warehouse.models import Stock, Warehouse\nfrom ..channel.types import Channel\nfrom ..core.doc_category import DOC_CATEGORY_PRODUCTS\nfrom ..core.filters import (\n EnumFilter,\n GlobalIDMultipleChoiceFilter,\n ListObjectTypeFilter,\n filter_slug_list,\n)\nfrom ..core.types import FilterInputObjectType\nfrom ..utils import resolve_global_ids_to_primary_keys\nfrom ..warehouse.enums import WarehouseClickAndCollectOptionEnum\n\n\ndef prefech_qs_for_filter(qs):\n return qs.prefetch_related(\"address\")\n\n\ndef filter_search_warehouse(qs, _, value):\n if value:\n addresses = Address.objects.filter(\n Q(company_name__ilike=value)\n | Q(street_address_1__ilike=value)\n | Q(street_address_2__ilike=value)\n | Q(city__ilike=value)\n | Q(postal_code__ilike=value)\n | Q(phone__ilike=value)\n ).values(\"pk\")\n qs = qs.filter(\n Q(name__ilike=value)\n | Q(email__ilike=value)\n | Q(Exists(addresses.filter(pk=OuterRef(\"address_id\"))))\n )\n return qs\n\n\ndef filter_click_and_collect_option(qs, _, value):\n if value == WarehouseClickAndCollectOptionEnum.LOCAL.value:\n qs = qs.filter(\n click_and_collect_option=WarehouseClickAndCollectOption.LOCAL_STOCK\n )\n elif value == WarehouseClickAndCollectOptionEnum.ALL.value:\n qs = qs.filter(\n click_and_collect_option=WarehouseClickAndCollectOption.ALL_WAREHOUSES\n )\n elif value == WarehouseClickAndCollectOptionEnum.DISABLED.value:\n qs = qs.filter(click_and_collect_option=WarehouseClickAndCollectOption.DISABLED)\n return qs\n\n\ndef filter_channels(qs, _, values):\n if values:\n _, channels_ids = resolve_global_ids_to_primary_keys(values, Channel)\n WarehouseChannel = Warehouse.channels.through\n warehouse_channels = WarehouseChannel.objects.filter(\n channel_id__in=channels_ids\n )\n qs = qs.filter(Exists(warehouse_channels.filter(warehouse_id=OuterRef(\"id\"))))\n return qs\n\n\ndef filter_search_stock(qs, _, value):\n if value:\n products = Product.objects.filter(name__ilike=value).values(\"pk\")\n variants = ProductVariant.objects.filter(\n Q(name__ilike=value) | Q(Exists(products.filter(pk=OuterRef(\"product_id\"))))\n ).values(\"pk\")\n addresses = Address.objects.filter(company_name__ilike=value)\n warehouses = Warehouse.objects.filter(\n Q(name__ilike=value)\n | Q(Exists(addresses.filter(id=OuterRef(\"address_id\"))))\n ).values(\"pk\")\n return qs.filter(\n Q(Exists(variants.filter(pk=OuterRef(\"product_variant_id\"))))\n | Q(Exists(warehouses.filter(stock=OuterRef(\"pk\"))))\n )\n return qs\n\n\nclass WarehouseFilter(django_filters.FilterSet):\n search = django_filters.CharFilter(method=filter_search_warehouse)\n ids = GlobalIDMultipleChoiceFilter(field_name=\"id\")\n is_private = django_filters.BooleanFilter(field_name=\"is_private\")\n click_and_collect_option = EnumFilter(\n input_class=WarehouseClickAndCollectOptionEnum,\n method=filter_click_and_collect_option,\n )\n channels = GlobalIDMultipleChoiceFilter(method=filter_channels)\n slugs = ListObjectTypeFilter(input_class=graphene.String, method=filter_slug_list)\n\n class Meta:\n model = Warehouse\n fields = [\"click_and_collect_option\"]\n\n\nclass WarehouseFilterInput(FilterInputObjectType):\n class Meta:\n doc_category = DOC_CATEGORY_PRODUCTS\n filterset_class = WarehouseFilter\n\n\nclass StockFilter(django_filters.FilterSet):\n search = django_filters.CharFilter(method=filter_search_stock)\n\n class Meta:\n model = Stock\n fields = [\"quantity\"]\n\n\nclass StockFilterInput(FilterInputObjectType):\n class Meta:\n doc_category = DOC_CATEGORY_PRODUCTS\n filterset_class = StockFilter\n", "path": "saleor/graphql/warehouse/filters.py"}]}
| 1,726 | 173 |
gh_patches_debug_27415
|
rasdani/github-patches
|
git_diff
|
ethereum__web3.py-2713
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Async request session caching incompatible with Flask
Flask is not natively async, so it creates a new thread loop for every async request.
When async web3py does an aiohttp call, it caches the session. So the next time you make a request it pulls the stale session out of the cache and throws an "Event loop is closed" exception.
To fix the issue we made the following code changes in request.py as a hack.
```
async def get_async_session(endpoint_uri: URI) -> ClientSession:
cache_key = generate_cache_key(endpoint_uri)
########### TEMP CODE ###########
if True:# cache_key not in _async_session_cache: # no caching for you!
########### TEMP CODE ###########
await cache_async_session(endpoint_uri, ClientSession(raise_for_status=True))
return _async_session_cache.get_cache_entry(cache_key)
async def async_get_response_from_get_request(
endpoint_uri: URI, *args: Any, **kwargs: Any
) -> ClientResponse:
kwargs.setdefault("timeout", ClientTimeout(10))
session = await get_async_session(endpoint_uri)
response = await session.get(endpoint_uri, *args, **kwargs)
########### TEMP CODE ###########
await session.close()
########### TEMP CODE ###########
return response
async def async_get_response_from_post_request(
endpoint_uri: URI, *args: Any, **kwargs: Any
) -> ClientResponse:
kwargs.setdefault("timeout", ClientTimeout(10))
session = await get_async_session(endpoint_uri)
response = await session.post(endpoint_uri, *args, **kwargs)
########### TEMP CODE ###########
await session.close()
########### TEMP CODE ###########
return response
```
Would be nice to have a setting to disable session caching.
---
**Note:** We prefer to use issues to track our work. If you think you've encountered a bug in web3py or
have a feature request, you're in the right place. If you have implementation or usage questions,
please refer to our [documentation](https://web3py.readthedocs.io/en/latest/) and/or join the conversation
on [discord](https://discord.gg/GHryRvPB84).
</issue>
<code>
[start of web3/_utils/request.py]
1 import asyncio
2 from concurrent.futures import (
3 ThreadPoolExecutor,
4 )
5 import logging
6 import os
7 import threading
8 from typing import (
9 Any,
10 Dict,
11 List,
12 Optional,
13 Union,
14 )
15
16 from aiohttp import (
17 ClientResponse,
18 ClientSession,
19 ClientTimeout,
20 )
21 from eth_typing import (
22 URI,
23 )
24 import requests
25
26 from web3._utils.async_caching import (
27 async_lock,
28 )
29 from web3._utils.caching import (
30 generate_cache_key,
31 )
32 from web3.utils.caching import (
33 SimpleCache,
34 )
35
36 logger = logging.getLogger(__name__)
37
38 DEFAULT_TIMEOUT = 10
39
40
41 def get_default_http_endpoint() -> URI:
42 return URI(os.environ.get("WEB3_HTTP_PROVIDER_URI", "http://localhost:8545"))
43
44
45 _session_cache = SimpleCache()
46 _session_cache_lock = threading.Lock()
47
48
49 def cache_and_return_session(
50 endpoint_uri: URI, session: requests.Session = None
51 ) -> requests.Session:
52 # cache key should have a unique thread identifier
53 cache_key = generate_cache_key(f"{threading.get_ident()}:{endpoint_uri}")
54
55 evicted_items = None
56 with _session_cache_lock:
57 if cache_key not in _session_cache:
58 if session is None:
59 session = requests.Session()
60
61 evicted_items = _session_cache.cache(cache_key, session)
62 logger.debug(f"Session cached: {endpoint_uri}, {session}")
63
64 cached_session = _session_cache.get_cache_entry(cache_key)
65
66 if evicted_items is not None:
67 evicted_sessions = evicted_items.values()
68 for evicted_session in evicted_sessions:
69 logger.debug(
70 f"Session cache full. Session evicted from cache: {evicted_session}",
71 )
72 threading.Timer(
73 DEFAULT_TIMEOUT + 0.1,
74 _close_evicted_sessions,
75 args=[evicted_sessions],
76 ).start()
77
78 return cached_session
79
80
81 def get_response_from_get_request(
82 endpoint_uri: URI, *args: Any, **kwargs: Any
83 ) -> requests.Response:
84 kwargs.setdefault("timeout", DEFAULT_TIMEOUT)
85 session = cache_and_return_session(endpoint_uri)
86 response = session.get(endpoint_uri, *args, **kwargs)
87 return response
88
89
90 def json_make_get_request(
91 endpoint_uri: URI, *args: Any, **kwargs: Any
92 ) -> Dict[str, Any]:
93 response = get_response_from_get_request(endpoint_uri, *args, **kwargs)
94 response.raise_for_status()
95 return response.json()
96
97
98 def get_response_from_post_request(
99 endpoint_uri: URI, *args: Any, **kwargs: Any
100 ) -> requests.Response:
101 kwargs.setdefault("timeout", DEFAULT_TIMEOUT)
102 session = cache_and_return_session(endpoint_uri)
103 response = session.post(endpoint_uri, *args, **kwargs)
104 return response
105
106
107 def make_post_request(
108 endpoint_uri: URI, data: Union[bytes, Dict[str, Any]], *args: Any, **kwargs: Any
109 ) -> bytes:
110 response = get_response_from_post_request(endpoint_uri, data=data, *args, **kwargs)
111 response.raise_for_status()
112 return response.content
113
114
115 def _close_evicted_sessions(evicted_sessions: List[requests.Session]) -> None:
116 for evicted_session in evicted_sessions:
117 evicted_session.close()
118 logger.debug(f"Closed evicted session: {evicted_session}")
119
120
121 # --- async --- #
122
123
124 _async_session_cache = SimpleCache()
125 _async_session_cache_lock = threading.Lock()
126 _async_session_pool = ThreadPoolExecutor(max_workers=1)
127
128
129 async def cache_and_return_async_session(
130 endpoint_uri: URI,
131 session: Optional[ClientSession] = None,
132 ) -> ClientSession:
133 # cache key should have a unique thread identifier
134 cache_key = generate_cache_key(f"{threading.get_ident()}:{endpoint_uri}")
135
136 evicted_items = None
137 async with async_lock(_async_session_pool, _async_session_cache_lock):
138 if cache_key not in _async_session_cache:
139 if session is None:
140 session = ClientSession(raise_for_status=True)
141
142 evicted_items = _async_session_cache.cache(cache_key, session)
143 logger.debug(f"Async session cached: {endpoint_uri}, {session}")
144
145 cached_session = _async_session_cache.get_cache_entry(cache_key)
146
147 if evicted_items is not None:
148 # At this point the evicted sessions are already popped out of the cache and
149 # just stored in the `evicted_sessions` dict. So we can kick off a future task
150 # to close them and it should be safe to pop out of the lock here.
151 evicted_sessions = evicted_items.values()
152 for evicted_session in evicted_sessions:
153 logger.debug(
154 "Async session cache full. Session evicted from cache: "
155 f"{evicted_session}",
156 )
157 # Kick off a future task, in a separate thread, to close the evicted
158 # sessions. In the case that the cache filled very quickly and some
159 # sessions have been evicted before their original request has been made,
160 # we set the timer to a bit more than the `DEFAULT_TIMEOUT` for a call. This
161 # should make it so that any call from an evicted session can still be made
162 # before the session is closed.
163 threading.Timer(
164 DEFAULT_TIMEOUT + 0.1,
165 _async_close_evicted_sessions,
166 args=[evicted_sessions],
167 ).start()
168
169 return cached_session
170
171
172 async def async_get_response_from_get_request(
173 endpoint_uri: URI, *args: Any, **kwargs: Any
174 ) -> ClientResponse:
175 kwargs.setdefault("timeout", ClientTimeout(DEFAULT_TIMEOUT))
176 session = await cache_and_return_async_session(endpoint_uri)
177 response = await session.get(endpoint_uri, *args, **kwargs)
178 return response
179
180
181 async def async_json_make_get_request(
182 endpoint_uri: URI, *args: Any, **kwargs: Any
183 ) -> Dict[str, Any]:
184 response = await async_get_response_from_get_request(endpoint_uri, *args, **kwargs)
185 response.raise_for_status()
186 return await response.json()
187
188
189 async def async_get_response_from_post_request(
190 endpoint_uri: URI, *args: Any, **kwargs: Any
191 ) -> ClientResponse:
192 kwargs.setdefault("timeout", ClientTimeout(DEFAULT_TIMEOUT))
193 session = await cache_and_return_async_session(endpoint_uri)
194 response = await session.post(endpoint_uri, *args, **kwargs)
195 return response
196
197
198 async def async_make_post_request(
199 endpoint_uri: URI, data: Union[bytes, Dict[str, Any]], *args: Any, **kwargs: Any
200 ) -> bytes:
201 response = await async_get_response_from_post_request(
202 endpoint_uri, data=data, *args, **kwargs
203 )
204 response.raise_for_status()
205 return await response.read()
206
207
208 async def async_get_json_from_client_response(
209 response: ClientResponse,
210 ) -> Dict[str, Any]:
211 return await response.json()
212
213
214 def _async_close_evicted_sessions(evicted_sessions: List[ClientSession]) -> None:
215 loop = asyncio.new_event_loop()
216
217 for evicted_session in evicted_sessions:
218 loop.run_until_complete(evicted_session.close())
219 logger.debug(f"Closed evicted async session: {evicted_session}")
220
221 if any(not evicted_session.closed for evicted_session in evicted_sessions):
222 logger.warning(
223 f"Some evicted async sessions were not properly closed: {evicted_sessions}"
224 )
225 loop.close()
226
[end of web3/_utils/request.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/web3/_utils/request.py b/web3/_utils/request.py
--- a/web3/_utils/request.py
+++ b/web3/_utils/request.py
@@ -142,6 +142,39 @@
evicted_items = _async_session_cache.cache(cache_key, session)
logger.debug(f"Async session cached: {endpoint_uri}, {session}")
+ else:
+ # get the cached session
+ cached_session = _async_session_cache.get_cache_entry(cache_key)
+ session_is_closed = cached_session.closed
+ session_loop_is_closed = cached_session._loop.is_closed()
+
+ warning = (
+ "Async session was closed"
+ if session_is_closed
+ else "Loop was closed for async session"
+ if session_loop_is_closed
+ else None
+ )
+ if warning:
+ logger.debug(
+ f"{warning}: {endpoint_uri}, {cached_session}. "
+ f"Creating and caching a new async session for uri."
+ )
+
+ _async_session_cache._data.pop(cache_key)
+ if not session_is_closed:
+ # if loop was closed but not the session, close the session
+ await cached_session.close()
+ logger.debug(
+ f"Async session closed and evicted from cache: {cached_session}"
+ )
+
+ # replace stale session with a new session at the cache key
+ _session = ClientSession(raise_for_status=True)
+ evicted_items = _async_session_cache.cache(cache_key, _session)
+ logger.debug(f"Async session cached: {endpoint_uri}, {_session}")
+
+ # get the cached session
cached_session = _async_session_cache.get_cache_entry(cache_key)
if evicted_items is not None:
|
{"golden_diff": "diff --git a/web3/_utils/request.py b/web3/_utils/request.py\n--- a/web3/_utils/request.py\n+++ b/web3/_utils/request.py\n@@ -142,6 +142,39 @@\n evicted_items = _async_session_cache.cache(cache_key, session)\n logger.debug(f\"Async session cached: {endpoint_uri}, {session}\")\n \n+ else:\n+ # get the cached session\n+ cached_session = _async_session_cache.get_cache_entry(cache_key)\n+ session_is_closed = cached_session.closed\n+ session_loop_is_closed = cached_session._loop.is_closed()\n+\n+ warning = (\n+ \"Async session was closed\"\n+ if session_is_closed\n+ else \"Loop was closed for async session\"\n+ if session_loop_is_closed\n+ else None\n+ )\n+ if warning:\n+ logger.debug(\n+ f\"{warning}: {endpoint_uri}, {cached_session}. \"\n+ f\"Creating and caching a new async session for uri.\"\n+ )\n+\n+ _async_session_cache._data.pop(cache_key)\n+ if not session_is_closed:\n+ # if loop was closed but not the session, close the session\n+ await cached_session.close()\n+ logger.debug(\n+ f\"Async session closed and evicted from cache: {cached_session}\"\n+ )\n+\n+ # replace stale session with a new session at the cache key\n+ _session = ClientSession(raise_for_status=True)\n+ evicted_items = _async_session_cache.cache(cache_key, _session)\n+ logger.debug(f\"Async session cached: {endpoint_uri}, {_session}\")\n+\n+ # get the cached session\n cached_session = _async_session_cache.get_cache_entry(cache_key)\n \n if evicted_items is not None:\n", "issue": "Async request session caching incompatible with Flask\nFlask is not natively async, so it creates a new thread loop for every async request.\r\n\r\nWhen async web3py does an aiohttp call, it caches the session. So the next time you make a request it pulls the stale session out of the cache and throws an \"Event loop is closed\" exception.\r\n\r\nTo fix the issue we made the following code changes in request.py as a hack.\r\n\r\n```\r\nasync def get_async_session(endpoint_uri: URI) -> ClientSession:\r\n cache_key = generate_cache_key(endpoint_uri)\r\n ########### TEMP CODE ###########\r\n if True:# cache_key not in _async_session_cache: # no caching for you!\r\n ########### TEMP CODE ###########\r\n await cache_async_session(endpoint_uri, ClientSession(raise_for_status=True))\r\n return _async_session_cache.get_cache_entry(cache_key)\r\n\r\n\r\nasync def async_get_response_from_get_request(\r\n endpoint_uri: URI, *args: Any, **kwargs: Any\r\n) -> ClientResponse:\r\n kwargs.setdefault(\"timeout\", ClientTimeout(10))\r\n session = await get_async_session(endpoint_uri)\r\n response = await session.get(endpoint_uri, *args, **kwargs)\r\n ########### TEMP CODE ###########\r\n await session.close()\r\n ########### TEMP CODE ###########\r\n return response\r\n\r\n\r\nasync def async_get_response_from_post_request(\r\n endpoint_uri: URI, *args: Any, **kwargs: Any\r\n) -> ClientResponse:\r\n kwargs.setdefault(\"timeout\", ClientTimeout(10))\r\n session = await get_async_session(endpoint_uri)\r\n response = await session.post(endpoint_uri, *args, **kwargs)\r\n ########### TEMP CODE ###########\r\n await session.close()\r\n ########### TEMP CODE ###########\r\n return response\r\n```\r\n\r\nWould be nice to have a setting to disable session caching.\r\n\r\n---\r\n**Note:** We prefer to use issues to track our work. If you think you've encountered a bug in web3py or \r\nhave a feature request, you're in the right place. If you have implementation or usage questions, \r\nplease refer to our [documentation](https://web3py.readthedocs.io/en/latest/) and/or join the conversation \r\non [discord](https://discord.gg/GHryRvPB84).\r\n\n", "before_files": [{"content": "import asyncio\nfrom concurrent.futures import (\n ThreadPoolExecutor,\n)\nimport logging\nimport os\nimport threading\nfrom typing import (\n Any,\n Dict,\n List,\n Optional,\n Union,\n)\n\nfrom aiohttp import (\n ClientResponse,\n ClientSession,\n ClientTimeout,\n)\nfrom eth_typing import (\n URI,\n)\nimport requests\n\nfrom web3._utils.async_caching import (\n async_lock,\n)\nfrom web3._utils.caching import (\n generate_cache_key,\n)\nfrom web3.utils.caching import (\n SimpleCache,\n)\n\nlogger = logging.getLogger(__name__)\n\nDEFAULT_TIMEOUT = 10\n\n\ndef get_default_http_endpoint() -> URI:\n return URI(os.environ.get(\"WEB3_HTTP_PROVIDER_URI\", \"http://localhost:8545\"))\n\n\n_session_cache = SimpleCache()\n_session_cache_lock = threading.Lock()\n\n\ndef cache_and_return_session(\n endpoint_uri: URI, session: requests.Session = None\n) -> requests.Session:\n # cache key should have a unique thread identifier\n cache_key = generate_cache_key(f\"{threading.get_ident()}:{endpoint_uri}\")\n\n evicted_items = None\n with _session_cache_lock:\n if cache_key not in _session_cache:\n if session is None:\n session = requests.Session()\n\n evicted_items = _session_cache.cache(cache_key, session)\n logger.debug(f\"Session cached: {endpoint_uri}, {session}\")\n\n cached_session = _session_cache.get_cache_entry(cache_key)\n\n if evicted_items is not None:\n evicted_sessions = evicted_items.values()\n for evicted_session in evicted_sessions:\n logger.debug(\n f\"Session cache full. Session evicted from cache: {evicted_session}\",\n )\n threading.Timer(\n DEFAULT_TIMEOUT + 0.1,\n _close_evicted_sessions,\n args=[evicted_sessions],\n ).start()\n\n return cached_session\n\n\ndef get_response_from_get_request(\n endpoint_uri: URI, *args: Any, **kwargs: Any\n) -> requests.Response:\n kwargs.setdefault(\"timeout\", DEFAULT_TIMEOUT)\n session = cache_and_return_session(endpoint_uri)\n response = session.get(endpoint_uri, *args, **kwargs)\n return response\n\n\ndef json_make_get_request(\n endpoint_uri: URI, *args: Any, **kwargs: Any\n) -> Dict[str, Any]:\n response = get_response_from_get_request(endpoint_uri, *args, **kwargs)\n response.raise_for_status()\n return response.json()\n\n\ndef get_response_from_post_request(\n endpoint_uri: URI, *args: Any, **kwargs: Any\n) -> requests.Response:\n kwargs.setdefault(\"timeout\", DEFAULT_TIMEOUT)\n session = cache_and_return_session(endpoint_uri)\n response = session.post(endpoint_uri, *args, **kwargs)\n return response\n\n\ndef make_post_request(\n endpoint_uri: URI, data: Union[bytes, Dict[str, Any]], *args: Any, **kwargs: Any\n) -> bytes:\n response = get_response_from_post_request(endpoint_uri, data=data, *args, **kwargs)\n response.raise_for_status()\n return response.content\n\n\ndef _close_evicted_sessions(evicted_sessions: List[requests.Session]) -> None:\n for evicted_session in evicted_sessions:\n evicted_session.close()\n logger.debug(f\"Closed evicted session: {evicted_session}\")\n\n\n# --- async --- #\n\n\n_async_session_cache = SimpleCache()\n_async_session_cache_lock = threading.Lock()\n_async_session_pool = ThreadPoolExecutor(max_workers=1)\n\n\nasync def cache_and_return_async_session(\n endpoint_uri: URI,\n session: Optional[ClientSession] = None,\n) -> ClientSession:\n # cache key should have a unique thread identifier\n cache_key = generate_cache_key(f\"{threading.get_ident()}:{endpoint_uri}\")\n\n evicted_items = None\n async with async_lock(_async_session_pool, _async_session_cache_lock):\n if cache_key not in _async_session_cache:\n if session is None:\n session = ClientSession(raise_for_status=True)\n\n evicted_items = _async_session_cache.cache(cache_key, session)\n logger.debug(f\"Async session cached: {endpoint_uri}, {session}\")\n\n cached_session = _async_session_cache.get_cache_entry(cache_key)\n\n if evicted_items is not None:\n # At this point the evicted sessions are already popped out of the cache and\n # just stored in the `evicted_sessions` dict. So we can kick off a future task\n # to close them and it should be safe to pop out of the lock here.\n evicted_sessions = evicted_items.values()\n for evicted_session in evicted_sessions:\n logger.debug(\n \"Async session cache full. Session evicted from cache: \"\n f\"{evicted_session}\",\n )\n # Kick off a future task, in a separate thread, to close the evicted\n # sessions. In the case that the cache filled very quickly and some\n # sessions have been evicted before their original request has been made,\n # we set the timer to a bit more than the `DEFAULT_TIMEOUT` for a call. This\n # should make it so that any call from an evicted session can still be made\n # before the session is closed.\n threading.Timer(\n DEFAULT_TIMEOUT + 0.1,\n _async_close_evicted_sessions,\n args=[evicted_sessions],\n ).start()\n\n return cached_session\n\n\nasync def async_get_response_from_get_request(\n endpoint_uri: URI, *args: Any, **kwargs: Any\n) -> ClientResponse:\n kwargs.setdefault(\"timeout\", ClientTimeout(DEFAULT_TIMEOUT))\n session = await cache_and_return_async_session(endpoint_uri)\n response = await session.get(endpoint_uri, *args, **kwargs)\n return response\n\n\nasync def async_json_make_get_request(\n endpoint_uri: URI, *args: Any, **kwargs: Any\n) -> Dict[str, Any]:\n response = await async_get_response_from_get_request(endpoint_uri, *args, **kwargs)\n response.raise_for_status()\n return await response.json()\n\n\nasync def async_get_response_from_post_request(\n endpoint_uri: URI, *args: Any, **kwargs: Any\n) -> ClientResponse:\n kwargs.setdefault(\"timeout\", ClientTimeout(DEFAULT_TIMEOUT))\n session = await cache_and_return_async_session(endpoint_uri)\n response = await session.post(endpoint_uri, *args, **kwargs)\n return response\n\n\nasync def async_make_post_request(\n endpoint_uri: URI, data: Union[bytes, Dict[str, Any]], *args: Any, **kwargs: Any\n) -> bytes:\n response = await async_get_response_from_post_request(\n endpoint_uri, data=data, *args, **kwargs\n )\n response.raise_for_status()\n return await response.read()\n\n\nasync def async_get_json_from_client_response(\n response: ClientResponse,\n) -> Dict[str, Any]:\n return await response.json()\n\n\ndef _async_close_evicted_sessions(evicted_sessions: List[ClientSession]) -> None:\n loop = asyncio.new_event_loop()\n\n for evicted_session in evicted_sessions:\n loop.run_until_complete(evicted_session.close())\n logger.debug(f\"Closed evicted async session: {evicted_session}\")\n\n if any(not evicted_session.closed for evicted_session in evicted_sessions):\n logger.warning(\n f\"Some evicted async sessions were not properly closed: {evicted_sessions}\"\n )\n loop.close()\n", "path": "web3/_utils/request.py"}]}
| 3,183 | 389 |
gh_patches_debug_17603
|
rasdani/github-patches
|
git_diff
|
weecology__retriever-560
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Gentry url update
The url given for the gentry dataset at
https://github.com/weecology/retriever/blob/master/scripts/gentry.py#L33
Should be changed from http://www.wlbcenter.org/gentry_data.htm (which no longer seems to exist) to http://www.mobot.org/mobot/research/gentry/welcome.shtml
</issue>
<code>
[start of scripts/gentry.py]
1 #retriever
2 """Retriever script for Alwyn H. Gentry Forest Transect Dataset
3
4 """
5 from __future__ import print_function
6 from builtins import str
7 from builtins import range
8
9 import os
10 import sys
11 import zipfile
12 import xlrd
13 from retriever.lib.templates import Script
14 from retriever.lib.models import Table
15 from retriever.lib.excel import Excel
16
17 VERSION = '1.0.1'
18
19 TAX_GROUPS = 9756 #9819
20
21
22 class main(Script):
23 def __init__(self, **kwargs):
24 Script.__init__(self, **kwargs)
25 self.name = "Alwyn H. Gentry Forest Transect Dataset"
26 self.shortname = "Gentry"
27 self.urls = {"stems": "http://www.mobot.org/mobot/gentry/123/all_Excel.zip",
28 "sites": "http://www.ecologicaldata.org/sites/default/files/gentry_sites_data.txt",
29 "species": "",
30 "counts": ""}
31 self.tags = ["Taxon > Plants", "Spatial Scale > Global",
32 "Data Type > Observational"]
33 self.ref = "http://www.wlbcenter.org/gentry_data.htm"
34 self.addendum = """Researchers who make use of the data in publications are requested to acknowledge Alwyn H. Gentry, the Missouri Botanical Garden, and collectors who assisted Gentry or contributed data for specific sites. It is also requested that a reprint of any publication making use of the Gentry Forest Transect Data be sent to:
35
36 Bruce E. Ponman
37 Missouri Botanical Garden
38 P.O. Box 299
39 St. Louis, MO 63166-0299
40 U.S.A. """
41
42 def download(self, engine=None, debug=False):
43 Script.download(self, engine, debug)
44
45 self.engine.auto_create_table(Table("sites"), url=self.urls["sites"])
46 self.engine.insert_data_from_url(self.urls["sites"])
47
48 self.engine.download_file(self.urls["stems"], "all_Excel.zip")
49 local_zip = zipfile.ZipFile(self.engine.format_filename("all_Excel.zip"))
50 filelist = local_zip.namelist()
51 local_zip.close()
52 self.engine.download_files_from_archive(self.urls["stems"], filelist)
53
54 filelist = [os.path.basename(filename) for filename in filelist]
55
56 # Currently all_Excel.zip is missing CURUYUQU.xls
57 # Download it separately and add it to the file list
58 if not self.engine.find_file('CURUYUQU.xls'):
59 self.engine.download_file("http://www.mobot.org/mobot/gentry/123/samerica/CURUYUQU.xls", "CURUYUQU.xls")
60 filelist.append('CURUYUQU.xls')
61
62 lines = []
63 tax = []
64 for filename in filelist:
65 print("Extracting data from " + filename + "...")
66 book = xlrd.open_workbook(self.engine.format_filename(filename))
67 sh = book.sheet_by_index(0)
68 rows = sh.nrows
69 cn = {'stems': []}
70 n = 0
71 for colnum, c in enumerate(sh.row(0)):
72 if not Excel.empty_cell(c):
73 cid = Excel.cell_value(c).lower()
74 # line number column is sometimes named differently
75 if cid in ["sub", "number"]:
76 cid = "line"
77 # the "number of individuals" column is named in various
78 # different ways; they always at least contain "nd"
79 if "nd" in cid:
80 cid = "count"
81 # in QUIAPACA.xls the "number of individuals" column is
82 # misnamed "STEMDBH" just like the stems columns, so weep
83 # for the state of scientific data and then fix manually
84 if filename == "QUIAPACA.xls" and colnum == 13:
85 cid = "count"
86
87 # if column is a stem, add it to the list of stems;
88 # otherwise, make note of the column name/number
89 if "stem" in cid or "dbh" in cid:
90 cn["stems"].append(n)
91 else:
92 cn[cid] = n
93 n += 1
94 # sometimes, a data file does not contain a liana or count column
95 if not "liana" in list(cn.keys()):
96 cn["liana"] = -1
97 if not "count" in list(cn.keys()):
98 cn["count"] = -1
99 for i in range(1, rows):
100 row = sh.row(i)
101 cellcount = len(row)
102 # make sure the row is real, not just empty cells
103 if not all(Excel.empty_cell(cell) for cell in row):
104 try:
105 this_line = {}
106
107 def format_value(s):
108 s = Excel.cell_value(s)
109 return str(s).title().replace("\\", "/").replace('"', '')
110
111 # get the following information from the appropriate columns
112 for i in ["line", "family", "genus", "species",
113 "liana", "count"]:
114 if cn[i] > -1:
115 this_line[i] = format_value(row[cn[i]])
116 if this_line[i] == '`':
117 this_line[i] = 1
118
119 this_line["stems"] = [Excel.cell_value(row[c])
120 for c in cn["stems"]
121 if not Excel.empty_cell(row[c])]
122 this_line["site"] = filename[0:-4]
123
124 lines.append(this_line)
125
126 # Check how far the species is identified
127 full_id = 0
128 if len(this_line["species"]) < 3:
129 if len(this_line["genus"]) < 3:
130 id_level = "family"
131 else:
132 id_level = "genus"
133 else:
134 id_level = "species"
135 full_id = 1
136 tax.append((this_line["family"],
137 this_line["genus"],
138 this_line["species"].lower().replace('\\', '').replace('"', ''),
139 id_level,
140 str(full_id)))
141 except:
142 raise
143 pass
144
145 tax = sorted(tax, key=lambda group: group[0] + " " + group[1] + " " + group[2])
146 unique_tax = []
147 tax_dict = dict()
148 tax_count = 0
149
150 # Get all unique families/genera/species
151 for group in tax:
152 if not (group in unique_tax):
153 unique_tax.append(group)
154 tax_count += 1
155 tax_dict[group[0:3]] = tax_count
156 if tax_count % 10 == 0:
157 msg = "Generating taxonomic groups: " + str(tax_count) + " / " + str(TAX_GROUPS)
158 sys.stdout.write(msg + "\b" * len(msg))
159 print("Generating taxonomic groups: " + str(TAX_GROUPS) + " / " + str(TAX_GROUPS))
160
161
162 # Create species table
163 table = Table("species", delimiter=",")
164 table.columns=[("species_id" , ("pk-int",) ),
165 ("family" , ("char", ) ),
166 ("genus" , ("char", ) ),
167 ("species" , ("char", ) ),
168 ("id_level" , ("char", 10) ),
169 ("full_id" , ("bool",) )]
170
171 data = [','.join([str(tax_dict[group[:3]])] + ['"%s"' % g for g in group])
172 for group in unique_tax]
173 table.pk = 'species_id'
174 table.contains_pk = True
175
176 self.engine.table = table
177 self.engine.create_table()
178 self.engine.add_to_table(data)
179
180
181 # Create stems table
182 table = Table("stems", delimiter=",", contains_pk=False)
183 table.columns=[("stem_id" , ("pk-auto",) ),
184 ("line" , ("int",) ),
185 ("species_id" , ("int",) ),
186 ("site_code" , ("char", 12) ),
187 ("liana" , ("char", 10) ),
188 ("stem" , ("double",) )]
189 stems = []
190 counts = []
191 for line in lines:
192 try:
193 liana = line["liana"]
194 except KeyError:
195 liana = ""
196 species_info = [line["line"],
197 tax_dict[(line["family"],
198 line["genus"],
199 line["species"].lower())],
200 line["site"],
201 liana
202 ]
203 try:
204 counts.append([str(value) for value in species_info + [line["count"]]])
205 except KeyError:
206 pass
207
208 for i in line["stems"]:
209 stem = species_info + [i]
210 stems.append([str(value) for value in stem])
211
212 data = [','.join(stem) for stem in stems]
213 self.engine.table = table
214 self.engine.create_table()
215 self.engine.add_to_table(data)
216
217
218 # Create counts table
219 table = Table("counts", delimiter=",", contains_pk=False)
220 table.columns=[("count_id" , ("pk-auto",) ),
221 ("line" , ("int",) ),
222 ("species_id" , ("int",) ),
223 ("site_code" , ("char", 12) ),
224 ("liana" , ("char", 10) ),
225 ("count" , ("double",) )]
226 data = [','.join(count) for count in counts]
227 self.engine.table = table
228 self.engine.create_table()
229 self.engine.add_to_table(data)
230
231 return self.engine
232
233
234 SCRIPT = main()
235
[end of scripts/gentry.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/scripts/gentry.py b/scripts/gentry.py
--- a/scripts/gentry.py
+++ b/scripts/gentry.py
@@ -30,7 +30,7 @@
"counts": ""}
self.tags = ["Taxon > Plants", "Spatial Scale > Global",
"Data Type > Observational"]
- self.ref = "http://www.wlbcenter.org/gentry_data.htm"
+ self.ref = "http://www.mobot.org/mobot/research/gentry/welcome.shtml"
self.addendum = """Researchers who make use of the data in publications are requested to acknowledge Alwyn H. Gentry, the Missouri Botanical Garden, and collectors who assisted Gentry or contributed data for specific sites. It is also requested that a reprint of any publication making use of the Gentry Forest Transect Data be sent to:
Bruce E. Ponman
|
{"golden_diff": "diff --git a/scripts/gentry.py b/scripts/gentry.py\n--- a/scripts/gentry.py\n+++ b/scripts/gentry.py\n@@ -30,7 +30,7 @@\n \"counts\": \"\"}\n self.tags = [\"Taxon > Plants\", \"Spatial Scale > Global\",\n \"Data Type > Observational\"]\n- self.ref = \"http://www.wlbcenter.org/gentry_data.htm\"\n+ self.ref = \"http://www.mobot.org/mobot/research/gentry/welcome.shtml\"\n self.addendum = \"\"\"Researchers who make use of the data in publications are requested to acknowledge Alwyn H. Gentry, the Missouri Botanical Garden, and collectors who assisted Gentry or contributed data for specific sites. It is also requested that a reprint of any publication making use of the Gentry Forest Transect Data be sent to:\n \n Bruce E. Ponman\n", "issue": "Gentry url update\nThe url given for the gentry dataset at \n\nhttps://github.com/weecology/retriever/blob/master/scripts/gentry.py#L33\n\nShould be changed from http://www.wlbcenter.org/gentry_data.htm (which no longer seems to exist) to http://www.mobot.org/mobot/research/gentry/welcome.shtml\n\n", "before_files": [{"content": "#retriever\n\"\"\"Retriever script for Alwyn H. Gentry Forest Transect Dataset\n\n\"\"\"\nfrom __future__ import print_function\nfrom builtins import str\nfrom builtins import range\n\nimport os\nimport sys\nimport zipfile\nimport xlrd\nfrom retriever.lib.templates import Script\nfrom retriever.lib.models import Table\nfrom retriever.lib.excel import Excel\n\nVERSION = '1.0.1'\n\nTAX_GROUPS = 9756 #9819\n\n\nclass main(Script):\n def __init__(self, **kwargs):\n Script.__init__(self, **kwargs)\n self.name = \"Alwyn H. Gentry Forest Transect Dataset\"\n self.shortname = \"Gentry\"\n self.urls = {\"stems\": \"http://www.mobot.org/mobot/gentry/123/all_Excel.zip\",\n \"sites\": \"http://www.ecologicaldata.org/sites/default/files/gentry_sites_data.txt\",\n \"species\": \"\",\n \"counts\": \"\"}\n self.tags = [\"Taxon > Plants\", \"Spatial Scale > Global\",\n \"Data Type > Observational\"]\n self.ref = \"http://www.wlbcenter.org/gentry_data.htm\"\n self.addendum = \"\"\"Researchers who make use of the data in publications are requested to acknowledge Alwyn H. Gentry, the Missouri Botanical Garden, and collectors who assisted Gentry or contributed data for specific sites. It is also requested that a reprint of any publication making use of the Gentry Forest Transect Data be sent to:\n\nBruce E. Ponman\nMissouri Botanical Garden\nP.O. Box 299\nSt. Louis, MO 63166-0299\nU.S.A. \"\"\"\n\n def download(self, engine=None, debug=False):\n Script.download(self, engine, debug)\n\n self.engine.auto_create_table(Table(\"sites\"), url=self.urls[\"sites\"])\n self.engine.insert_data_from_url(self.urls[\"sites\"])\n\n self.engine.download_file(self.urls[\"stems\"], \"all_Excel.zip\")\n local_zip = zipfile.ZipFile(self.engine.format_filename(\"all_Excel.zip\"))\n filelist = local_zip.namelist()\n local_zip.close()\n self.engine.download_files_from_archive(self.urls[\"stems\"], filelist)\n\n filelist = [os.path.basename(filename) for filename in filelist]\n\n # Currently all_Excel.zip is missing CURUYUQU.xls\n # Download it separately and add it to the file list\n if not self.engine.find_file('CURUYUQU.xls'):\n self.engine.download_file(\"http://www.mobot.org/mobot/gentry/123/samerica/CURUYUQU.xls\", \"CURUYUQU.xls\")\n filelist.append('CURUYUQU.xls')\n\n lines = []\n tax = []\n for filename in filelist:\n print(\"Extracting data from \" + filename + \"...\")\n book = xlrd.open_workbook(self.engine.format_filename(filename))\n sh = book.sheet_by_index(0)\n rows = sh.nrows\n cn = {'stems': []}\n n = 0\n for colnum, c in enumerate(sh.row(0)):\n if not Excel.empty_cell(c):\n cid = Excel.cell_value(c).lower()\n # line number column is sometimes named differently\n if cid in [\"sub\", \"number\"]:\n cid = \"line\"\n # the \"number of individuals\" column is named in various\n # different ways; they always at least contain \"nd\"\n if \"nd\" in cid:\n cid = \"count\"\n # in QUIAPACA.xls the \"number of individuals\" column is\n # misnamed \"STEMDBH\" just like the stems columns, so weep\n # for the state of scientific data and then fix manually\n if filename == \"QUIAPACA.xls\" and colnum == 13:\n cid = \"count\"\n\n # if column is a stem, add it to the list of stems;\n # otherwise, make note of the column name/number\n if \"stem\" in cid or \"dbh\" in cid:\n cn[\"stems\"].append(n)\n else:\n cn[cid] = n\n n += 1\n # sometimes, a data file does not contain a liana or count column\n if not \"liana\" in list(cn.keys()):\n cn[\"liana\"] = -1\n if not \"count\" in list(cn.keys()):\n cn[\"count\"] = -1\n for i in range(1, rows):\n row = sh.row(i)\n cellcount = len(row)\n # make sure the row is real, not just empty cells\n if not all(Excel.empty_cell(cell) for cell in row):\n try:\n this_line = {}\n\n def format_value(s):\n s = Excel.cell_value(s)\n return str(s).title().replace(\"\\\\\", \"/\").replace('\"', '')\n\n # get the following information from the appropriate columns\n for i in [\"line\", \"family\", \"genus\", \"species\",\n \"liana\", \"count\"]:\n if cn[i] > -1:\n this_line[i] = format_value(row[cn[i]])\n if this_line[i] == '`':\n this_line[i] = 1\n\n this_line[\"stems\"] = [Excel.cell_value(row[c])\n for c in cn[\"stems\"]\n if not Excel.empty_cell(row[c])]\n this_line[\"site\"] = filename[0:-4]\n\n lines.append(this_line)\n\n # Check how far the species is identified\n full_id = 0\n if len(this_line[\"species\"]) < 3:\n if len(this_line[\"genus\"]) < 3:\n id_level = \"family\"\n else:\n id_level = \"genus\"\n else:\n id_level = \"species\"\n full_id = 1\n tax.append((this_line[\"family\"],\n this_line[\"genus\"],\n this_line[\"species\"].lower().replace('\\\\', '').replace('\"', ''),\n id_level,\n str(full_id)))\n except:\n raise\n pass\n\n tax = sorted(tax, key=lambda group: group[0] + \" \" + group[1] + \" \" + group[2])\n unique_tax = []\n tax_dict = dict()\n tax_count = 0\n\n # Get all unique families/genera/species\n for group in tax:\n if not (group in unique_tax):\n unique_tax.append(group)\n tax_count += 1\n tax_dict[group[0:3]] = tax_count\n if tax_count % 10 == 0:\n msg = \"Generating taxonomic groups: \" + str(tax_count) + \" / \" + str(TAX_GROUPS)\n sys.stdout.write(msg + \"\\b\" * len(msg))\n print(\"Generating taxonomic groups: \" + str(TAX_GROUPS) + \" / \" + str(TAX_GROUPS))\n\n\n # Create species table\n table = Table(\"species\", delimiter=\",\")\n table.columns=[(\"species_id\" , (\"pk-int\",) ),\n (\"family\" , (\"char\", ) ),\n (\"genus\" , (\"char\", ) ),\n (\"species\" , (\"char\", ) ),\n (\"id_level\" , (\"char\", 10) ),\n (\"full_id\" , (\"bool\",) )]\n\n data = [','.join([str(tax_dict[group[:3]])] + ['\"%s\"' % g for g in group])\n for group in unique_tax]\n table.pk = 'species_id'\n table.contains_pk = True\n\n self.engine.table = table\n self.engine.create_table()\n self.engine.add_to_table(data)\n\n\n # Create stems table\n table = Table(\"stems\", delimiter=\",\", contains_pk=False)\n table.columns=[(\"stem_id\" , (\"pk-auto\",) ),\n (\"line\" , (\"int\",) ),\n (\"species_id\" , (\"int\",) ),\n (\"site_code\" , (\"char\", 12) ),\n (\"liana\" , (\"char\", 10) ),\n (\"stem\" , (\"double\",) )]\n stems = []\n counts = []\n for line in lines:\n try:\n liana = line[\"liana\"]\n except KeyError:\n liana = \"\"\n species_info = [line[\"line\"],\n tax_dict[(line[\"family\"],\n line[\"genus\"],\n line[\"species\"].lower())],\n line[\"site\"],\n liana\n ]\n try:\n counts.append([str(value) for value in species_info + [line[\"count\"]]])\n except KeyError:\n pass\n\n for i in line[\"stems\"]:\n stem = species_info + [i]\n stems.append([str(value) for value in stem])\n\n data = [','.join(stem) for stem in stems]\n self.engine.table = table\n self.engine.create_table()\n self.engine.add_to_table(data)\n\n\n # Create counts table\n table = Table(\"counts\", delimiter=\",\", contains_pk=False)\n table.columns=[(\"count_id\" , (\"pk-auto\",) ),\n (\"line\" , (\"int\",) ),\n (\"species_id\" , (\"int\",) ),\n (\"site_code\" , (\"char\", 12) ),\n (\"liana\" , (\"char\", 10) ),\n (\"count\" , (\"double\",) )]\n data = [','.join(count) for count in counts]\n self.engine.table = table\n self.engine.create_table()\n self.engine.add_to_table(data)\n\n return self.engine\n\n\nSCRIPT = main()\n", "path": "scripts/gentry.py"}]}
| 3,334 | 184 |
gh_patches_debug_33853
|
rasdani/github-patches
|
git_diff
|
spack__spack-28784
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Installation issue: py-grpcio
### Steps to reproduce the issue
```console
$ spack install py-grpcio
```
### Information on your system
* **Spack:** 0.17.1-1070-5208fcf
* **Python:** 3.8.12
* **Platform:** linux-rhel6-broadwell
* **Concretizer:** clingo
### Additional information
[spack-build-env.txt](https://github.com/spack/spack/files/8003480/spack-build-env.txt)
[spack-build-out.txt](https://github.com/spack/spack/files/8003481/spack-build-out.txt)
@adamjstewart
@aweits
### General information
- [X] I have run `spack debug report` and reported the version of Spack/Python/Platform
- [X] I have run `spack maintainers <name-of-the-package>` and **@mentioned** any maintainers
- [X] I have uploaded the build log and environment files
- [X] I have searched the issues of this repo and believe this is not a duplicate
</issue>
<code>
[start of var/spack/repos/builtin/packages/py-grpcio/package.py]
1 # Copyright 2013-2022 Lawrence Livermore National Security, LLC and other
2 # Spack Project Developers. See the top-level COPYRIGHT file for details.
3 #
4 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
5
6 from spack import *
7
8
9 class PyGrpcio(PythonPackage):
10 """HTTP/2-based RPC framework."""
11
12 homepage = "https://grpc.io/"
13 pypi = "grpcio/grpcio-1.32.0.tar.gz"
14
15 version('1.42.0', sha256='4a8f2c7490fe3696e0cdd566e2f099fb91b51bc75446125175c55581c2f7bc11')
16 version('1.39.0', sha256='57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407')
17 version('1.38.1', sha256='1f79d8a24261e3c12ec3a6c25945ff799ae09874fd24815bc17c2dc37715ef6c')
18 version('1.38.0', sha256='abbf9c8c3df4d5233d5888c6cfa85c1bb68a6923749bd4dd1abc6e1e93986f17')
19 version('1.37.1', sha256='df8305806311d3fe913d4f7eb3ef28e2072159ea12f95baab5d447f1380a71e3')
20 version('1.37.0', sha256='b3ce16aa91569760fdabd77ca901b2288152eb16941d28edd9a3a75a0c4a8a85')
21 version('1.36.0', sha256='70b11805bc9385fcd24e15bcdc5bd8bed463026cd2227d9fdd1ebda612ba0cd9')
22 version('1.35.0', sha256='7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c')
23 version('1.34.1', sha256='1c746a3cd8a830d8d916a9d0476a786aaa98c5cc2a096344af2be955e439f8ac')
24 version('1.34.0', sha256='f98f746cacbaa681de0bcd90d7aa77b440e3e1327a9988f6a2b580d54e27d4c3')
25 version('1.33.2', sha256='21265511880056d19ce4f809ce3fbe2a3fa98ec1fc7167dbdf30a80d3276202e')
26 version('1.33.1', sha256='f19782ec5104599382a0f73f2dfea465d0e65f6818bb3c49ca672b97034c64c3')
27 version('1.32.0', sha256='01d3046fe980be25796d368f8fc5ff34b7cf5e1444f3789a017a7fe794465639')
28 version('1.30.0', sha256='e8f2f5d16e0164c415f1b31a8d9a81f2e4645a43d1b261375d6bab7b0adf511f')
29 version('1.29.0', sha256='a97ea91e31863c9a3879684b5fb3c6ab4b17c5431787548fc9f52b9483ea9c25')
30 version('1.28.1', sha256='cbc322c5d5615e67c2a15be631f64e6c2bab8c12505bc7c150948abdaa0bdbac')
31 version('1.27.2', sha256='5ae532b93cf9ce5a2a549b74a2c35e3b690b171ece9358519b3039c7b84c887e')
32 version('1.25.0', sha256='c948c034d8997526011960db54f512756fb0b4be1b81140a15b4ef094c6594a4')
33 version('1.16.0', sha256='d99db0b39b490d2469a8ef74197d5f211fa740fc9581dccecbb76c56d080fce1')
34
35 depends_on('[email protected]:', when='@1.30:', type=('build', 'run'))
36 depends_on('[email protected]:2.8,3.5:', type=('build', 'run'))
37 depends_on('py-setuptools', type='build')
38 depends_on('[email protected]:', type=('build', 'run'))
39 depends_on('[email protected]:', when='^python@:3.1', type=('build', 'run'))
40 depends_on('[email protected]:', when='^python@:3.3', type=('build', 'run'))
41 depends_on('[email protected]:', type='build')
42 depends_on('openssl')
43 depends_on('zlib')
44 depends_on('c-ares')
45 depends_on('re2+shared')
46
47 def setup_build_environment(self, env):
48 env.set('GRPC_PYTHON_BUILD_WITH_CYTHON', True)
49 env.set('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL', True)
50 env.set('GRPC_PYTHON_BUILD_SYSTEM_ZLIB', True)
51 env.set('GRPC_PYTHON_BUILD_SYSTEM_CARES', True)
52 env.set('GRPC_PYTHON_BUILD_SYSTEM_RE2', True)
53 # https://github.com/grpc/grpc/pull/24449
54 env.set('GRPC_BUILD_WITH_BORING_SSL_ASM', '')
55 env.set('GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS', str(make_jobs))
56
57 for dep in self.spec.dependencies(deptype='link'):
58 query = self.spec[dep.name]
59 env.prepend_path('LIBRARY_PATH', query.libs.directories[0])
60 env.prepend_path('CPATH', query.headers.directories[0])
61
62 def patch(self):
63 if self.spec.satisfies('%fj'):
64 filter_file("-std=gnu99", "", "setup.py")
65
66 # use the spack packages
67 filter_file(r'(\s+SSL_INCLUDE = ).*',
68 r"\1('{0}',)".format(self.spec['openssl'].prefix.include),
69 'setup.py')
70 filter_file(r'(\s+ZLIB_INCLUDE = ).*',
71 r"\1('{0}',)".format(self.spec['zlib'].prefix.include),
72 'setup.py')
73 filter_file(r'(\s+CARES_INCLUDE = ).*',
74 r"\1('{0}',)".format(self.spec['c-ares'].prefix.include),
75 'setup.py')
76 filter_file(r'(\s+RE2_INCLUDE = ).*',
77 r"\1('{0}',)".format(self.spec['re2'].prefix.include),
78 'setup.py')
79
[end of var/spack/repos/builtin/packages/py-grpcio/package.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/var/spack/repos/builtin/packages/py-grpcio/package.py b/var/spack/repos/builtin/packages/py-grpcio/package.py
--- a/var/spack/repos/builtin/packages/py-grpcio/package.py
+++ b/var/spack/repos/builtin/packages/py-grpcio/package.py
@@ -12,6 +12,7 @@
homepage = "https://grpc.io/"
pypi = "grpcio/grpcio-1.32.0.tar.gz"
+ version('1.43.0', sha256='735d9a437c262ab039d02defddcb9f8f545d7009ae61c0114e19dda3843febe5')
version('1.42.0', sha256='4a8f2c7490fe3696e0cdd566e2f099fb91b51bc75446125175c55581c2f7bc11')
version('1.39.0', sha256='57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407')
version('1.38.1', sha256='1f79d8a24261e3c12ec3a6c25945ff799ae09874fd24815bc17c2dc37715ef6c')
@@ -32,8 +33,9 @@
version('1.25.0', sha256='c948c034d8997526011960db54f512756fb0b4be1b81140a15b4ef094c6594a4')
version('1.16.0', sha256='d99db0b39b490d2469a8ef74197d5f211fa740fc9581dccecbb76c56d080fce1')
- depends_on('[email protected]:', when='@1.30:', type=('build', 'run'))
- depends_on('[email protected]:2.8,3.5:', type=('build', 'run'))
+ depends_on('[email protected]:', when='@1.42:', type=('build', 'link', 'run'))
+ depends_on('[email protected]:', when='@1.30:', type=('build', 'link', 'run'))
+ depends_on('[email protected]:2.8,3.5:', type=('build', 'link', 'run'))
depends_on('py-setuptools', type='build')
depends_on('[email protected]:', type=('build', 'run'))
depends_on('[email protected]:', when='^python@:3.1', type=('build', 'run'))
@@ -60,8 +62,7 @@
env.prepend_path('CPATH', query.headers.directories[0])
def patch(self):
- if self.spec.satisfies('%fj'):
- filter_file("-std=gnu99", "", "setup.py")
+ filter_file("-std=gnu99", "", "setup.py")
# use the spack packages
filter_file(r'(\s+SSL_INCLUDE = ).*',
|
{"golden_diff": "diff --git a/var/spack/repos/builtin/packages/py-grpcio/package.py b/var/spack/repos/builtin/packages/py-grpcio/package.py\n--- a/var/spack/repos/builtin/packages/py-grpcio/package.py\n+++ b/var/spack/repos/builtin/packages/py-grpcio/package.py\n@@ -12,6 +12,7 @@\n homepage = \"https://grpc.io/\"\n pypi = \"grpcio/grpcio-1.32.0.tar.gz\"\n \n+ version('1.43.0', sha256='735d9a437c262ab039d02defddcb9f8f545d7009ae61c0114e19dda3843febe5')\n version('1.42.0', sha256='4a8f2c7490fe3696e0cdd566e2f099fb91b51bc75446125175c55581c2f7bc11')\n version('1.39.0', sha256='57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407')\n version('1.38.1', sha256='1f79d8a24261e3c12ec3a6c25945ff799ae09874fd24815bc17c2dc37715ef6c')\n@@ -32,8 +33,9 @@\n version('1.25.0', sha256='c948c034d8997526011960db54f512756fb0b4be1b81140a15b4ef094c6594a4')\n version('1.16.0', sha256='d99db0b39b490d2469a8ef74197d5f211fa740fc9581dccecbb76c56d080fce1')\n \n- depends_on('[email protected]:', when='@1.30:', type=('build', 'run'))\n- depends_on('[email protected]:2.8,3.5:', type=('build', 'run'))\n+ depends_on('[email protected]:', when='@1.42:', type=('build', 'link', 'run'))\n+ depends_on('[email protected]:', when='@1.30:', type=('build', 'link', 'run'))\n+ depends_on('[email protected]:2.8,3.5:', type=('build', 'link', 'run'))\n depends_on('py-setuptools', type='build')\n depends_on('[email protected]:', type=('build', 'run'))\n depends_on('[email protected]:', when='^python@:3.1', type=('build', 'run'))\n@@ -60,8 +62,7 @@\n env.prepend_path('CPATH', query.headers.directories[0])\n \n def patch(self):\n- if self.spec.satisfies('%fj'):\n- filter_file(\"-std=gnu99\", \"\", \"setup.py\")\n+ filter_file(\"-std=gnu99\", \"\", \"setup.py\")\n \n # use the spack packages\n filter_file(r'(\\s+SSL_INCLUDE = ).*',\n", "issue": "Installation issue: py-grpcio\n### Steps to reproduce the issue\r\n```console\r\n$ spack install py-grpcio\r\n```\r\n\r\n### Information on your system\r\n\r\n* **Spack:** 0.17.1-1070-5208fcf\r\n* **Python:** 3.8.12\r\n* **Platform:** linux-rhel6-broadwell\r\n* **Concretizer:** clingo\r\n\r\n\r\n### Additional information\r\n\r\n[spack-build-env.txt](https://github.com/spack/spack/files/8003480/spack-build-env.txt)\r\n[spack-build-out.txt](https://github.com/spack/spack/files/8003481/spack-build-out.txt)\r\n\r\n@adamjstewart \r\n@aweits\r\n\r\n\r\n### General information\r\n\r\n- [X] I have run `spack debug report` and reported the version of Spack/Python/Platform\r\n- [X] I have run `spack maintainers <name-of-the-package>` and **@mentioned** any maintainers\r\n- [X] I have uploaded the build log and environment files\r\n- [X] I have searched the issues of this repo and believe this is not a duplicate\n", "before_files": [{"content": "# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other\n# Spack Project Developers. See the top-level COPYRIGHT file for details.\n#\n# SPDX-License-Identifier: (Apache-2.0 OR MIT)\n\nfrom spack import *\n\n\nclass PyGrpcio(PythonPackage):\n \"\"\"HTTP/2-based RPC framework.\"\"\"\n\n homepage = \"https://grpc.io/\"\n pypi = \"grpcio/grpcio-1.32.0.tar.gz\"\n\n version('1.42.0', sha256='4a8f2c7490fe3696e0cdd566e2f099fb91b51bc75446125175c55581c2f7bc11')\n version('1.39.0', sha256='57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407')\n version('1.38.1', sha256='1f79d8a24261e3c12ec3a6c25945ff799ae09874fd24815bc17c2dc37715ef6c')\n version('1.38.0', sha256='abbf9c8c3df4d5233d5888c6cfa85c1bb68a6923749bd4dd1abc6e1e93986f17')\n version('1.37.1', sha256='df8305806311d3fe913d4f7eb3ef28e2072159ea12f95baab5d447f1380a71e3')\n version('1.37.0', sha256='b3ce16aa91569760fdabd77ca901b2288152eb16941d28edd9a3a75a0c4a8a85')\n version('1.36.0', sha256='70b11805bc9385fcd24e15bcdc5bd8bed463026cd2227d9fdd1ebda612ba0cd9')\n version('1.35.0', sha256='7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c')\n version('1.34.1', sha256='1c746a3cd8a830d8d916a9d0476a786aaa98c5cc2a096344af2be955e439f8ac')\n version('1.34.0', sha256='f98f746cacbaa681de0bcd90d7aa77b440e3e1327a9988f6a2b580d54e27d4c3')\n version('1.33.2', sha256='21265511880056d19ce4f809ce3fbe2a3fa98ec1fc7167dbdf30a80d3276202e')\n version('1.33.1', sha256='f19782ec5104599382a0f73f2dfea465d0e65f6818bb3c49ca672b97034c64c3')\n version('1.32.0', sha256='01d3046fe980be25796d368f8fc5ff34b7cf5e1444f3789a017a7fe794465639')\n version('1.30.0', sha256='e8f2f5d16e0164c415f1b31a8d9a81f2e4645a43d1b261375d6bab7b0adf511f')\n version('1.29.0', sha256='a97ea91e31863c9a3879684b5fb3c6ab4b17c5431787548fc9f52b9483ea9c25')\n version('1.28.1', sha256='cbc322c5d5615e67c2a15be631f64e6c2bab8c12505bc7c150948abdaa0bdbac')\n version('1.27.2', sha256='5ae532b93cf9ce5a2a549b74a2c35e3b690b171ece9358519b3039c7b84c887e')\n version('1.25.0', sha256='c948c034d8997526011960db54f512756fb0b4be1b81140a15b4ef094c6594a4')\n version('1.16.0', sha256='d99db0b39b490d2469a8ef74197d5f211fa740fc9581dccecbb76c56d080fce1')\n\n depends_on('[email protected]:', when='@1.30:', type=('build', 'run'))\n depends_on('[email protected]:2.8,3.5:', type=('build', 'run'))\n depends_on('py-setuptools', type='build')\n depends_on('[email protected]:', type=('build', 'run'))\n depends_on('[email protected]:', when='^python@:3.1', type=('build', 'run'))\n depends_on('[email protected]:', when='^python@:3.3', type=('build', 'run'))\n depends_on('[email protected]:', type='build')\n depends_on('openssl')\n depends_on('zlib')\n depends_on('c-ares')\n depends_on('re2+shared')\n\n def setup_build_environment(self, env):\n env.set('GRPC_PYTHON_BUILD_WITH_CYTHON', True)\n env.set('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL', True)\n env.set('GRPC_PYTHON_BUILD_SYSTEM_ZLIB', True)\n env.set('GRPC_PYTHON_BUILD_SYSTEM_CARES', True)\n env.set('GRPC_PYTHON_BUILD_SYSTEM_RE2', True)\n # https://github.com/grpc/grpc/pull/24449\n env.set('GRPC_BUILD_WITH_BORING_SSL_ASM', '')\n env.set('GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS', str(make_jobs))\n\n for dep in self.spec.dependencies(deptype='link'):\n query = self.spec[dep.name]\n env.prepend_path('LIBRARY_PATH', query.libs.directories[0])\n env.prepend_path('CPATH', query.headers.directories[0])\n\n def patch(self):\n if self.spec.satisfies('%fj'):\n filter_file(\"-std=gnu99\", \"\", \"setup.py\")\n\n # use the spack packages\n filter_file(r'(\\s+SSL_INCLUDE = ).*',\n r\"\\1('{0}',)\".format(self.spec['openssl'].prefix.include),\n 'setup.py')\n filter_file(r'(\\s+ZLIB_INCLUDE = ).*',\n r\"\\1('{0}',)\".format(self.spec['zlib'].prefix.include),\n 'setup.py')\n filter_file(r'(\\s+CARES_INCLUDE = ).*',\n r\"\\1('{0}',)\".format(self.spec['c-ares'].prefix.include),\n 'setup.py')\n filter_file(r'(\\s+RE2_INCLUDE = ).*',\n r\"\\1('{0}',)\".format(self.spec['re2'].prefix.include),\n 'setup.py')\n", "path": "var/spack/repos/builtin/packages/py-grpcio/package.py"}]}
| 3,023 | 860 |
gh_patches_debug_2808
|
rasdani/github-patches
|
git_diff
|
apluslms__a-plus-1179
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Improve access denied messages and 403 page
Improve access denied messages and make them somewhat more explanatory, and also improve the 403 page so it's not quite so aggressive towards would-be learners.
See [Juha's comment](https://github.com/apluslms/a-plus/pull/853#discussion_r692139980) on PR #853
Improve access denied messages and 403 page
Fixes #858
# Description
**What?**
Improve access denied message and 403 page
**Why?**
To make it more clear why user may not access certain pages
**How?**
By adding new error texts and changing how the 403 page looks like so the user can more easily navigate a-plus in case they get to the 403 page.
Fixes #858
# Testing
**Remember to add or update unit tests for new features and changes.**
* How to [test your changes in A-plus](https://github.com/apluslms/a-plus/tree/master/doc#running-tests-and-updating-translations)
* How to [test accessibility](https://wiki.aalto.fi/display/EDIT/How+to+check+the+accessibility+of+pull+requests)
**What type of test did you run?**
- [ ] Accessibility test using the [WAVE](https://wave.webaim.org/extension/) extension.
- [ ] Django unit tests.
- [ ] Selenium tests.
- [ ] Other test. *(Add a description below)*
- [x] Manual testing.
[ADD A DESCRIPTION ABOUT WHAT YOU TESTED MANUALLY]
**Did you test the changes in**
- [ ] Chrome
- [x] Firefox
- [ ] This pull request cannot be tested in the browser.
**Think of what is affected by these changes and could become broken**
# Translation
- [x] Did you modify or add new strings in the user interface? ([Read about how to create translation](https://github.com/apluslms/a-plus/tree/master/doc#running-tests-and-updating-translations))
# Programming style
- [ ] Did you follow our [style guides](https://apluslms.github.io/contribute/styleguides/)?
- [ ] Did you use Python type hinting in all functions that you added or edited? ([type hints](https://docs.python.org/3/library/typing.html) for function parameters and return values)
# Have you updated the README or other relevant documentation?
- [ ] documents inside the doc directory.
- [ ] README.md.
- [ ] Aplus Manual.
- [ ] Other documentation (mention below which documentation).
# Is it Done?
- [ ] Reviewer has finished the code review
- [ ] After the review, the developer has made changes accordingly
- [ ] Customer/Teacher has accepted the implementation of the feature
*Clean up your git commit history before submitting the pull request!*
</issue>
<code>
[start of authorization/permissions.py]
1 """
2 Base permission classes.
3
4 These classes use same interface than ones in django-rest-framework and
5 are usable with APIViews too.
6 """
7 import string
8
9 from django.utils.text import format_lazy
10 from django.utils.translation import gettext_lazy as _
11 from rest_framework.permissions import BasePermission as Permission
12
13 from lib.helpers import Enum
14
15
16 SAFE_METHODS = ('GET', 'HEAD', 'OPTIONS')
17
18
19 class FilterBackend:
20 """
21 FilterBackend interface
22 """
23 def filter_queryset(self, request, queryset, view):
24 """
25 Return a filtered queryset.
26 """
27 raise NotImplementedError
28
29 def get_fields(self, view): # pylint: disable=unused-argument
30 return []
31
32
33 class NoPermission(Permission):
34 """
35 Base Permission class that gives no access permission to anyone.
36 """
37 def has_permission(self, request, view):
38 return False
39
40 def has_object_permission(self, request, view, obj):
41 return False
42
43
44 class MessageMixin:
45 """
46 Adds easy way to specify what exactly caused the PermissionDenied
47 """
48 def error_msg(self, message: str, delim=None, format=None, replace=False): # pylint: disable=redefined-builtin
49 """
50 Add extra text to self.message about the reason why permission
51 was denied. Uses lazy object so the message string is evaluated
52 only when rendered.
53
54 If optional argument `format` is given, then it's used with format_lazy
55 to format the message with the dictionary arguments from `format` arg.
56
57 Optional argument `delim` can be used to change the string used to join
58 self.message and `message`.
59
60 If optional argument `replace` is true, then self.message is replaced with
61 the `message`.
62 """
63 if delim is None:
64 delim = ': '
65
66 if format:
67 message = format_lazy(message, **format)
68
69 if replace:
70 self.message = message
71 else:
72 assert 'message' not in self.__dict__, (
73 "You are calling error_msg without replace=True "
74 "after calling it with it first. Fix your code by removing "
75 "the first method call and add replace=True to the second method call too."
76 )
77 msg_without_end_punctuation = (
78 self.message[0:-1] if self.message[-1] in string.punctuation
79 else self.message
80 )
81 self.message = format_lazy(
82 '{}{}{}',
83 msg_without_end_punctuation,
84 delim,
85 message,
86 )
87
88
89 # Access mode
90 # ===========
91
92 # All access levels
93 ACCESS = Enum(
94 ('ANONYMOUS', 0, _('ACCESS_ANYONE')),
95 ('ENROLL', 1, None),
96 ('STUDENT', 3, _('ACCESS_ANY_STUDENT')),
97 ('ENROLLED', 4, _('ACCESS_ENROLLED_STUDENT')),
98 ('ASSISTANT', 5, _('ACCESS_COURSE_ASSISTANT')),
99 ('GRADING', 6, _('ACCESS_GRADING')),
100 ('TEACHER', 10, _('ACCESS_TEACHER')),
101 ('SUPERUSER', 100, _('ACCESS_SUPERUSER')),
102 )
103
104
105 class AccessModePermission(MessageMixin, Permission):
106 """
107 If view has access_mode that is not anonymous, then require authentication
108 """
109 message = _('ACCESS_PERMISSION_DENIED_MSG')
110
111 def has_permission(self, request, view):
112 access_mode = view.get_access_mode()
113
114 if access_mode == ACCESS.ANONYMOUS:
115 return True
116 if not request.user.is_authenticated:
117 return False
118
119 if access_mode >= ACCESS.SUPERUSER:
120 return request.user.is_superuser
121
122 if access_mode >= ACCESS.TEACHER:
123 if not view.is_teacher:
124 self.error_msg(_('ACCESS_ERROR_ONLY_TEACHERS'))
125 return False
126
127 elif access_mode >= ACCESS.ASSISTANT:
128 if not view.is_course_staff:
129 self.error_msg(_('ACCESS_ERROR_ONLY_COURSE_STAFF'))
130 return False
131
132 elif access_mode == ACCESS.ENROLLED:
133 if not view.is_course_staff and not view.is_student:
134 self.error_msg(_('ACCESS_ERROR_ONLY_ENROLLED_STUDENTS'))
135 return False
136
137 return True
138
139
140 # Object permissions
141 # ==================
142
143
144 class ObjectVisibleBasePermission(MessageMixin, Permission):
145 model = None
146 obj_var = None
147
148 def has_permission(self, request, view):
149 obj = getattr(view, self.obj_var, None)
150 return (
151 obj is None or
152 self.has_object_permission(request, view, obj)
153 )
154
155 def has_object_permission(self, request, view, obj):
156 user = request.user
157 return (
158 # skip objects that are not the model in question
159 not isinstance(obj, self.model) or # pylint: disable=isinstance-second-argument-not-valid-type
160 user.is_staff or
161 user.is_superuser or
162 self.is_object_visible(request, view, obj)
163 )
164
165 def is_object_visible(self, request, view, obj):
166 raise NotImplementedError
167
[end of authorization/permissions.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/authorization/permissions.py b/authorization/permissions.py
--- a/authorization/permissions.py
+++ b/authorization/permissions.py
@@ -114,6 +114,7 @@
if access_mode == ACCESS.ANONYMOUS:
return True
if not request.user.is_authenticated:
+ self.error_msg(_('ACCESS_ERROR_ONLY_AUTHENTICATED'))
return False
if access_mode >= ACCESS.SUPERUSER:
|
{"golden_diff": "diff --git a/authorization/permissions.py b/authorization/permissions.py\n--- a/authorization/permissions.py\n+++ b/authorization/permissions.py\n@@ -114,6 +114,7 @@\n if access_mode == ACCESS.ANONYMOUS:\n return True\n if not request.user.is_authenticated:\n+ self.error_msg(_('ACCESS_ERROR_ONLY_AUTHENTICATED'))\n return False\n \n if access_mode >= ACCESS.SUPERUSER:\n", "issue": "Improve access denied messages and 403 page\nImprove access denied messages and make them somewhat more explanatory, and also improve the 403 page so it's not quite so aggressive towards would-be learners.\r\nSee [Juha's comment](https://github.com/apluslms/a-plus/pull/853#discussion_r692139980) on PR #853 \nImprove access denied messages and 403 page\nFixes #858\r\n\r\n# Description\r\n\r\n**What?**\r\n\r\nImprove access denied message and 403 page\r\n\r\n**Why?**\r\n\r\nTo make it more clear why user may not access certain pages\r\n\r\n**How?**\r\n\r\nBy adding new error texts and changing how the 403 page looks like so the user can more easily navigate a-plus in case they get to the 403 page.\r\n\r\nFixes #858 \r\n\r\n\r\n# Testing\r\n\r\n**Remember to add or update unit tests for new features and changes.**\r\n\r\n* How to [test your changes in A-plus](https://github.com/apluslms/a-plus/tree/master/doc#running-tests-and-updating-translations)\r\n* How to [test accessibility](https://wiki.aalto.fi/display/EDIT/How+to+check+the+accessibility+of+pull+requests)\r\n\r\n\r\n**What type of test did you run?**\r\n\r\n- [ ] Accessibility test using the [WAVE](https://wave.webaim.org/extension/) extension.\r\n- [ ] Django unit tests.\r\n- [ ] Selenium tests.\r\n- [ ] Other test. *(Add a description below)*\r\n- [x] Manual testing.\r\n\r\n[ADD A DESCRIPTION ABOUT WHAT YOU TESTED MANUALLY]\r\n\r\n**Did you test the changes in**\r\n\r\n- [ ] Chrome\r\n- [x] Firefox\r\n- [ ] This pull request cannot be tested in the browser.\r\n\r\n**Think of what is affected by these changes and could become broken**\r\n\r\n# Translation\r\n\r\n- [x] Did you modify or add new strings in the user interface? ([Read about how to create translation](https://github.com/apluslms/a-plus/tree/master/doc#running-tests-and-updating-translations))\r\n\r\n# Programming style\r\n\r\n- [ ] Did you follow our [style guides](https://apluslms.github.io/contribute/styleguides/)?\r\n- [ ] Did you use Python type hinting in all functions that you added or edited? ([type hints](https://docs.python.org/3/library/typing.html) for function parameters and return values)\r\n\r\n# Have you updated the README or other relevant documentation?\r\n\r\n- [ ] documents inside the doc directory.\r\n- [ ] README.md.\r\n- [ ] Aplus Manual.\r\n- [ ] Other documentation (mention below which documentation).\r\n\r\n# Is it Done?\r\n\r\n- [ ] Reviewer has finished the code review\r\n- [ ] After the review, the developer has made changes accordingly\r\n- [ ] Customer/Teacher has accepted the implementation of the feature\r\n\r\n*Clean up your git commit history before submitting the pull request!*\r\n\n", "before_files": [{"content": "\"\"\"\nBase permission classes.\n\nThese classes use same interface than ones in django-rest-framework and\nare usable with APIViews too.\n\"\"\"\nimport string\n\nfrom django.utils.text import format_lazy\nfrom django.utils.translation import gettext_lazy as _\nfrom rest_framework.permissions import BasePermission as Permission\n\nfrom lib.helpers import Enum\n\n\nSAFE_METHODS = ('GET', 'HEAD', 'OPTIONS')\n\n\nclass FilterBackend:\n \"\"\"\n FilterBackend interface\n \"\"\"\n def filter_queryset(self, request, queryset, view):\n \"\"\"\n Return a filtered queryset.\n \"\"\"\n raise NotImplementedError\n\n def get_fields(self, view): # pylint: disable=unused-argument\n return []\n\n\nclass NoPermission(Permission):\n \"\"\"\n Base Permission class that gives no access permission to anyone.\n \"\"\"\n def has_permission(self, request, view):\n return False\n\n def has_object_permission(self, request, view, obj):\n return False\n\n\nclass MessageMixin:\n \"\"\"\n Adds easy way to specify what exactly caused the PermissionDenied\n \"\"\"\n def error_msg(self, message: str, delim=None, format=None, replace=False): # pylint: disable=redefined-builtin\n \"\"\"\n Add extra text to self.message about the reason why permission\n was denied. Uses lazy object so the message string is evaluated\n only when rendered.\n\n If optional argument `format` is given, then it's used with format_lazy\n to format the message with the dictionary arguments from `format` arg.\n\n Optional argument `delim` can be used to change the string used to join\n self.message and `message`.\n\n If optional argument `replace` is true, then self.message is replaced with\n the `message`.\n \"\"\"\n if delim is None:\n delim = ': '\n\n if format:\n message = format_lazy(message, **format)\n\n if replace:\n self.message = message\n else:\n assert 'message' not in self.__dict__, (\n \"You are calling error_msg without replace=True \"\n \"after calling it with it first. Fix your code by removing \"\n \"the first method call and add replace=True to the second method call too.\"\n )\n msg_without_end_punctuation = (\n self.message[0:-1] if self.message[-1] in string.punctuation\n else self.message\n )\n self.message = format_lazy(\n '{}{}{}',\n msg_without_end_punctuation,\n delim,\n message,\n )\n\n\n# Access mode\n# ===========\n\n# All access levels\nACCESS = Enum(\n ('ANONYMOUS', 0, _('ACCESS_ANYONE')),\n ('ENROLL', 1, None),\n ('STUDENT', 3, _('ACCESS_ANY_STUDENT')),\n ('ENROLLED', 4, _('ACCESS_ENROLLED_STUDENT')),\n ('ASSISTANT', 5, _('ACCESS_COURSE_ASSISTANT')),\n ('GRADING', 6, _('ACCESS_GRADING')),\n ('TEACHER', 10, _('ACCESS_TEACHER')),\n ('SUPERUSER', 100, _('ACCESS_SUPERUSER')),\n)\n\n\nclass AccessModePermission(MessageMixin, Permission):\n \"\"\"\n If view has access_mode that is not anonymous, then require authentication\n \"\"\"\n message = _('ACCESS_PERMISSION_DENIED_MSG')\n\n def has_permission(self, request, view):\n access_mode = view.get_access_mode()\n\n if access_mode == ACCESS.ANONYMOUS:\n return True\n if not request.user.is_authenticated:\n return False\n\n if access_mode >= ACCESS.SUPERUSER:\n return request.user.is_superuser\n\n if access_mode >= ACCESS.TEACHER:\n if not view.is_teacher:\n self.error_msg(_('ACCESS_ERROR_ONLY_TEACHERS'))\n return False\n\n elif access_mode >= ACCESS.ASSISTANT:\n if not view.is_course_staff:\n self.error_msg(_('ACCESS_ERROR_ONLY_COURSE_STAFF'))\n return False\n\n elif access_mode == ACCESS.ENROLLED:\n if not view.is_course_staff and not view.is_student:\n self.error_msg(_('ACCESS_ERROR_ONLY_ENROLLED_STUDENTS'))\n return False\n\n return True\n\n\n# Object permissions\n# ==================\n\n\nclass ObjectVisibleBasePermission(MessageMixin, Permission):\n model = None\n obj_var = None\n\n def has_permission(self, request, view):\n obj = getattr(view, self.obj_var, None)\n return (\n obj is None or\n self.has_object_permission(request, view, obj)\n )\n\n def has_object_permission(self, request, view, obj):\n user = request.user\n return (\n # skip objects that are not the model in question\n not isinstance(obj, self.model) or # pylint: disable=isinstance-second-argument-not-valid-type\n user.is_staff or\n user.is_superuser or\n self.is_object_visible(request, view, obj)\n )\n\n def is_object_visible(self, request, view, obj):\n raise NotImplementedError\n", "path": "authorization/permissions.py"}]}
| 2,625 | 97 |
gh_patches_debug_26456
|
rasdani/github-patches
|
git_diff
|
deepchecks__deepchecks-956
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[FEAT][GENERAL] check for the latest version and notify if using an older version
**Describe the solution you'd like**
Check that the latest version is installed and raise a warning when importing the package if it's not the latest version.
</issue>
<code>
[start of deepchecks/__init__.py]
1 # ----------------------------------------------------------------------------
2 # Copyright (C) 2021-2022 Deepchecks (https://www.deepchecks.com)
3 #
4 # This file is part of Deepchecks.
5 # Deepchecks is distributed under the terms of the GNU Affero General
6 # Public License (version 3 or later).
7 # You should have received a copy of the GNU Affero General Public License
8 # along with Deepchecks. If not, see <http://www.gnu.org/licenses/>.
9 # ----------------------------------------------------------------------------
10 #
11 """Deepchecks."""
12 import os
13 import pathlib
14 import warnings
15 import matplotlib
16 import plotly.io as pio
17
18
19 from deepchecks.utils.ipython import is_notebook
20 from deepchecks.tabular import (
21 Dataset,
22 Suite,
23 Context,
24 SingleDatasetCheck,
25 TrainTestCheck,
26 ModelOnlyCheck,
27 ModelComparisonCheck,
28 ModelComparisonSuite,
29 )
30 from deepchecks.core import (
31 BaseCheck,
32 BaseSuite,
33 CheckResult,
34 CheckFailure,
35 SuiteResult,
36 Condition,
37 ConditionResult,
38 ConditionCategory,
39 SingleDatasetBaseCheck,
40 TrainTestBaseCheck,
41 ModelOnlyBaseCheck
42 )
43
44
45 warnings.warn(
46 # TODO: better message
47 'Ability to import base tabular functionality from '
48 'the `deepchecks` directly is deprecated, please import from '
49 '`deepchecks.tabular` instead',
50 DeprecationWarning
51 )
52
53
54 __all__ = [
55 'BaseCheck',
56 'SingleDatasetBaseCheck',
57 'TrainTestBaseCheck',
58 'ModelOnlyBaseCheck',
59 'ModelComparisonCheck',
60 'CheckResult',
61 'CheckFailure',
62 'Condition',
63 'ConditionResult',
64 'ConditionCategory',
65 'BaseSuite',
66 'SuiteResult',
67
68 # tabular checks
69 'SingleDatasetCheck',
70 'TrainTestCheck',
71 'ModelOnlyCheck',
72 'Dataset',
73 'Suite',
74 'ModelComparisonSuite',
75 'Context'
76 ]
77
78
79 # Matplotlib has multiple backends. If we are in a context that does not support GUI (For example, during unit tests)
80 # we can't use a GUI backend. Thus we must use a non-GUI backend.
81 if not is_notebook():
82 matplotlib.use('Agg')
83
84 # We can't rely on that the user will have an active internet connection, thus we change the default backend to
85 # "notebook" If plotly detects the 'notebook-connected' backend.
86 # for more info, see: https://plotly.com/python/renderers/
87 pio_backends = pio.renderers.default.split('+')
88 if 'notebook_connected' in pio_backends:
89 pio_backends[pio_backends.index('notebook_connected')] = 'notebook'
90 pio.renderers.default = '+'.join(pio_backends)
91
92
93 # Set version info
94 try:
95 MODULE_DIR = pathlib.Path(__file__).absolute().parent.parent
96 with open(os.path.join(MODULE_DIR, 'VERSION'), 'r', encoding='utf-8') as f:
97 __version__ = f.read().strip()
98 except Exception: # pylint: disable=broad-except
99 # If version file can't be found, leave version empty
100 __version__ = ''
101
[end of deepchecks/__init__.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/deepchecks/__init__.py b/deepchecks/__init__.py
--- a/deepchecks/__init__.py
+++ b/deepchecks/__init__.py
@@ -11,10 +11,11 @@
"""Deepchecks."""
import os
import pathlib
+import http.client
import warnings
import matplotlib
import plotly.io as pio
-
+from pkg_resources import parse_version
from deepchecks.utils.ipython import is_notebook
from deepchecks.tabular import (
@@ -95,6 +96,20 @@
MODULE_DIR = pathlib.Path(__file__).absolute().parent.parent
with open(os.path.join(MODULE_DIR, 'VERSION'), 'r', encoding='utf-8') as f:
__version__ = f.read().strip()
-except Exception: # pylint: disable=broad-except
+except: # pylint: disable=bare-except # noqa
# If version file can't be found, leave version empty
__version__ = ''
+
+# Check for latest version
+try:
+ disable = os.environ.get('DEEPCHECKS_DISABLE_LATEST', 'false').lower() == 'true'
+ if not disable:
+ conn = http.client.HTTPSConnection('api.deepchecks.com', timeout=3)
+ conn.request('GET', '/latest')
+ response = conn.getresponse()
+ latest_version = response.read().decode('utf-8')
+ if __version__ and parse_version(__version__) < parse_version(latest_version):
+ warnings.warn('Looks like you are using outdated version of deepchecks. consider upgrading using'
+ ' pip install -U deepchecks')
+except: # pylint: disable=bare-except # noqa
+ pass
|
{"golden_diff": "diff --git a/deepchecks/__init__.py b/deepchecks/__init__.py\n--- a/deepchecks/__init__.py\n+++ b/deepchecks/__init__.py\n@@ -11,10 +11,11 @@\n \"\"\"Deepchecks.\"\"\"\n import os\n import pathlib\n+import http.client\n import warnings\n import matplotlib\n import plotly.io as pio\n-\n+from pkg_resources import parse_version\n \n from deepchecks.utils.ipython import is_notebook\n from deepchecks.tabular import (\n@@ -95,6 +96,20 @@\n MODULE_DIR = pathlib.Path(__file__).absolute().parent.parent\n with open(os.path.join(MODULE_DIR, 'VERSION'), 'r', encoding='utf-8') as f:\n __version__ = f.read().strip()\n-except Exception: # pylint: disable=broad-except\n+except: # pylint: disable=bare-except # noqa\n # If version file can't be found, leave version empty\n __version__ = ''\n+\n+# Check for latest version\n+try:\n+ disable = os.environ.get('DEEPCHECKS_DISABLE_LATEST', 'false').lower() == 'true'\n+ if not disable:\n+ conn = http.client.HTTPSConnection('api.deepchecks.com', timeout=3)\n+ conn.request('GET', '/latest')\n+ response = conn.getresponse()\n+ latest_version = response.read().decode('utf-8')\n+ if __version__ and parse_version(__version__) < parse_version(latest_version):\n+ warnings.warn('Looks like you are using outdated version of deepchecks. consider upgrading using'\n+ ' pip install -U deepchecks')\n+except: # pylint: disable=bare-except # noqa\n+ pass\n", "issue": "[FEAT][GENERAL] check for the latest version and notify if using an older version\n**Describe the solution you'd like**\r\nCheck that the latest version is installed and raise a warning when importing the package if it's not the latest version.\r\n\n", "before_files": [{"content": "# ----------------------------------------------------------------------------\n# Copyright (C) 2021-2022 Deepchecks (https://www.deepchecks.com)\n#\n# This file is part of Deepchecks.\n# Deepchecks is distributed under the terms of the GNU Affero General\n# Public License (version 3 or later).\n# You should have received a copy of the GNU Affero General Public License\n# along with Deepchecks. If not, see <http://www.gnu.org/licenses/>.\n# ----------------------------------------------------------------------------\n#\n\"\"\"Deepchecks.\"\"\"\nimport os\nimport pathlib\nimport warnings\nimport matplotlib\nimport plotly.io as pio\n\n\nfrom deepchecks.utils.ipython import is_notebook\nfrom deepchecks.tabular import (\n Dataset,\n Suite,\n Context,\n SingleDatasetCheck,\n TrainTestCheck,\n ModelOnlyCheck,\n ModelComparisonCheck,\n ModelComparisonSuite,\n)\nfrom deepchecks.core import (\n BaseCheck,\n BaseSuite,\n CheckResult,\n CheckFailure,\n SuiteResult,\n Condition,\n ConditionResult,\n ConditionCategory,\n SingleDatasetBaseCheck,\n TrainTestBaseCheck,\n ModelOnlyBaseCheck\n)\n\n\nwarnings.warn(\n # TODO: better message\n 'Ability to import base tabular functionality from '\n 'the `deepchecks` directly is deprecated, please import from '\n '`deepchecks.tabular` instead',\n DeprecationWarning\n)\n\n\n__all__ = [\n 'BaseCheck',\n 'SingleDatasetBaseCheck',\n 'TrainTestBaseCheck',\n 'ModelOnlyBaseCheck',\n 'ModelComparisonCheck',\n 'CheckResult',\n 'CheckFailure',\n 'Condition',\n 'ConditionResult',\n 'ConditionCategory',\n 'BaseSuite',\n 'SuiteResult',\n\n # tabular checks\n 'SingleDatasetCheck',\n 'TrainTestCheck',\n 'ModelOnlyCheck',\n 'Dataset',\n 'Suite',\n 'ModelComparisonSuite',\n 'Context'\n]\n\n\n# Matplotlib has multiple backends. If we are in a context that does not support GUI (For example, during unit tests)\n# we can't use a GUI backend. Thus we must use a non-GUI backend.\nif not is_notebook():\n matplotlib.use('Agg')\n\n# We can't rely on that the user will have an active internet connection, thus we change the default backend to\n# \"notebook\" If plotly detects the 'notebook-connected' backend.\n# for more info, see: https://plotly.com/python/renderers/\npio_backends = pio.renderers.default.split('+')\nif 'notebook_connected' in pio_backends:\n pio_backends[pio_backends.index('notebook_connected')] = 'notebook'\n pio.renderers.default = '+'.join(pio_backends)\n\n\n# Set version info\ntry:\n MODULE_DIR = pathlib.Path(__file__).absolute().parent.parent\n with open(os.path.join(MODULE_DIR, 'VERSION'), 'r', encoding='utf-8') as f:\n __version__ = f.read().strip()\nexcept Exception: # pylint: disable=broad-except\n # If version file can't be found, leave version empty\n __version__ = ''\n", "path": "deepchecks/__init__.py"}]}
| 1,459 | 383 |
gh_patches_debug_23114
|
rasdani/github-patches
|
git_diff
|
mozilla__telemetry-analysis-service-441
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Use `select_for_update` in cluster expiration email task
There's a bit of a race condition [here](https://github.com/mozilla/telemetry-analysis-service/blob/e6fecbe12d09b2e2338ae62f5276b3b2f39b0b65/atmo/clusters/tasks.py#L38) where two tasks could ask for expiring clusters at the same time and start sending emails before they can be marked as sent. We should 1. wrap the whole task in a transaction and 2. use `select_for_update` on the query for active clusters to lock those rows.
</issue>
<code>
[start of atmo/clusters/tasks.py]
1 # This Source Code Form is subject to the terms of the Mozilla Public
2 # License, v. 2.0. If a copy of the MPL was not distributed with this
3 # file, you can obtain one at http://mozilla.org/MPL/2.0/.
4 from datetime import timedelta
5
6 import mail_builder
7 from botocore.exceptions import ClientError
8 from celery.utils.log import get_task_logger
9 from django.conf import settings
10 from django.db import transaction
11 from django.utils import timezone
12
13 from ..celery import celery
14 from .models import Cluster
15 from .provisioners import ClusterProvisioner
16
17 logger = get_task_logger(__name__)
18
19
20 @celery.task
21 def deactivate_clusters():
22 now = timezone.now()
23 deactivated_clusters = []
24 for cluster in Cluster.objects.active().filter(end_date__lte=now):
25 with transaction.atomic():
26 deactivated_clusters.append([cluster.identifier, cluster.pk])
27 # The cluster is expired
28 logger.info(
29 'Cluster %s (%s) is expired, deactivating.',
30 cluster.pk,
31 cluster.identifier,
32 )
33 cluster.deactivate()
34 return deactivated_clusters
35
36
37 @celery.task
38 def send_expiration_mails():
39 deadline = timezone.now() + timedelta(hours=1)
40 soon_expired = Cluster.objects.active().filter(
41 end_date__lte=deadline,
42 expiration_mail_sent=False,
43 )
44 for cluster in soon_expired:
45 with transaction.atomic():
46 message = mail_builder.build_message(
47 'atmo/clusters/mails/expiration.mail', {
48 'cluster': cluster,
49 'deadline': deadline,
50 'settings': settings,
51 },
52 )
53 message.send()
54 cluster.expiration_mail_sent = True
55 cluster.save()
56
57
58 @celery.task(max_retries=3)
59 @celery.autoretry(ClientError)
60 def update_master_address(cluster_id, force=False):
61 """
62 Update the public IP address for the cluster with the given cluster ID
63 """
64 cluster = Cluster.objects.get(id=cluster_id)
65 # quick way out in case this job was called accidently
66 if cluster.master_address and not force:
67 return
68 # first get the cluster info from AWS
69 info = cluster.info
70 master_address = info.get('public_dns') or ''
71 # then store the public IP of the cluster if found in response
72 if master_address:
73 cluster.master_address = master_address
74 cluster.save()
75 return master_address
76
77
78 @celery.task(max_retries=3)
79 @celery.autoretry(ClientError)
80 def update_clusters():
81 """
82 Update the cluster metadata from AWS for the pending
83 clusters.
84
85 - To be used periodically.
86 - Won't update state if not needed.
87 - Will queue updating the Cluster's public IP address if needed.
88 """
89 # only update the cluster info for clusters that are pending
90 active_clusters = Cluster.objects.active()
91
92 # Short-circuit for no active clusters (e.g. on weekends)
93 if not active_clusters.exists():
94 return []
95
96 # get the start dates of the active clusters, set to the start of the day
97 # to counteract time differences between atmo and AWS and use the oldest
98 # start date to limit the ListCluster API call to AWS
99 oldest_start_date = active_clusters.datetimes('start_date', 'day')
100
101 # build a mapping between jobflow ID and cluster info
102 cluster_mapping = {}
103 provisioner = ClusterProvisioner()
104 cluster_list = provisioner.list(
105 created_after=oldest_start_date[0]
106 )
107 for cluster_info in cluster_list:
108 cluster_mapping[cluster_info['jobflow_id']] = cluster_info
109
110 # go through pending clusters and update the state if needed
111 updated_clusters = []
112 for cluster in active_clusters:
113 with transaction.atomic():
114 info = cluster_mapping.get(cluster.jobflow_id)
115 # ignore if no info was found for some reason,
116 # the cluster was deleted in AWS but it wasn't deleted here yet
117 if info is None:
118 continue
119
120 # don't update the state if it's equal to the already stored state
121 if info['state'] == cluster.most_recent_status:
122 continue
123
124 # run an UPDATE query for the cluster
125 cluster.most_recent_status = info['state']
126 cluster.save()
127
128 updated_clusters.append(cluster.identifier)
129
130 # if not given enqueue a job to update the public IP address
131 # but only if the cluster is running or waiting, so the
132 # API call isn't wasted
133 if (not cluster.master_address and
134 cluster.most_recent_status in cluster.READY_STATUS_LIST):
135 transaction.on_commit(
136 lambda: update_master_address.delay(cluster.id)
137 )
138 return updated_clusters
139
[end of atmo/clusters/tasks.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/atmo/clusters/tasks.py b/atmo/clusters/tasks.py
--- a/atmo/clusters/tasks.py
+++ b/atmo/clusters/tasks.py
@@ -37,22 +37,23 @@
@celery.task
def send_expiration_mails():
deadline = timezone.now() + timedelta(hours=1)
- soon_expired = Cluster.objects.active().filter(
- end_date__lte=deadline,
- expiration_mail_sent=False,
- )
- for cluster in soon_expired:
- with transaction.atomic():
- message = mail_builder.build_message(
- 'atmo/clusters/mails/expiration.mail', {
- 'cluster': cluster,
- 'deadline': deadline,
- 'settings': settings,
- },
- )
- message.send()
- cluster.expiration_mail_sent = True
- cluster.save()
+ with transaction.atomic():
+ soon_expired = Cluster.objects.select_for_update().active().filter(
+ end_date__lte=deadline,
+ expiration_mail_sent=False,
+ )
+ for cluster in soon_expired:
+ with transaction.atomic():
+ message = mail_builder.build_message(
+ 'atmo/clusters/mails/expiration.mail', {
+ 'cluster': cluster,
+ 'deadline': deadline,
+ 'settings': settings,
+ },
+ )
+ message.send()
+ cluster.expiration_mail_sent = True
+ cluster.save()
@celery.task(max_retries=3)
|
{"golden_diff": "diff --git a/atmo/clusters/tasks.py b/atmo/clusters/tasks.py\n--- a/atmo/clusters/tasks.py\n+++ b/atmo/clusters/tasks.py\n@@ -37,22 +37,23 @@\n @celery.task\n def send_expiration_mails():\n deadline = timezone.now() + timedelta(hours=1)\n- soon_expired = Cluster.objects.active().filter(\n- end_date__lte=deadline,\n- expiration_mail_sent=False,\n- )\n- for cluster in soon_expired:\n- with transaction.atomic():\n- message = mail_builder.build_message(\n- 'atmo/clusters/mails/expiration.mail', {\n- 'cluster': cluster,\n- 'deadline': deadline,\n- 'settings': settings,\n- },\n- )\n- message.send()\n- cluster.expiration_mail_sent = True\n- cluster.save()\n+ with transaction.atomic():\n+ soon_expired = Cluster.objects.select_for_update().active().filter(\n+ end_date__lte=deadline,\n+ expiration_mail_sent=False,\n+ )\n+ for cluster in soon_expired:\n+ with transaction.atomic():\n+ message = mail_builder.build_message(\n+ 'atmo/clusters/mails/expiration.mail', {\n+ 'cluster': cluster,\n+ 'deadline': deadline,\n+ 'settings': settings,\n+ },\n+ )\n+ message.send()\n+ cluster.expiration_mail_sent = True\n+ cluster.save()\n \n \n @celery.task(max_retries=3)\n", "issue": "Use `select_for_update` in cluster expiration email task\nThere's a bit of a race condition [here](https://github.com/mozilla/telemetry-analysis-service/blob/e6fecbe12d09b2e2338ae62f5276b3b2f39b0b65/atmo/clusters/tasks.py#L38) where two tasks could ask for expiring clusters at the same time and start sending emails before they can be marked as sent. We should 1. wrap the whole task in a transaction and 2. use `select_for_update` on the query for active clusters to lock those rows.\n", "before_files": [{"content": "# This Source Code Form is subject to the terms of the Mozilla Public\n# License, v. 2.0. If a copy of the MPL was not distributed with this\n# file, you can obtain one at http://mozilla.org/MPL/2.0/.\nfrom datetime import timedelta\n\nimport mail_builder\nfrom botocore.exceptions import ClientError\nfrom celery.utils.log import get_task_logger\nfrom django.conf import settings\nfrom django.db import transaction\nfrom django.utils import timezone\n\nfrom ..celery import celery\nfrom .models import Cluster\nfrom .provisioners import ClusterProvisioner\n\nlogger = get_task_logger(__name__)\n\n\[email protected]\ndef deactivate_clusters():\n now = timezone.now()\n deactivated_clusters = []\n for cluster in Cluster.objects.active().filter(end_date__lte=now):\n with transaction.atomic():\n deactivated_clusters.append([cluster.identifier, cluster.pk])\n # The cluster is expired\n logger.info(\n 'Cluster %s (%s) is expired, deactivating.',\n cluster.pk,\n cluster.identifier,\n )\n cluster.deactivate()\n return deactivated_clusters\n\n\[email protected]\ndef send_expiration_mails():\n deadline = timezone.now() + timedelta(hours=1)\n soon_expired = Cluster.objects.active().filter(\n end_date__lte=deadline,\n expiration_mail_sent=False,\n )\n for cluster in soon_expired:\n with transaction.atomic():\n message = mail_builder.build_message(\n 'atmo/clusters/mails/expiration.mail', {\n 'cluster': cluster,\n 'deadline': deadline,\n 'settings': settings,\n },\n )\n message.send()\n cluster.expiration_mail_sent = True\n cluster.save()\n\n\[email protected](max_retries=3)\[email protected](ClientError)\ndef update_master_address(cluster_id, force=False):\n \"\"\"\n Update the public IP address for the cluster with the given cluster ID\n \"\"\"\n cluster = Cluster.objects.get(id=cluster_id)\n # quick way out in case this job was called accidently\n if cluster.master_address and not force:\n return\n # first get the cluster info from AWS\n info = cluster.info\n master_address = info.get('public_dns') or ''\n # then store the public IP of the cluster if found in response\n if master_address:\n cluster.master_address = master_address\n cluster.save()\n return master_address\n\n\[email protected](max_retries=3)\[email protected](ClientError)\ndef update_clusters():\n \"\"\"\n Update the cluster metadata from AWS for the pending\n clusters.\n\n - To be used periodically.\n - Won't update state if not needed.\n - Will queue updating the Cluster's public IP address if needed.\n \"\"\"\n # only update the cluster info for clusters that are pending\n active_clusters = Cluster.objects.active()\n\n # Short-circuit for no active clusters (e.g. on weekends)\n if not active_clusters.exists():\n return []\n\n # get the start dates of the active clusters, set to the start of the day\n # to counteract time differences between atmo and AWS and use the oldest\n # start date to limit the ListCluster API call to AWS\n oldest_start_date = active_clusters.datetimes('start_date', 'day')\n\n # build a mapping between jobflow ID and cluster info\n cluster_mapping = {}\n provisioner = ClusterProvisioner()\n cluster_list = provisioner.list(\n created_after=oldest_start_date[0]\n )\n for cluster_info in cluster_list:\n cluster_mapping[cluster_info['jobflow_id']] = cluster_info\n\n # go through pending clusters and update the state if needed\n updated_clusters = []\n for cluster in active_clusters:\n with transaction.atomic():\n info = cluster_mapping.get(cluster.jobflow_id)\n # ignore if no info was found for some reason,\n # the cluster was deleted in AWS but it wasn't deleted here yet\n if info is None:\n continue\n\n # don't update the state if it's equal to the already stored state\n if info['state'] == cluster.most_recent_status:\n continue\n\n # run an UPDATE query for the cluster\n cluster.most_recent_status = info['state']\n cluster.save()\n\n updated_clusters.append(cluster.identifier)\n\n # if not given enqueue a job to update the public IP address\n # but only if the cluster is running or waiting, so the\n # API call isn't wasted\n if (not cluster.master_address and\n cluster.most_recent_status in cluster.READY_STATUS_LIST):\n transaction.on_commit(\n lambda: update_master_address.delay(cluster.id)\n )\n return updated_clusters\n", "path": "atmo/clusters/tasks.py"}]}
| 1,989 | 323 |
gh_patches_debug_24616
|
rasdani/github-patches
|
git_diff
|
streamlit__streamlit-7221
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
datetimes that are close together on silder used for ranges are illegible.
### Steps to reproduce
Here's an example:
```python
from datetime import date
import streamlit as st
dates = st.slider('date range',
min_value=date(2019, 8, 1), max_value=date(2021, 6, 4),
value=(date(2021, 5, 21), date(2021, 6, 4)))
```
**Expected behavior:**
Legible dates and handles on the slider.
**Actual behavior:**
### Is this a regression?
no
### Debug info
- Streamlit version: Streamlit, version 0.81.1
- Python version: Python 3.9.4
- Using Conda? yes
- OS version: Windows 10
- Browser version: Latest Chrome
### Additional information
It probably makes sense to right-align the lower end of the range and left-align the upper end of the range.
</issue>
<code>
[start of e2e/scripts/st_slider.py]
1 # Copyright (c) Streamlit Inc. (2018-2022) Snowflake Inc. (2022)
2 #
3 # Licensed under the Apache License, Version 2.0 (the "License");
4 # you may not use this file except in compliance with the License.
5 # You may obtain a copy of the License at
6 #
7 # http://www.apache.org/licenses/LICENSE-2.0
8 #
9 # Unless required by applicable law or agreed to in writing, software
10 # distributed under the License is distributed on an "AS IS" BASIS,
11 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 # See the License for the specific language governing permissions and
13 # limitations under the License.
14
15 import streamlit as st
16 from streamlit import runtime
17
18 s1 = st.sidebar.slider("Label A", 0, 12345678, 12345678)
19 st.sidebar.write("Value A:", s1)
20
21 r1 = st.sidebar.slider("Range A", 10000, 25000, [10000, 25000])
22 st.sidebar.write("Range Value A:", r1)
23
24 with st.sidebar.expander("Expander", expanded=True):
25 s2 = st.slider("Label B", 10000, 25000, 10000)
26 st.write("Value B:", s2)
27
28 r2 = st.slider("Range B", 10000, 25000, [10000, 25000])
29 st.write("Range Value B:", r2)
30
31 w1 = st.slider("Label 1", 0, 100, 25, 1)
32 st.write("Value 1:", w1)
33
34 w2 = st.slider("Label 2", 0.0, 100.0, (25.0, 75.0), 0.5)
35 st.write("Value 2:", w2)
36
37 w3 = st.slider(
38 "Label 3 - This is a very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very long label",
39 0,
40 100,
41 1,
42 1,
43 )
44 st.write("Value 3:", w3)
45
46 w4 = st.slider("Label 4", 10000, 25000, 10000, disabled=True)
47 st.write("Value 4:", w4)
48
49 w5 = st.slider("Label 5", 0, 100, 25, 1, label_visibility="hidden")
50 st.write("Value 5:", w5)
51
52 w6 = st.slider("Label 6", 0, 100, 36, label_visibility="collapsed")
53 st.write("Value 6:", w6)
54
55 if runtime.exists():
56
57 def on_change():
58 st.session_state.slider_changed = True
59
60 st.slider(
61 "Label 7",
62 min_value=0,
63 max_value=100,
64 value=25,
65 step=1,
66 key="slider7",
67 on_change=on_change,
68 )
69 st.write("Value 7:", st.session_state.slider7)
70 st.write("Slider changed:", "slider_changed" in st.session_state)
71
[end of e2e/scripts/st_slider.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/e2e/scripts/st_slider.py b/e2e/scripts/st_slider.py
--- a/e2e/scripts/st_slider.py
+++ b/e2e/scripts/st_slider.py
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from datetime import date
+
import streamlit as st
from streamlit import runtime
@@ -52,19 +54,27 @@
w6 = st.slider("Label 6", 0, 100, 36, label_visibility="collapsed")
st.write("Value 6:", w6)
+dates = st.slider(
+ "Label 7",
+ min_value=date(2019, 8, 1),
+ max_value=date(2021, 6, 4),
+ value=(date(2019, 8, 1), date(2019, 9, 1)),
+)
+st.write("Value 7:", dates[0], dates[1])
+
if runtime.exists():
def on_change():
st.session_state.slider_changed = True
st.slider(
- "Label 7",
+ "Label 8",
min_value=0,
max_value=100,
value=25,
step=1,
- key="slider7",
+ key="slider8",
on_change=on_change,
)
- st.write("Value 7:", st.session_state.slider7)
+ st.write("Value 8:", st.session_state.slider8)
st.write("Slider changed:", "slider_changed" in st.session_state)
|
{"golden_diff": "diff --git a/e2e/scripts/st_slider.py b/e2e/scripts/st_slider.py\n--- a/e2e/scripts/st_slider.py\n+++ b/e2e/scripts/st_slider.py\n@@ -12,6 +12,8 @@\n # See the License for the specific language governing permissions and\n # limitations under the License.\n \n+from datetime import date\n+\n import streamlit as st\n from streamlit import runtime\n \n@@ -52,19 +54,27 @@\n w6 = st.slider(\"Label 6\", 0, 100, 36, label_visibility=\"collapsed\")\n st.write(\"Value 6:\", w6)\n \n+dates = st.slider(\n+ \"Label 7\",\n+ min_value=date(2019, 8, 1),\n+ max_value=date(2021, 6, 4),\n+ value=(date(2019, 8, 1), date(2019, 9, 1)),\n+)\n+st.write(\"Value 7:\", dates[0], dates[1])\n+\n if runtime.exists():\n \n def on_change():\n st.session_state.slider_changed = True\n \n st.slider(\n- \"Label 7\",\n+ \"Label 8\",\n min_value=0,\n max_value=100,\n value=25,\n step=1,\n- key=\"slider7\",\n+ key=\"slider8\",\n on_change=on_change,\n )\n- st.write(\"Value 7:\", st.session_state.slider7)\n+ st.write(\"Value 8:\", st.session_state.slider8)\n st.write(\"Slider changed:\", \"slider_changed\" in st.session_state)\n", "issue": "datetimes that are close together on silder used for ranges are illegible.\n### Steps to reproduce\r\n\r\nHere's an example:\r\n\r\n```python\r\n\r\nfrom datetime import date\r\nimport streamlit as st\r\n\r\ndates = st.slider('date range',\r\n min_value=date(2019, 8, 1), max_value=date(2021, 6, 4),\r\n value=(date(2021, 5, 21), date(2021, 6, 4)))\r\n```\r\n\r\n**Expected behavior:**\r\n\r\nLegible dates and handles on the slider.\r\n\r\n**Actual behavior:**\r\n\r\n\r\n\r\n### Is this a regression?\r\n\r\n no\r\n\r\n### Debug info\r\n\r\n- Streamlit version: Streamlit, version 0.81.1\r\n- Python version: Python 3.9.4\r\n- Using Conda? yes\r\n- OS version: Windows 10\r\n- Browser version: Latest Chrome\r\n\r\n### Additional information\r\n\r\nIt probably makes sense to right-align the lower end of the range and left-align the upper end of the range.\n", "before_files": [{"content": "# Copyright (c) Streamlit Inc. (2018-2022) Snowflake Inc. (2022)\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport streamlit as st\nfrom streamlit import runtime\n\ns1 = st.sidebar.slider(\"Label A\", 0, 12345678, 12345678)\nst.sidebar.write(\"Value A:\", s1)\n\nr1 = st.sidebar.slider(\"Range A\", 10000, 25000, [10000, 25000])\nst.sidebar.write(\"Range Value A:\", r1)\n\nwith st.sidebar.expander(\"Expander\", expanded=True):\n s2 = st.slider(\"Label B\", 10000, 25000, 10000)\n st.write(\"Value B:\", s2)\n\n r2 = st.slider(\"Range B\", 10000, 25000, [10000, 25000])\n st.write(\"Range Value B:\", r2)\n\nw1 = st.slider(\"Label 1\", 0, 100, 25, 1)\nst.write(\"Value 1:\", w1)\n\nw2 = st.slider(\"Label 2\", 0.0, 100.0, (25.0, 75.0), 0.5)\nst.write(\"Value 2:\", w2)\n\nw3 = st.slider(\n \"Label 3 - This is a very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very long label\",\n 0,\n 100,\n 1,\n 1,\n)\nst.write(\"Value 3:\", w3)\n\nw4 = st.slider(\"Label 4\", 10000, 25000, 10000, disabled=True)\nst.write(\"Value 4:\", w4)\n\nw5 = st.slider(\"Label 5\", 0, 100, 25, 1, label_visibility=\"hidden\")\nst.write(\"Value 5:\", w5)\n\nw6 = st.slider(\"Label 6\", 0, 100, 36, label_visibility=\"collapsed\")\nst.write(\"Value 6:\", w6)\n\nif runtime.exists():\n\n def on_change():\n st.session_state.slider_changed = True\n\n st.slider(\n \"Label 7\",\n min_value=0,\n max_value=100,\n value=25,\n step=1,\n key=\"slider7\",\n on_change=on_change,\n )\n st.write(\"Value 7:\", st.session_state.slider7)\n st.write(\"Slider changed:\", \"slider_changed\" in st.session_state)\n", "path": "e2e/scripts/st_slider.py"}]}
| 1,718 | 369 |
gh_patches_debug_8325
|
rasdani/github-patches
|
git_diff
|
Kinto__kinto-1101
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
__flush__ produces an HTML reponse
The response for the flush endpoint is a raw HTML response from Pyramid. I suggest make it a JSON response for compatibility with the rest of the API. Maybe return `{}`?
```
gsurita-30820:kinto gsurita$ http post http://localhost:8888/v1/__flush__
HTTP/1.1 202 Accepted
Content-Length: 157
Content-Type: text/html; charset=UTF-8
Date: Tue, 21 Feb 2017 13:56:56 GMT
Server: waitress
X-Content-Type-Options: nosniff
<html>
<head>
<title>202 Accepted</title>
</head>
<body>
<h1>202 Accepted</h1>
The request is accepted for processing.<br/><br/>
</body>
</html>
__flush__ produces an HTML reponse
The response for the flush endpoint is a raw HTML response from Pyramid. I suggest make it a JSON response for compatibility with the rest of the API. Maybe return `{}`?
```
gsurita-30820:kinto gsurita$ http post http://localhost:8888/v1/__flush__
HTTP/1.1 202 Accepted
Content-Length: 157
Content-Type: text/html; charset=UTF-8
Date: Tue, 21 Feb 2017 13:56:56 GMT
Server: waitress
X-Content-Type-Options: nosniff
<html>
<head>
<title>202 Accepted</title>
</head>
<body>
<h1>202 Accepted</h1>
The request is accepted for processing.<br/><br/>
</body>
</html>
</issue>
<code>
[start of kinto/views/flush.py]
1 from cornice import Service
2 from pyramid import httpexceptions
3 from pyramid.security import NO_PERMISSION_REQUIRED
4
5 from kinto.events import ServerFlushed
6
7 flush = Service(name='flush',
8 description='Clear database content',
9 path='/__flush__')
10
11
12 @flush.post(permission=NO_PERMISSION_REQUIRED)
13 def flush_post(request):
14 request.registry.storage.flush()
15 request.registry.permission.flush()
16 request.registry.cache.flush()
17 event = ServerFlushed(request)
18 request.registry.notify(event)
19 return httpexceptions.HTTPAccepted()
20
[end of kinto/views/flush.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/kinto/views/flush.py b/kinto/views/flush.py
--- a/kinto/views/flush.py
+++ b/kinto/views/flush.py
@@ -1,5 +1,4 @@
from cornice import Service
-from pyramid import httpexceptions
from pyramid.security import NO_PERMISSION_REQUIRED
from kinto.events import ServerFlushed
@@ -16,4 +15,6 @@
request.registry.cache.flush()
event = ServerFlushed(request)
request.registry.notify(event)
- return httpexceptions.HTTPAccepted()
+
+ request.response.status = 202
+ return {}
|
{"golden_diff": "diff --git a/kinto/views/flush.py b/kinto/views/flush.py\n--- a/kinto/views/flush.py\n+++ b/kinto/views/flush.py\n@@ -1,5 +1,4 @@\n from cornice import Service\n-from pyramid import httpexceptions\n from pyramid.security import NO_PERMISSION_REQUIRED\n \n from kinto.events import ServerFlushed\n@@ -16,4 +15,6 @@\n request.registry.cache.flush()\n event = ServerFlushed(request)\n request.registry.notify(event)\n- return httpexceptions.HTTPAccepted()\n+\n+ request.response.status = 202\n+ return {}\n", "issue": "__flush__ produces an HTML reponse \nThe response for the flush endpoint is a raw HTML response from Pyramid. I suggest make it a JSON response for compatibility with the rest of the API. Maybe return `{}`?\r\n\r\n```\r\ngsurita-30820:kinto gsurita$ http post http://localhost:8888/v1/__flush__\r\nHTTP/1.1 202 Accepted\r\nContent-Length: 157\r\nContent-Type: text/html; charset=UTF-8\r\nDate: Tue, 21 Feb 2017 13:56:56 GMT\r\nServer: waitress\r\nX-Content-Type-Options: nosniff\r\n\r\n<html>\r\n <head>\r\n <title>202 Accepted</title>\r\n </head>\r\n <body>\r\n <h1>202 Accepted</h1>\r\n The request is accepted for processing.<br/><br/>\r\n\r\n\r\n\r\n </body>\r\n</html>\n__flush__ produces an HTML reponse \nThe response for the flush endpoint is a raw HTML response from Pyramid. I suggest make it a JSON response for compatibility with the rest of the API. Maybe return `{}`?\r\n\r\n```\r\ngsurita-30820:kinto gsurita$ http post http://localhost:8888/v1/__flush__\r\nHTTP/1.1 202 Accepted\r\nContent-Length: 157\r\nContent-Type: text/html; charset=UTF-8\r\nDate: Tue, 21 Feb 2017 13:56:56 GMT\r\nServer: waitress\r\nX-Content-Type-Options: nosniff\r\n\r\n<html>\r\n <head>\r\n <title>202 Accepted</title>\r\n </head>\r\n <body>\r\n <h1>202 Accepted</h1>\r\n The request is accepted for processing.<br/><br/>\r\n\r\n\r\n\r\n </body>\r\n</html>\n", "before_files": [{"content": "from cornice import Service\nfrom pyramid import httpexceptions\nfrom pyramid.security import NO_PERMISSION_REQUIRED\n\nfrom kinto.events import ServerFlushed\n\nflush = Service(name='flush',\n description='Clear database content',\n path='/__flush__')\n\n\[email protected](permission=NO_PERMISSION_REQUIRED)\ndef flush_post(request):\n request.registry.storage.flush()\n request.registry.permission.flush()\n request.registry.cache.flush()\n event = ServerFlushed(request)\n request.registry.notify(event)\n return httpexceptions.HTTPAccepted()\n", "path": "kinto/views/flush.py"}]}
| 1,075 | 131 |
gh_patches_debug_6022
|
rasdani/github-patches
|
git_diff
|
tensorflow__addons-2572
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Documentation for Snake activation function is incorrect
**System information**
- OS Platform and Distribution (e.g., Linux Ubuntu 16.04): NA
- TensorFlow version and how it was installed (source or binary): NA
- TensorFlow-Addons version and how it was installed (source or binary): NA
- Python version: NA
- Is GPU used? (yes/no): NA
**Describe the bug**
Documentation for Snake activation function is incorrect. The current documentation says this:
Ref: https://www.tensorflow.org/addons/api_docs/python/tfa/activations/snake
But, `x` should be out of the fraction to make it consistent with the original paper as well as the code.
Actual:
Reference: https://arxiv.org/abs/2006.08195
**Code to reproduce the issue**
NA
**Other info / logs**
NA
</issue>
<code>
[start of tensorflow_addons/activations/snake.py]
1 # Copyright 2020 The TensorFlow Authors. All Rights Reserved.
2 #
3 # Licensed under the Apache License, Version 2.0 (the "License");
4 # you may not use this file except in compliance with the License.
5 # You may obtain a copy of the License at
6 #
7 # http://www.apache.org/licenses/LICENSE-2.0
8 #
9 # Unless required by applicable law or agreed to in writing, software
10 # distributed under the License is distributed on an "AS IS" BASIS,
11 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 # See the License for the specific language governing permissions and
13 # limitations under the License.
14 # ==============================================================================
15
16 import tensorflow as tf
17
18 from tensorflow_addons.utils import types
19
20
21 @tf.keras.utils.register_keras_serializable(package="Addons")
22 def snake(x: types.TensorLike, frequency: types.Number = 1) -> tf.Tensor:
23 r"""Snake activation to learn periodic functions.
24
25 Computes snake activation:
26
27 $$
28 \mathrm{snake}(x) = \frac{x + (1 - \cos(2 \cdot \mathrm{frequency} \cdot x))}{2 \cdot \mathrm{frequency}}.
29 $$
30
31 See [Neural Networks Fail to Learn Periodic Functions and How to Fix It](https://arxiv.org/abs/2006.08195).
32
33 Usage:
34
35 >>> x = tf.constant([-1.0, 0.0, 1.0])
36 >>> tfa.activations.snake(x)
37 <tf.Tensor: shape=(3,), dtype=float32, numpy=array([-0.29192656, 0. , 1.7080734 ], dtype=float32)>
38
39 Args:
40 x: A `Tensor`.
41 frequency: A scalar, frequency of the periodic part.
42 Returns:
43 A `Tensor`. Has the same type as `x`.
44 """
45 x = tf.convert_to_tensor(x)
46 frequency = tf.cast(frequency, x.dtype)
47
48 return x + (1 - tf.cos(2 * frequency * x)) / (2 * frequency)
49
[end of tensorflow_addons/activations/snake.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/tensorflow_addons/activations/snake.py b/tensorflow_addons/activations/snake.py
--- a/tensorflow_addons/activations/snake.py
+++ b/tensorflow_addons/activations/snake.py
@@ -25,7 +25,7 @@
Computes snake activation:
$$
- \mathrm{snake}(x) = \frac{x + (1 - \cos(2 \cdot \mathrm{frequency} \cdot x))}{2 \cdot \mathrm{frequency}}.
+ \mathrm{snake}(x) = \mathrm{x} + \frac{1 - \cos(2 \cdot \mathrm{frequency} \cdot x)}{2 \cdot \mathrm{frequency}}.
$$
See [Neural Networks Fail to Learn Periodic Functions and How to Fix It](https://arxiv.org/abs/2006.08195).
|
{"golden_diff": "diff --git a/tensorflow_addons/activations/snake.py b/tensorflow_addons/activations/snake.py\n--- a/tensorflow_addons/activations/snake.py\n+++ b/tensorflow_addons/activations/snake.py\n@@ -25,7 +25,7 @@\n Computes snake activation:\n \n $$\n- \\mathrm{snake}(x) = \\frac{x + (1 - \\cos(2 \\cdot \\mathrm{frequency} \\cdot x))}{2 \\cdot \\mathrm{frequency}}.\n+ \\mathrm{snake}(x) = \\mathrm{x} + \\frac{1 - \\cos(2 \\cdot \\mathrm{frequency} \\cdot x)}{2 \\cdot \\mathrm{frequency}}.\n $$\n \n See [Neural Networks Fail to Learn Periodic Functions and How to Fix It](https://arxiv.org/abs/2006.08195).\n", "issue": "Documentation for Snake activation function is incorrect\n**System information**\r\n- OS Platform and Distribution (e.g., Linux Ubuntu 16.04): NA\r\n- TensorFlow version and how it was installed (source or binary): NA \r\n- TensorFlow-Addons version and how it was installed (source or binary): NA\r\n- Python version: NA\r\n- Is GPU used? (yes/no): NA\r\n\r\n**Describe the bug**\r\n\r\nDocumentation for Snake activation function is incorrect. The current documentation says this:\r\n\r\n\r\nRef: https://www.tensorflow.org/addons/api_docs/python/tfa/activations/snake\r\n\r\n\r\nBut, `x` should be out of the fraction to make it consistent with the original paper as well as the code.\r\n\r\nActual: \r\n\r\n\r\nReference: https://arxiv.org/abs/2006.08195\r\n\r\n**Code to reproduce the issue**\r\n\r\nNA\r\n\r\n**Other info / logs**\r\n\r\nNA\r\n\n", "before_files": [{"content": "# Copyright 2020 The TensorFlow Authors. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ==============================================================================\n\nimport tensorflow as tf\n\nfrom tensorflow_addons.utils import types\n\n\[email protected]_keras_serializable(package=\"Addons\")\ndef snake(x: types.TensorLike, frequency: types.Number = 1) -> tf.Tensor:\n r\"\"\"Snake activation to learn periodic functions.\n\n Computes snake activation:\n\n $$\n \\mathrm{snake}(x) = \\frac{x + (1 - \\cos(2 \\cdot \\mathrm{frequency} \\cdot x))}{2 \\cdot \\mathrm{frequency}}.\n $$\n\n See [Neural Networks Fail to Learn Periodic Functions and How to Fix It](https://arxiv.org/abs/2006.08195).\n\n Usage:\n\n >>> x = tf.constant([-1.0, 0.0, 1.0])\n >>> tfa.activations.snake(x)\n <tf.Tensor: shape=(3,), dtype=float32, numpy=array([-0.29192656, 0. , 1.7080734 ], dtype=float32)>\n\n Args:\n x: A `Tensor`.\n frequency: A scalar, frequency of the periodic part.\n Returns:\n A `Tensor`. Has the same type as `x`.\n \"\"\"\n x = tf.convert_to_tensor(x)\n frequency = tf.cast(frequency, x.dtype)\n\n return x + (1 - tf.cos(2 * frequency * x)) / (2 * frequency)\n", "path": "tensorflow_addons/activations/snake.py"}]}
| 1,413 | 205 |
gh_patches_debug_20743
|
rasdani/github-patches
|
git_diff
|
talonhub__community-913
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
'wipe' is a command instead of a name for the backspace key
This is problematic because eg. it means `press wipe` does not work in dictation mode.
</issue>
<code>
[start of code/keys.py]
1 from talon import Context, Module, actions, app
2
3 default_alphabet = "air bat cap drum each fine gust harp sit jury crunch look made near odd pit quench red sun trap urge vest whale plex yank zip".split(
4 " "
5 )
6 letters_string = "abcdefghijklmnopqrstuvwxyz"
7
8 default_digits = "zero one two three four five six seven eight nine".split(" ")
9 numbers = [str(i) for i in range(10)]
10 default_f_digits = (
11 "one two three four five six seven eight nine ten eleven twelve".split(" ")
12 )
13
14 mod = Module()
15 mod.list("letter", desc="The spoken phonetic alphabet")
16 mod.list("symbol_key", desc="All symbols from the keyboard")
17 mod.list("arrow_key", desc="All arrow keys")
18 mod.list("number_key", desc="All number keys")
19 mod.list("modifier_key", desc="All modifier keys")
20 mod.list("function_key", desc="All function keys")
21 mod.list("special_key", desc="All special keys")
22 mod.list("punctuation", desc="words for inserting punctuation into text")
23
24
25 @mod.capture(rule="{self.modifier_key}+")
26 def modifiers(m) -> str:
27 "One or more modifier keys"
28 return "-".join(m.modifier_key_list)
29
30
31 @mod.capture(rule="{self.arrow_key}")
32 def arrow_key(m) -> str:
33 "One directional arrow key"
34 return m.arrow_key
35
36
37 @mod.capture(rule="<self.arrow_key>+")
38 def arrow_keys(m) -> str:
39 "One or more arrow keys separated by a space"
40 return str(m)
41
42
43 @mod.capture(rule="{self.number_key}")
44 def number_key(m) -> str:
45 "One number key"
46 return m.number_key
47
48
49 @mod.capture(rule="{self.letter}")
50 def letter(m) -> str:
51 "One letter key"
52 return m.letter
53
54
55 @mod.capture(rule="{self.special_key}")
56 def special_key(m) -> str:
57 "One special key"
58 return m.special_key
59
60
61 @mod.capture(rule="{self.symbol_key}")
62 def symbol_key(m) -> str:
63 "One symbol key"
64 return m.symbol_key
65
66
67 @mod.capture(rule="{self.function_key}")
68 def function_key(m) -> str:
69 "One function key"
70 return m.function_key
71
72
73 @mod.capture(rule="( <self.letter> | <self.number_key> | <self.symbol_key> )")
74 def any_alphanumeric_key(m) -> str:
75 "any alphanumeric key"
76 return str(m)
77
78
79 @mod.capture(
80 rule="( <self.letter> | <self.number_key> | <self.symbol_key> "
81 "| <self.arrow_key> | <self.function_key> | <self.special_key> )"
82 )
83 def unmodified_key(m) -> str:
84 "A single key with no modifiers"
85 return str(m)
86
87
88 @mod.capture(rule="{self.modifier_key}* <self.unmodified_key>")
89 def key(m) -> str:
90 "A single key with optional modifiers"
91 try:
92 mods = m.modifier_key_list
93 except AttributeError:
94 mods = []
95 return "-".join(mods + [m.unmodified_key])
96
97
98 @mod.capture(rule="<self.key>+")
99 def keys(m) -> str:
100 "A sequence of one or more keys with optional modifiers"
101 return " ".join(m.key_list)
102
103
104 @mod.capture(rule="{self.letter}+")
105 def letters(m) -> str:
106 "Multiple letter keys"
107 return "".join(m.letter_list)
108
109
110 ctx = Context()
111 modifier_keys = {
112 # If you find 'alt' is often misrecognized, try using 'alter'.
113 "alt": "alt", #'alter': 'alt',
114 "control": "ctrl", #'troll': 'ctrl',
115 "shift": "shift", #'sky': 'shift',
116 "super": "super",
117 }
118 if app.platform == "mac":
119 modifier_keys["command"] = "cmd"
120 modifier_keys["option"] = "alt"
121 ctx.lists["self.modifier_key"] = modifier_keys
122 alphabet = dict(zip(default_alphabet, letters_string))
123 ctx.lists["self.letter"] = alphabet
124
125 # `punctuation_words` is for words you want available BOTH in dictation and as key names in command mode.
126 # `symbol_key_words` is for key names that should be available in command mode, but NOT during dictation.
127 punctuation_words = {
128 # TODO: I'm not sure why we need these, I think it has something to do with
129 # Dragon. Possibly it has been fixed by later improvements to talon? -rntz
130 "`": "`",
131 ",": ",", # <== these things
132 "back tick": "`",
133 "grave": "`",
134 "comma": ",",
135 "period": ".",
136 "full stop": ".",
137 "semicolon": ";",
138 "colon": ":",
139 "forward slash": "/",
140 "question mark": "?",
141 "exclamation mark": "!",
142 "exclamation point": "!",
143 "asterisk": "*",
144 "hash sign": "#",
145 "number sign": "#",
146 "percent sign": "%",
147 "at sign": "@",
148 "and sign": "&",
149 "ampersand": "&",
150 # Currencies
151 "dollar sign": "$",
152 "pound sign": "£",
153 }
154 symbol_key_words = {
155 "dot": ".",
156 "point": ".",
157 "quote": "'",
158 "apostrophe": "'",
159 "L square": "[",
160 "left square": "[",
161 "square": "[",
162 "R square": "]",
163 "right square": "]",
164 "slash": "/",
165 "backslash": "\\",
166 "minus": "-",
167 "dash": "-",
168 "equals": "=",
169 "plus": "+",
170 "tilde": "~",
171 "bang": "!",
172 "down score": "_",
173 "underscore": "_",
174 "paren": "(",
175 "L paren": "(",
176 "left paren": "(",
177 "R paren": ")",
178 "right paren": ")",
179 "brace": "{",
180 "left brace": "{",
181 "R brace": "}",
182 "right brace": "}",
183 "angle": "<",
184 "left angle": "<",
185 "less than": "<",
186 "rangle": ">",
187 "R angle": ">",
188 "right angle": ">",
189 "greater than": ">",
190 "star": "*",
191 "hash": "#",
192 "percent": "%",
193 "caret": "^",
194 "amper": "&",
195 "pipe": "|",
196 "dubquote": '"',
197 "double quote": '"',
198 # Currencies
199 "dollar": "$",
200 "pound": "£",
201 }
202
203 # make punctuation words also included in {user.symbol_keys}
204 symbol_key_words.update(punctuation_words)
205 ctx.lists["self.punctuation"] = punctuation_words
206 ctx.lists["self.symbol_key"] = symbol_key_words
207 ctx.lists["self.number_key"] = dict(zip(default_digits, numbers))
208 ctx.lists["self.arrow_key"] = {
209 "down": "down",
210 "left": "left",
211 "right": "right",
212 "up": "up",
213 }
214
215 simple_keys = [
216 "end",
217 "enter",
218 "escape",
219 "home",
220 "insert",
221 "pagedown",
222 "pageup",
223 "space",
224 "tab",
225 ]
226
227 alternate_keys = {
228 "delete": "backspace",
229 "forward delete": "delete",
230 #'junk': 'backspace',
231 "page up": "pageup",
232 "page down": "pagedown",
233 }
234 # mac apparently doesn't have the menu key.
235 if app.platform in ("windows", "linux"):
236 alternate_keys["menu key"] = "menu"
237 alternate_keys["print screen"] = "printscr"
238
239 special_keys = {k: k for k in simple_keys}
240 special_keys.update(alternate_keys)
241 ctx.lists["self.special_key"] = special_keys
242 ctx.lists["self.function_key"] = {
243 f"F {default_f_digits[i]}": f"f{i + 1}" for i in range(12)
244 }
245
246
247 @mod.action_class
248 class Actions:
249 def move_cursor(s: str):
250 """Given a sequence of directions, eg. 'left left up', moves the cursor accordingly using edit.{left,right,up,down}."""
251 for d in s.split():
252 if d in ("left", "right", "up", "down"):
253 getattr(actions.edit, d)()
254 else:
255 raise RuntimeError(f"invalid arrow key: {d}")
256
[end of code/keys.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/code/keys.py b/code/keys.py
--- a/code/keys.py
+++ b/code/keys.py
@@ -155,6 +155,7 @@
"dot": ".",
"point": ".",
"quote": "'",
+ "question": "?",
"apostrophe": "'",
"L square": "[",
"left square": "[",
@@ -178,8 +179,14 @@
"right paren": ")",
"brace": "{",
"left brace": "{",
- "R brace": "}",
+ "brack": "{",
+ "bracket": "{",
+ "left bracket": "{",
+ "r brace": "}",
"right brace": "}",
+ "r brack": "}",
+ "r bracket": "}",
+ "right bracket": "}",
"angle": "<",
"left angle": "<",
"less than": "<",
@@ -225,9 +232,10 @@
]
alternate_keys = {
+ "wipe": "backspace",
"delete": "backspace",
- "forward delete": "delete",
#'junk': 'backspace',
+ "forward delete": "delete",
"page up": "pageup",
"page down": "pagedown",
}
|
{"golden_diff": "diff --git a/code/keys.py b/code/keys.py\n--- a/code/keys.py\n+++ b/code/keys.py\n@@ -155,6 +155,7 @@\n \"dot\": \".\",\n \"point\": \".\",\n \"quote\": \"'\",\n+ \"question\": \"?\",\n \"apostrophe\": \"'\",\n \"L square\": \"[\",\n \"left square\": \"[\",\n@@ -178,8 +179,14 @@\n \"right paren\": \")\",\n \"brace\": \"{\",\n \"left brace\": \"{\",\n- \"R brace\": \"}\",\n+ \"brack\": \"{\",\n+ \"bracket\": \"{\",\n+ \"left bracket\": \"{\",\n+ \"r brace\": \"}\",\n \"right brace\": \"}\",\n+ \"r brack\": \"}\",\n+ \"r bracket\": \"}\",\n+ \"right bracket\": \"}\",\n \"angle\": \"<\",\n \"left angle\": \"<\",\n \"less than\": \"<\",\n@@ -225,9 +232,10 @@\n ]\n \n alternate_keys = {\n+ \"wipe\": \"backspace\",\n \"delete\": \"backspace\",\n- \"forward delete\": \"delete\",\n #'junk': 'backspace',\n+ \"forward delete\": \"delete\",\n \"page up\": \"pageup\",\n \"page down\": \"pagedown\",\n }\n", "issue": "'wipe' is a command instead of a name for the backspace key\nThis is problematic because eg. it means `press wipe` does not work in dictation mode.\n", "before_files": [{"content": "from talon import Context, Module, actions, app\n\ndefault_alphabet = \"air bat cap drum each fine gust harp sit jury crunch look made near odd pit quench red sun trap urge vest whale plex yank zip\".split(\n \" \"\n)\nletters_string = \"abcdefghijklmnopqrstuvwxyz\"\n\ndefault_digits = \"zero one two three four five six seven eight nine\".split(\" \")\nnumbers = [str(i) for i in range(10)]\ndefault_f_digits = (\n \"one two three four five six seven eight nine ten eleven twelve\".split(\" \")\n)\n\nmod = Module()\nmod.list(\"letter\", desc=\"The spoken phonetic alphabet\")\nmod.list(\"symbol_key\", desc=\"All symbols from the keyboard\")\nmod.list(\"arrow_key\", desc=\"All arrow keys\")\nmod.list(\"number_key\", desc=\"All number keys\")\nmod.list(\"modifier_key\", desc=\"All modifier keys\")\nmod.list(\"function_key\", desc=\"All function keys\")\nmod.list(\"special_key\", desc=\"All special keys\")\nmod.list(\"punctuation\", desc=\"words for inserting punctuation into text\")\n\n\[email protected](rule=\"{self.modifier_key}+\")\ndef modifiers(m) -> str:\n \"One or more modifier keys\"\n return \"-\".join(m.modifier_key_list)\n\n\[email protected](rule=\"{self.arrow_key}\")\ndef arrow_key(m) -> str:\n \"One directional arrow key\"\n return m.arrow_key\n\n\[email protected](rule=\"<self.arrow_key>+\")\ndef arrow_keys(m) -> str:\n \"One or more arrow keys separated by a space\"\n return str(m)\n\n\[email protected](rule=\"{self.number_key}\")\ndef number_key(m) -> str:\n \"One number key\"\n return m.number_key\n\n\[email protected](rule=\"{self.letter}\")\ndef letter(m) -> str:\n \"One letter key\"\n return m.letter\n\n\[email protected](rule=\"{self.special_key}\")\ndef special_key(m) -> str:\n \"One special key\"\n return m.special_key\n\n\[email protected](rule=\"{self.symbol_key}\")\ndef symbol_key(m) -> str:\n \"One symbol key\"\n return m.symbol_key\n\n\[email protected](rule=\"{self.function_key}\")\ndef function_key(m) -> str:\n \"One function key\"\n return m.function_key\n\n\[email protected](rule=\"( <self.letter> | <self.number_key> | <self.symbol_key> )\")\ndef any_alphanumeric_key(m) -> str:\n \"any alphanumeric key\"\n return str(m)\n\n\[email protected](\n rule=\"( <self.letter> | <self.number_key> | <self.symbol_key> \"\n \"| <self.arrow_key> | <self.function_key> | <self.special_key> )\"\n)\ndef unmodified_key(m) -> str:\n \"A single key with no modifiers\"\n return str(m)\n\n\[email protected](rule=\"{self.modifier_key}* <self.unmodified_key>\")\ndef key(m) -> str:\n \"A single key with optional modifiers\"\n try:\n mods = m.modifier_key_list\n except AttributeError:\n mods = []\n return \"-\".join(mods + [m.unmodified_key])\n\n\[email protected](rule=\"<self.key>+\")\ndef keys(m) -> str:\n \"A sequence of one or more keys with optional modifiers\"\n return \" \".join(m.key_list)\n\n\[email protected](rule=\"{self.letter}+\")\ndef letters(m) -> str:\n \"Multiple letter keys\"\n return \"\".join(m.letter_list)\n\n\nctx = Context()\nmodifier_keys = {\n # If you find 'alt' is often misrecognized, try using 'alter'.\n \"alt\": \"alt\", #'alter': 'alt',\n \"control\": \"ctrl\", #'troll': 'ctrl',\n \"shift\": \"shift\", #'sky': 'shift',\n \"super\": \"super\",\n}\nif app.platform == \"mac\":\n modifier_keys[\"command\"] = \"cmd\"\n modifier_keys[\"option\"] = \"alt\"\nctx.lists[\"self.modifier_key\"] = modifier_keys\nalphabet = dict(zip(default_alphabet, letters_string))\nctx.lists[\"self.letter\"] = alphabet\n\n# `punctuation_words` is for words you want available BOTH in dictation and as key names in command mode.\n# `symbol_key_words` is for key names that should be available in command mode, but NOT during dictation.\npunctuation_words = {\n # TODO: I'm not sure why we need these, I think it has something to do with\n # Dragon. Possibly it has been fixed by later improvements to talon? -rntz\n \"`\": \"`\",\n \",\": \",\", # <== these things\n \"back tick\": \"`\",\n \"grave\": \"`\",\n \"comma\": \",\",\n \"period\": \".\",\n \"full stop\": \".\",\n \"semicolon\": \";\",\n \"colon\": \":\",\n \"forward slash\": \"/\",\n \"question mark\": \"?\",\n \"exclamation mark\": \"!\",\n \"exclamation point\": \"!\",\n \"asterisk\": \"*\",\n \"hash sign\": \"#\",\n \"number sign\": \"#\",\n \"percent sign\": \"%\",\n \"at sign\": \"@\",\n \"and sign\": \"&\",\n \"ampersand\": \"&\",\n # Currencies\n \"dollar sign\": \"$\",\n \"pound sign\": \"\u00a3\",\n}\nsymbol_key_words = {\n \"dot\": \".\",\n \"point\": \".\",\n \"quote\": \"'\",\n \"apostrophe\": \"'\",\n \"L square\": \"[\",\n \"left square\": \"[\",\n \"square\": \"[\",\n \"R square\": \"]\",\n \"right square\": \"]\",\n \"slash\": \"/\",\n \"backslash\": \"\\\\\",\n \"minus\": \"-\",\n \"dash\": \"-\",\n \"equals\": \"=\",\n \"plus\": \"+\",\n \"tilde\": \"~\",\n \"bang\": \"!\",\n \"down score\": \"_\",\n \"underscore\": \"_\",\n \"paren\": \"(\",\n \"L paren\": \"(\",\n \"left paren\": \"(\",\n \"R paren\": \")\",\n \"right paren\": \")\",\n \"brace\": \"{\",\n \"left brace\": \"{\",\n \"R brace\": \"}\",\n \"right brace\": \"}\",\n \"angle\": \"<\",\n \"left angle\": \"<\",\n \"less than\": \"<\",\n \"rangle\": \">\",\n \"R angle\": \">\",\n \"right angle\": \">\",\n \"greater than\": \">\",\n \"star\": \"*\",\n \"hash\": \"#\",\n \"percent\": \"%\",\n \"caret\": \"^\",\n \"amper\": \"&\",\n \"pipe\": \"|\",\n \"dubquote\": '\"',\n \"double quote\": '\"',\n # Currencies\n \"dollar\": \"$\",\n \"pound\": \"\u00a3\",\n}\n\n# make punctuation words also included in {user.symbol_keys}\nsymbol_key_words.update(punctuation_words)\nctx.lists[\"self.punctuation\"] = punctuation_words\nctx.lists[\"self.symbol_key\"] = symbol_key_words\nctx.lists[\"self.number_key\"] = dict(zip(default_digits, numbers))\nctx.lists[\"self.arrow_key\"] = {\n \"down\": \"down\",\n \"left\": \"left\",\n \"right\": \"right\",\n \"up\": \"up\",\n}\n\nsimple_keys = [\n \"end\",\n \"enter\",\n \"escape\",\n \"home\",\n \"insert\",\n \"pagedown\",\n \"pageup\",\n \"space\",\n \"tab\",\n]\n\nalternate_keys = {\n \"delete\": \"backspace\",\n \"forward delete\": \"delete\",\n #'junk': 'backspace',\n \"page up\": \"pageup\",\n \"page down\": \"pagedown\",\n}\n# mac apparently doesn't have the menu key.\nif app.platform in (\"windows\", \"linux\"):\n alternate_keys[\"menu key\"] = \"menu\"\n alternate_keys[\"print screen\"] = \"printscr\"\n\nspecial_keys = {k: k for k in simple_keys}\nspecial_keys.update(alternate_keys)\nctx.lists[\"self.special_key\"] = special_keys\nctx.lists[\"self.function_key\"] = {\n f\"F {default_f_digits[i]}\": f\"f{i + 1}\" for i in range(12)\n}\n\n\[email protected]_class\nclass Actions:\n def move_cursor(s: str):\n \"\"\"Given a sequence of directions, eg. 'left left up', moves the cursor accordingly using edit.{left,right,up,down}.\"\"\"\n for d in s.split():\n if d in (\"left\", \"right\", \"up\", \"down\"):\n getattr(actions.edit, d)()\n else:\n raise RuntimeError(f\"invalid arrow key: {d}\")\n", "path": "code/keys.py"}]}
| 3,083 | 300 |
gh_patches_debug_442
|
rasdani/github-patches
|
git_diff
|
saleor__saleor-5259
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Customer shouldn't be able to query draft order.
Customer shouldn't be able to query draft order, by id and by token.
</issue>
<code>
[start of saleor/graphql/order/resolvers.py]
1 import graphene
2 import graphene_django_optimizer as gql_optimizer
3
4 from ...order import OrderStatus, models
5 from ...order.events import OrderEvents
6 from ...order.models import OrderEvent
7 from ...order.utils import sum_order_totals
8 from ..utils import filter_by_period, filter_by_query_param, sort_queryset
9 from .enums import OrderStatusFilter
10 from .sorters import OrderSortField
11 from .types import Order
12
13 ORDER_SEARCH_FIELDS = ("id", "discount_name", "token", "user_email", "user__email")
14
15
16 def filter_orders(qs, info, created, status, query):
17 qs = filter_by_query_param(qs, query, ORDER_SEARCH_FIELDS)
18
19 # DEPRECATED: Will be removed in Saleor 2.11, use the `filter` field instead.
20 # filter orders by status
21 if status is not None:
22 if status == OrderStatusFilter.READY_TO_FULFILL:
23 qs = qs.ready_to_fulfill()
24 elif status == OrderStatusFilter.READY_TO_CAPTURE:
25 qs = qs.ready_to_capture()
26
27 # DEPRECATED: Will be removed in Saleor 2.11, use the `filter` field instead.
28 # filter orders by creation date
29 if created is not None:
30 qs = filter_by_period(qs, created, "created")
31
32 return gql_optimizer.query(qs, info)
33
34
35 def resolve_orders(info, created, status, query, sort_by=None):
36 qs = models.Order.objects.confirmed()
37 qs = sort_queryset(qs, sort_by, OrderSortField)
38 return filter_orders(qs, info, created, status, query)
39
40
41 def resolve_draft_orders(info, created, query, sort_by=None):
42 qs = models.Order.objects.drafts()
43 qs = sort_queryset(qs, sort_by, OrderSortField)
44 return filter_orders(qs, info, created, None, query)
45
46
47 def resolve_orders_total(_info, period):
48 qs = models.Order.objects.confirmed().exclude(status=OrderStatus.CANCELED)
49 qs = filter_by_period(qs, period, "created")
50 return sum_order_totals(qs)
51
52
53 def resolve_order(info, order_id):
54 return graphene.Node.get_node_from_global_id(info, order_id, Order)
55
56
57 def resolve_homepage_events():
58 # Filter only selected events to be displayed on homepage.
59 types = [
60 OrderEvents.PLACED,
61 OrderEvents.PLACED_FROM_DRAFT,
62 OrderEvents.ORDER_FULLY_PAID,
63 ]
64 return OrderEvent.objects.filter(type__in=types)
65
66
67 def resolve_order_by_token(token):
68 return models.Order.objects.filter(token=token).first()
69
[end of saleor/graphql/order/resolvers.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/saleor/graphql/order/resolvers.py b/saleor/graphql/order/resolvers.py
--- a/saleor/graphql/order/resolvers.py
+++ b/saleor/graphql/order/resolvers.py
@@ -65,4 +65,8 @@
def resolve_order_by_token(token):
- return models.Order.objects.filter(token=token).first()
+ return (
+ models.Order.objects.exclude(status=OrderStatus.DRAFT)
+ .filter(token=token)
+ .first()
+ )
|
{"golden_diff": "diff --git a/saleor/graphql/order/resolvers.py b/saleor/graphql/order/resolvers.py\n--- a/saleor/graphql/order/resolvers.py\n+++ b/saleor/graphql/order/resolvers.py\n@@ -65,4 +65,8 @@\n \n \n def resolve_order_by_token(token):\n- return models.Order.objects.filter(token=token).first()\n+ return (\n+ models.Order.objects.exclude(status=OrderStatus.DRAFT)\n+ .filter(token=token)\n+ .first()\n+ )\n", "issue": "Customer shouldn't be able to query draft order. \nCustomer shouldn't be able to query draft order, by id and by token. \n", "before_files": [{"content": "import graphene\nimport graphene_django_optimizer as gql_optimizer\n\nfrom ...order import OrderStatus, models\nfrom ...order.events import OrderEvents\nfrom ...order.models import OrderEvent\nfrom ...order.utils import sum_order_totals\nfrom ..utils import filter_by_period, filter_by_query_param, sort_queryset\nfrom .enums import OrderStatusFilter\nfrom .sorters import OrderSortField\nfrom .types import Order\n\nORDER_SEARCH_FIELDS = (\"id\", \"discount_name\", \"token\", \"user_email\", \"user__email\")\n\n\ndef filter_orders(qs, info, created, status, query):\n qs = filter_by_query_param(qs, query, ORDER_SEARCH_FIELDS)\n\n # DEPRECATED: Will be removed in Saleor 2.11, use the `filter` field instead.\n # filter orders by status\n if status is not None:\n if status == OrderStatusFilter.READY_TO_FULFILL:\n qs = qs.ready_to_fulfill()\n elif status == OrderStatusFilter.READY_TO_CAPTURE:\n qs = qs.ready_to_capture()\n\n # DEPRECATED: Will be removed in Saleor 2.11, use the `filter` field instead.\n # filter orders by creation date\n if created is not None:\n qs = filter_by_period(qs, created, \"created\")\n\n return gql_optimizer.query(qs, info)\n\n\ndef resolve_orders(info, created, status, query, sort_by=None):\n qs = models.Order.objects.confirmed()\n qs = sort_queryset(qs, sort_by, OrderSortField)\n return filter_orders(qs, info, created, status, query)\n\n\ndef resolve_draft_orders(info, created, query, sort_by=None):\n qs = models.Order.objects.drafts()\n qs = sort_queryset(qs, sort_by, OrderSortField)\n return filter_orders(qs, info, created, None, query)\n\n\ndef resolve_orders_total(_info, period):\n qs = models.Order.objects.confirmed().exclude(status=OrderStatus.CANCELED)\n qs = filter_by_period(qs, period, \"created\")\n return sum_order_totals(qs)\n\n\ndef resolve_order(info, order_id):\n return graphene.Node.get_node_from_global_id(info, order_id, Order)\n\n\ndef resolve_homepage_events():\n # Filter only selected events to be displayed on homepage.\n types = [\n OrderEvents.PLACED,\n OrderEvents.PLACED_FROM_DRAFT,\n OrderEvents.ORDER_FULLY_PAID,\n ]\n return OrderEvent.objects.filter(type__in=types)\n\n\ndef resolve_order_by_token(token):\n return models.Order.objects.filter(token=token).first()\n", "path": "saleor/graphql/order/resolvers.py"}]}
| 1,261 | 110 |
gh_patches_debug_2001
|
rasdani/github-patches
|
git_diff
|
pre-commit__pre-commit-948
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Support GIT_SSH_COMMAND
Currently, `GIT_SSH` is supported for overriding the git command, but it is is sightly less ergonomic than `GIT_SSH_COMMAND` since it requires file. Adding support for passing `GIT_SSH_COMMAND` to git commands would obviate the need for creating a new file when you want to change the ssh command.
</issue>
<code>
[start of pre_commit/git.py]
1 from __future__ import unicode_literals
2
3 import logging
4 import os.path
5 import sys
6
7 from pre_commit.util import cmd_output
8
9
10 logger = logging.getLogger(__name__)
11
12
13 def zsplit(s):
14 s = s.strip('\0')
15 if s:
16 return s.split('\0')
17 else:
18 return []
19
20
21 def no_git_env():
22 # Too many bugs dealing with environment variables and GIT:
23 # https://github.com/pre-commit/pre-commit/issues/300
24 # In git 2.6.3 (maybe others), git exports GIT_WORK_TREE while running
25 # pre-commit hooks
26 # In git 1.9.1 (maybe others), git exports GIT_DIR and GIT_INDEX_FILE
27 # while running pre-commit hooks in submodules.
28 # GIT_DIR: Causes git clone to clone wrong thing
29 # GIT_INDEX_FILE: Causes 'error invalid object ...' during commit
30 return {
31 k: v for k, v in os.environ.items()
32 if not k.startswith('GIT_') or k in {'GIT_SSH'}
33 }
34
35
36 def get_root():
37 return cmd_output('git', 'rev-parse', '--show-toplevel')[1].strip()
38
39
40 def get_git_dir(git_root='.'):
41 opts = ('--git-common-dir', '--git-dir')
42 _, out, _ = cmd_output('git', 'rev-parse', *opts, cwd=git_root)
43 for line, opt in zip(out.splitlines(), opts):
44 if line != opt: # pragma: no branch (git < 2.5)
45 return os.path.normpath(os.path.join(git_root, line))
46 else:
47 raise AssertionError('unreachable: no git dir')
48
49
50 def get_remote_url(git_root):
51 ret = cmd_output('git', 'config', 'remote.origin.url', cwd=git_root)[1]
52 return ret.strip()
53
54
55 def is_in_merge_conflict():
56 git_dir = get_git_dir('.')
57 return (
58 os.path.exists(os.path.join(git_dir, 'MERGE_MSG')) and
59 os.path.exists(os.path.join(git_dir, 'MERGE_HEAD'))
60 )
61
62
63 def parse_merge_msg_for_conflicts(merge_msg):
64 # Conflicted files start with tabs
65 return [
66 line.lstrip(b'#').strip().decode('UTF-8')
67 for line in merge_msg.splitlines()
68 # '#\t' for git 2.4.1
69 if line.startswith((b'\t', b'#\t'))
70 ]
71
72
73 def get_conflicted_files():
74 logger.info('Checking merge-conflict files only.')
75 # Need to get the conflicted files from the MERGE_MSG because they could
76 # have resolved the conflict by choosing one side or the other
77 with open(os.path.join(get_git_dir('.'), 'MERGE_MSG'), 'rb') as f:
78 merge_msg = f.read()
79 merge_conflict_filenames = parse_merge_msg_for_conflicts(merge_msg)
80
81 # This will get the rest of the changes made after the merge.
82 # If they resolved the merge conflict by choosing a mesh of both sides
83 # this will also include the conflicted files
84 tree_hash = cmd_output('git', 'write-tree')[1].strip()
85 merge_diff_filenames = zsplit(cmd_output(
86 'git', 'diff', '--name-only', '--no-ext-diff', '-z',
87 '-m', tree_hash, 'HEAD', 'MERGE_HEAD',
88 )[1])
89 return set(merge_conflict_filenames) | set(merge_diff_filenames)
90
91
92 def get_staged_files():
93 return zsplit(cmd_output(
94 'git', 'diff', '--staged', '--name-only', '--no-ext-diff', '-z',
95 # Everything except for D
96 '--diff-filter=ACMRTUXB',
97 )[1])
98
99
100 def intent_to_add_files():
101 _, stdout_binary, _ = cmd_output('git', 'status', '--porcelain', '-z')
102 parts = list(reversed(zsplit(stdout_binary)))
103 intent_to_add = []
104 while parts:
105 line = parts.pop()
106 status, filename = line[:3], line[3:]
107 if status[0] in {'C', 'R'}: # renames / moves have an additional arg
108 parts.pop()
109 if status[1] == 'A':
110 intent_to_add.append(filename)
111 return intent_to_add
112
113
114 def get_all_files():
115 return zsplit(cmd_output('git', 'ls-files', '-z')[1])
116
117
118 def get_changed_files(new, old):
119 return zsplit(cmd_output(
120 'git', 'diff', '--name-only', '--no-ext-diff', '-z',
121 '{}...{}'.format(old, new),
122 )[1])
123
124
125 def head_rev(remote):
126 _, out, _ = cmd_output('git', 'ls-remote', '--exit-code', remote, 'HEAD')
127 return out.split()[0]
128
129
130 def has_diff(*args, **kwargs):
131 repo = kwargs.pop('repo', '.')
132 assert not kwargs, kwargs
133 cmd = ('git', 'diff', '--quiet', '--no-ext-diff') + args
134 return cmd_output(*cmd, cwd=repo, retcode=None)[0]
135
136
137 def commit(repo='.'):
138 env = no_git_env()
139 name, email = 'pre-commit', '[email protected]'
140 env['GIT_AUTHOR_NAME'] = env['GIT_COMMITTER_NAME'] = name
141 env['GIT_AUTHOR_EMAIL'] = env['GIT_COMMITTER_EMAIL'] = email
142 cmd = ('git', 'commit', '--no-edit', '--no-gpg-sign', '-n', '-minit')
143 cmd_output(*cmd, cwd=repo, env=env)
144
145
146 def git_path(name, repo='.'):
147 _, out, _ = cmd_output('git', 'rev-parse', '--git-path', name, cwd=repo)
148 return os.path.join(repo, out.strip())
149
150
151 def check_for_cygwin_mismatch():
152 """See https://github.com/pre-commit/pre-commit/issues/354"""
153 if sys.platform in ('cygwin', 'win32'): # pragma: no cover (windows)
154 is_cygwin_python = sys.platform == 'cygwin'
155 toplevel = cmd_output('git', 'rev-parse', '--show-toplevel')[1]
156 is_cygwin_git = toplevel.startswith('/')
157
158 if is_cygwin_python ^ is_cygwin_git:
159 exe_type = {True: '(cygwin)', False: '(windows)'}
160 logger.warn(
161 'pre-commit has detected a mix of cygwin python / git\n'
162 'This combination is not supported, it is likely you will '
163 'receive an error later in the program.\n'
164 'Make sure to use cygwin git+python while using cygwin\n'
165 'These can be installed through the cygwin installer.\n'
166 ' - python {}\n'
167 ' - git {}\n'.format(
168 exe_type[is_cygwin_python], exe_type[is_cygwin_git],
169 ),
170 )
171
[end of pre_commit/git.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/pre_commit/git.py b/pre_commit/git.py
--- a/pre_commit/git.py
+++ b/pre_commit/git.py
@@ -29,7 +29,7 @@
# GIT_INDEX_FILE: Causes 'error invalid object ...' during commit
return {
k: v for k, v in os.environ.items()
- if not k.startswith('GIT_') or k in {'GIT_SSH'}
+ if not k.startswith('GIT_') or k in {'GIT_SSH', 'GIT_SSH_COMMAND'}
}
|
{"golden_diff": "diff --git a/pre_commit/git.py b/pre_commit/git.py\n--- a/pre_commit/git.py\n+++ b/pre_commit/git.py\n@@ -29,7 +29,7 @@\n # GIT_INDEX_FILE: Causes 'error invalid object ...' during commit\n return {\n k: v for k, v in os.environ.items()\n- if not k.startswith('GIT_') or k in {'GIT_SSH'}\n+ if not k.startswith('GIT_') or k in {'GIT_SSH', 'GIT_SSH_COMMAND'}\n }\n", "issue": "Support GIT_SSH_COMMAND\nCurrently, `GIT_SSH` is supported for overriding the git command, but it is is sightly less ergonomic than `GIT_SSH_COMMAND` since it requires file. Adding support for passing `GIT_SSH_COMMAND` to git commands would obviate the need for creating a new file when you want to change the ssh command.\n", "before_files": [{"content": "from __future__ import unicode_literals\n\nimport logging\nimport os.path\nimport sys\n\nfrom pre_commit.util import cmd_output\n\n\nlogger = logging.getLogger(__name__)\n\n\ndef zsplit(s):\n s = s.strip('\\0')\n if s:\n return s.split('\\0')\n else:\n return []\n\n\ndef no_git_env():\n # Too many bugs dealing with environment variables and GIT:\n # https://github.com/pre-commit/pre-commit/issues/300\n # In git 2.6.3 (maybe others), git exports GIT_WORK_TREE while running\n # pre-commit hooks\n # In git 1.9.1 (maybe others), git exports GIT_DIR and GIT_INDEX_FILE\n # while running pre-commit hooks in submodules.\n # GIT_DIR: Causes git clone to clone wrong thing\n # GIT_INDEX_FILE: Causes 'error invalid object ...' during commit\n return {\n k: v for k, v in os.environ.items()\n if not k.startswith('GIT_') or k in {'GIT_SSH'}\n }\n\n\ndef get_root():\n return cmd_output('git', 'rev-parse', '--show-toplevel')[1].strip()\n\n\ndef get_git_dir(git_root='.'):\n opts = ('--git-common-dir', '--git-dir')\n _, out, _ = cmd_output('git', 'rev-parse', *opts, cwd=git_root)\n for line, opt in zip(out.splitlines(), opts):\n if line != opt: # pragma: no branch (git < 2.5)\n return os.path.normpath(os.path.join(git_root, line))\n else:\n raise AssertionError('unreachable: no git dir')\n\n\ndef get_remote_url(git_root):\n ret = cmd_output('git', 'config', 'remote.origin.url', cwd=git_root)[1]\n return ret.strip()\n\n\ndef is_in_merge_conflict():\n git_dir = get_git_dir('.')\n return (\n os.path.exists(os.path.join(git_dir, 'MERGE_MSG')) and\n os.path.exists(os.path.join(git_dir, 'MERGE_HEAD'))\n )\n\n\ndef parse_merge_msg_for_conflicts(merge_msg):\n # Conflicted files start with tabs\n return [\n line.lstrip(b'#').strip().decode('UTF-8')\n for line in merge_msg.splitlines()\n # '#\\t' for git 2.4.1\n if line.startswith((b'\\t', b'#\\t'))\n ]\n\n\ndef get_conflicted_files():\n logger.info('Checking merge-conflict files only.')\n # Need to get the conflicted files from the MERGE_MSG because they could\n # have resolved the conflict by choosing one side or the other\n with open(os.path.join(get_git_dir('.'), 'MERGE_MSG'), 'rb') as f:\n merge_msg = f.read()\n merge_conflict_filenames = parse_merge_msg_for_conflicts(merge_msg)\n\n # This will get the rest of the changes made after the merge.\n # If they resolved the merge conflict by choosing a mesh of both sides\n # this will also include the conflicted files\n tree_hash = cmd_output('git', 'write-tree')[1].strip()\n merge_diff_filenames = zsplit(cmd_output(\n 'git', 'diff', '--name-only', '--no-ext-diff', '-z',\n '-m', tree_hash, 'HEAD', 'MERGE_HEAD',\n )[1])\n return set(merge_conflict_filenames) | set(merge_diff_filenames)\n\n\ndef get_staged_files():\n return zsplit(cmd_output(\n 'git', 'diff', '--staged', '--name-only', '--no-ext-diff', '-z',\n # Everything except for D\n '--diff-filter=ACMRTUXB',\n )[1])\n\n\ndef intent_to_add_files():\n _, stdout_binary, _ = cmd_output('git', 'status', '--porcelain', '-z')\n parts = list(reversed(zsplit(stdout_binary)))\n intent_to_add = []\n while parts:\n line = parts.pop()\n status, filename = line[:3], line[3:]\n if status[0] in {'C', 'R'}: # renames / moves have an additional arg\n parts.pop()\n if status[1] == 'A':\n intent_to_add.append(filename)\n return intent_to_add\n\n\ndef get_all_files():\n return zsplit(cmd_output('git', 'ls-files', '-z')[1])\n\n\ndef get_changed_files(new, old):\n return zsplit(cmd_output(\n 'git', 'diff', '--name-only', '--no-ext-diff', '-z',\n '{}...{}'.format(old, new),\n )[1])\n\n\ndef head_rev(remote):\n _, out, _ = cmd_output('git', 'ls-remote', '--exit-code', remote, 'HEAD')\n return out.split()[0]\n\n\ndef has_diff(*args, **kwargs):\n repo = kwargs.pop('repo', '.')\n assert not kwargs, kwargs\n cmd = ('git', 'diff', '--quiet', '--no-ext-diff') + args\n return cmd_output(*cmd, cwd=repo, retcode=None)[0]\n\n\ndef commit(repo='.'):\n env = no_git_env()\n name, email = 'pre-commit', '[email protected]'\n env['GIT_AUTHOR_NAME'] = env['GIT_COMMITTER_NAME'] = name\n env['GIT_AUTHOR_EMAIL'] = env['GIT_COMMITTER_EMAIL'] = email\n cmd = ('git', 'commit', '--no-edit', '--no-gpg-sign', '-n', '-minit')\n cmd_output(*cmd, cwd=repo, env=env)\n\n\ndef git_path(name, repo='.'):\n _, out, _ = cmd_output('git', 'rev-parse', '--git-path', name, cwd=repo)\n return os.path.join(repo, out.strip())\n\n\ndef check_for_cygwin_mismatch():\n \"\"\"See https://github.com/pre-commit/pre-commit/issues/354\"\"\"\n if sys.platform in ('cygwin', 'win32'): # pragma: no cover (windows)\n is_cygwin_python = sys.platform == 'cygwin'\n toplevel = cmd_output('git', 'rev-parse', '--show-toplevel')[1]\n is_cygwin_git = toplevel.startswith('/')\n\n if is_cygwin_python ^ is_cygwin_git:\n exe_type = {True: '(cygwin)', False: '(windows)'}\n logger.warn(\n 'pre-commit has detected a mix of cygwin python / git\\n'\n 'This combination is not supported, it is likely you will '\n 'receive an error later in the program.\\n'\n 'Make sure to use cygwin git+python while using cygwin\\n'\n 'These can be installed through the cygwin installer.\\n'\n ' - python {}\\n'\n ' - git {}\\n'.format(\n exe_type[is_cygwin_python], exe_type[is_cygwin_git],\n ),\n )\n", "path": "pre_commit/git.py"}]}
| 2,542 | 116 |
gh_patches_debug_14594
|
rasdani/github-patches
|
git_diff
|
microsoft__Qcodes-54
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
version requirement of dependencies
When I try installing Qcodes with `python setup.py develop` I get an error:
```
Traceback (most recent call last):
File ".\setup.py", line 81, in <module>
if StrictVersion(module.__version__) < StrictVersion(min_version):
File "C:\anaconda\lib\distutils\version.py", line 40, in __init__
self.parse(vstring)
File "C:\anaconda\lib\distutils\version.py", line 137, in parse
raise ValueError("invalid version number '%s'" % vstring)
ValueError: invalid version number 'pyqtgraph-0.9.10-100-gf224936'
```
So I have a specific branch of pyqtgraph installed that has a somehow funny version number, but it is larger than the required `0.9.10`.
Is there any way to make this work without swiching the pyqtgraph branch and then switching it back?
</issue>
<code>
[start of setup.py]
1 from setuptools import setup, find_packages
2 from distutils.version import StrictVersion
3 from importlib import import_module
4
5
6 def readme():
7 with open('README.md') as f:
8 return f.read()
9
10 extras = {
11 'MatPlot': ('matplotlib', '1.5'),
12 'QtPlot': ('pyqtgraph', '0.9.10'),
13 'coverage tests': ('coverage', '4.0')
14 }
15 extras_require = {k: '>='.join(v) for k, v in extras.items()}
16
17 setup(name='qcodes',
18 version='0.1.0',
19 use_2to3=False,
20 author='Alex Johnson',
21 author_email='[email protected]',
22 maintainer='Alex Johnson',
23 maintainer_email='[email protected]',
24 description='Python-based data acquisition framework developed by the '
25 'Copenhagen / Delft / Sydney / Microsoft quantum computing '
26 'consortium',
27 long_description=readme(),
28 url='https://github.com/qdev-dk/Qcodes',
29 classifiers=[
30 'Development Status :: 3 - Alpha',
31 'Intended Audience :: Science/Research',
32 'Programming Language :: Python :: 3 :: Only',
33 'Programming Language :: Python :: 3.3',
34 'Programming Language :: Python :: 3.4',
35 'Programming Language :: Python :: 3.5',
36 'Topic :: Scientific/Engineering'
37 ],
38 license='Private',
39 # if we want to install without tests:
40 # packages=find_packages(exclude=["*.tests", "tests"]),
41 packages=find_packages(),
42 package_data={'qcodes': ['widgets/*.js', 'widgets/*.css']},
43 install_requires=[
44 'numpy>=1.10',
45 'pyvisa>=1.8',
46 'IPython>=4.0',
47 'ipywidgets>=4.1',
48 # nose and coverage are only for tests, but we'd like to encourage
49 # people to run tests!
50 # coverage has a problem with setuptools on Windows, moved to extras
51 'nose>=1.3'
52 ],
53 test_suite='qcodes.tests',
54 extras_require=extras_require,
55 # I think the only part of qcodes that would care about zip_safe
56 # is utils.helpers.reload_code; users of a zip-installed package
57 # shouldn't be needing to do this anyway, but we should test first.
58 zip_safe=False)
59
60 version_template = '''
61 *****
62 ***** package {0} must be at least version {1}.
63 ***** Please upgrade it (pip install -U {0} or conda install {0})
64 ***** in order to use {2}
65 *****
66 '''
67
68 missing_template = '''
69 *****
70 ***** package {0} not found
71 ***** Please install it (pip install {0} or conda install {0})
72 ***** in order to use {1}
73 *****
74 '''
75
76 # now test the versions of extras
77 for extra, (module_name, min_version) in extras.items():
78 try:
79 module = import_module(module_name)
80 if StrictVersion(module.__version__) < StrictVersion(min_version):
81 print(version_template.format(module_name, min_version, extra))
82 except ImportError:
83 print(missing_template.format(module_name, extra))
84
[end of setup.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -73,6 +73,15 @@
*****
'''
+valueerror_template = '''
+*****
+***** package {0} version not understood
+***** Please make sure the installed version ({1})
+***** is compatible with the minimum required version ({2})
+***** in order to use {3}
+*****
+'''
+
# now test the versions of extras
for extra, (module_name, min_version) in extras.items():
try:
@@ -81,3 +90,5 @@
print(version_template.format(module_name, min_version, extra))
except ImportError:
print(missing_template.format(module_name, extra))
+ except ValueError:
+ print(valueerror_template.format(module_name, module.__version__, min_version, extra))
|
{"golden_diff": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -73,6 +73,15 @@\n *****\n '''\n \n+valueerror_template = '''\n+*****\n+***** package {0} version not understood\n+***** Please make sure the installed version ({1})\n+***** is compatible with the minimum required version ({2})\n+***** in order to use {3}\n+*****\n+'''\n+\n # now test the versions of extras\n for extra, (module_name, min_version) in extras.items():\n try:\n@@ -81,3 +90,5 @@\n print(version_template.format(module_name, min_version, extra))\n except ImportError:\n print(missing_template.format(module_name, extra))\n+ except ValueError:\n+ print(valueerror_template.format(module_name, module.__version__, min_version, extra))\n", "issue": "version requirement of dependencies\nWhen I try installing Qcodes with `python setup.py develop` I get an error:\n\n```\nTraceback (most recent call last):\n File \".\\setup.py\", line 81, in <module>\n if StrictVersion(module.__version__) < StrictVersion(min_version):\n File \"C:\\anaconda\\lib\\distutils\\version.py\", line 40, in __init__\n self.parse(vstring)\n File \"C:\\anaconda\\lib\\distutils\\version.py\", line 137, in parse\n raise ValueError(\"invalid version number '%s'\" % vstring)\nValueError: invalid version number 'pyqtgraph-0.9.10-100-gf224936'\n```\n\nSo I have a specific branch of pyqtgraph installed that has a somehow funny version number, but it is larger than the required `0.9.10`.\n\nIs there any way to make this work without swiching the pyqtgraph branch and then switching it back?\n\n", "before_files": [{"content": "from setuptools import setup, find_packages\nfrom distutils.version import StrictVersion\nfrom importlib import import_module\n\n\ndef readme():\n with open('README.md') as f:\n return f.read()\n\nextras = {\n 'MatPlot': ('matplotlib', '1.5'),\n 'QtPlot': ('pyqtgraph', '0.9.10'),\n 'coverage tests': ('coverage', '4.0')\n}\nextras_require = {k: '>='.join(v) for k, v in extras.items()}\n\nsetup(name='qcodes',\n version='0.1.0',\n use_2to3=False,\n author='Alex Johnson',\n author_email='[email protected]',\n maintainer='Alex Johnson',\n maintainer_email='[email protected]',\n description='Python-based data acquisition framework developed by the '\n 'Copenhagen / Delft / Sydney / Microsoft quantum computing '\n 'consortium',\n long_description=readme(),\n url='https://github.com/qdev-dk/Qcodes',\n classifiers=[\n 'Development Status :: 3 - Alpha',\n 'Intended Audience :: Science/Research',\n 'Programming Language :: Python :: 3 :: Only',\n 'Programming Language :: Python :: 3.3',\n 'Programming Language :: Python :: 3.4',\n 'Programming Language :: Python :: 3.5',\n 'Topic :: Scientific/Engineering'\n ],\n license='Private',\n # if we want to install without tests:\n # packages=find_packages(exclude=[\"*.tests\", \"tests\"]),\n packages=find_packages(),\n package_data={'qcodes': ['widgets/*.js', 'widgets/*.css']},\n install_requires=[\n 'numpy>=1.10',\n 'pyvisa>=1.8',\n 'IPython>=4.0',\n 'ipywidgets>=4.1',\n # nose and coverage are only for tests, but we'd like to encourage\n # people to run tests!\n # coverage has a problem with setuptools on Windows, moved to extras\n 'nose>=1.3'\n ],\n test_suite='qcodes.tests',\n extras_require=extras_require,\n # I think the only part of qcodes that would care about zip_safe\n # is utils.helpers.reload_code; users of a zip-installed package\n # shouldn't be needing to do this anyway, but we should test first.\n zip_safe=False)\n\nversion_template = '''\n*****\n***** package {0} must be at least version {1}.\n***** Please upgrade it (pip install -U {0} or conda install {0})\n***** in order to use {2}\n*****\n'''\n\nmissing_template = '''\n*****\n***** package {0} not found\n***** Please install it (pip install {0} or conda install {0})\n***** in order to use {1}\n*****\n'''\n\n# now test the versions of extras\nfor extra, (module_name, min_version) in extras.items():\n try:\n module = import_module(module_name)\n if StrictVersion(module.__version__) < StrictVersion(min_version):\n print(version_template.format(module_name, min_version, extra))\n except ImportError:\n print(missing_template.format(module_name, extra))\n", "path": "setup.py"}]}
| 1,597 | 181 |
gh_patches_debug_27307
|
rasdani/github-patches
|
git_diff
|
qutebrowser__qutebrowser-2873
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
:completion-item-del with :bookmark-load/:quickmark-load
Ctrl-D should also delete quickmarks/bookmarks with `:bookmark-load` and `:quickmark-load` (it also doesn't on v0.11.0)
cc @rcorre
</issue>
<code>
[start of qutebrowser/completion/models/miscmodels.py]
1 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
2
3 # Copyright 2014-2017 Florian Bruhin (The Compiler) <[email protected]>
4 #
5 # This file is part of qutebrowser.
6 #
7 # qutebrowser is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
11 #
12 # qutebrowser is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
16 #
17 # You should have received a copy of the GNU General Public License
18 # along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.
19
20 """Functions that return miscellaneous completion models."""
21
22 from qutebrowser.config import config, configdata
23 from qutebrowser.utils import objreg, log
24 from qutebrowser.commands import cmdutils
25 from qutebrowser.completion.models import completionmodel, listcategory
26
27
28 def command():
29 """A CompletionModel filled with non-hidden commands and descriptions."""
30 model = completionmodel.CompletionModel(column_widths=(20, 60, 20))
31 cmdlist = _get_cmd_completions(include_aliases=True, include_hidden=False)
32 model.add_category(listcategory.ListCategory("Commands", cmdlist))
33 return model
34
35
36 def helptopic():
37 """A CompletionModel filled with help topics."""
38 model = completionmodel.CompletionModel()
39
40 cmdlist = _get_cmd_completions(include_aliases=False, include_hidden=True,
41 prefix=':')
42 settings = []
43 for sectname, sectdata in configdata.DATA.items():
44 for optname in sectdata:
45 try:
46 desc = sectdata.descriptions[optname]
47 except (KeyError, AttributeError):
48 # Some stuff (especially ValueList items) don't have a
49 # description.
50 desc = ""
51 else:
52 desc = desc.splitlines()[0]
53 name = '{}->{}'.format(sectname, optname)
54 settings.append((name, desc))
55
56 model.add_category(listcategory.ListCategory("Commands", cmdlist))
57 model.add_category(listcategory.ListCategory("Settings", settings))
58 return model
59
60
61 def quickmark():
62 """A CompletionModel filled with all quickmarks."""
63 model = completionmodel.CompletionModel(column_widths=(30, 70, 0))
64 marks = objreg.get('quickmark-manager').marks.items()
65 model.add_category(listcategory.ListCategory('Quickmarks', marks))
66 return model
67
68
69 def bookmark():
70 """A CompletionModel filled with all bookmarks."""
71 model = completionmodel.CompletionModel(column_widths=(30, 70, 0))
72 marks = objreg.get('bookmark-manager').marks.items()
73 model.add_category(listcategory.ListCategory('Bookmarks', marks))
74 return model
75
76
77 def session():
78 """A CompletionModel filled with session names."""
79 model = completionmodel.CompletionModel()
80 try:
81 manager = objreg.get('session-manager')
82 sessions = ((name,) for name in manager.list_sessions()
83 if not name.startswith('_'))
84 model.add_category(listcategory.ListCategory("Sessions", sessions))
85 except OSError:
86 log.completion.exception("Failed to list sessions!")
87 return model
88
89
90 def buffer():
91 """A model to complete on open tabs across all windows.
92
93 Used for switching the buffer command.
94 """
95 def delete_buffer(data):
96 """Close the selected tab."""
97 win_id, tab_index = data[0].split('/')
98 tabbed_browser = objreg.get('tabbed-browser', scope='window',
99 window=int(win_id))
100 tabbed_browser.on_tab_close_requested(int(tab_index) - 1)
101
102 model = completionmodel.CompletionModel(column_widths=(6, 40, 54))
103
104 for win_id in objreg.window_registry:
105 tabbed_browser = objreg.get('tabbed-browser', scope='window',
106 window=win_id)
107 if tabbed_browser.shutting_down:
108 continue
109 tabs = []
110 for idx in range(tabbed_browser.count()):
111 tab = tabbed_browser.widget(idx)
112 tabs.append(("{}/{}".format(win_id, idx + 1),
113 tab.url().toDisplayString(),
114 tabbed_browser.page_title(idx)))
115 cat = listcategory.ListCategory("{}".format(win_id), tabs,
116 delete_func=delete_buffer)
117 model.add_category(cat)
118
119 return model
120
121
122 def bind(key):
123 """A CompletionModel filled with all bindable commands and descriptions.
124
125 Args:
126 key: the key being bound.
127 """
128 model = completionmodel.CompletionModel(column_widths=(20, 60, 20))
129 cmd_text = objreg.get('key-config').get_bindings_for('normal').get(key)
130
131 if cmd_text:
132 cmd_name = cmd_text.split(' ')[0]
133 cmd = cmdutils.cmd_dict.get(cmd_name)
134 data = [(cmd_text, cmd.desc, key)]
135 model.add_category(listcategory.ListCategory("Current", data))
136
137 cmdlist = _get_cmd_completions(include_hidden=True, include_aliases=True)
138 model.add_category(listcategory.ListCategory("Commands", cmdlist))
139 return model
140
141
142 def _get_cmd_completions(include_hidden, include_aliases, prefix=''):
143 """Get a list of completions info for commands, sorted by name.
144
145 Args:
146 include_hidden: True to include commands annotated with hide=True.
147 include_aliases: True to include command aliases.
148 prefix: String to append to the command name.
149
150 Return: A list of tuples of form (name, description, bindings).
151 """
152 assert cmdutils.cmd_dict
153 cmdlist = []
154 cmd_to_keys = objreg.get('key-config').get_reverse_bindings_for('normal')
155 for obj in set(cmdutils.cmd_dict.values()):
156 hide_debug = obj.debug and not objreg.get('args').debug
157 hide_hidden = obj.hide and not include_hidden
158 if not (hide_debug or hide_hidden or obj.deprecated):
159 bindings = ', '.join(cmd_to_keys.get(obj.name, []))
160 cmdlist.append((prefix + obj.name, obj.desc, bindings))
161
162 if include_aliases:
163 for name, cmd in config.section('aliases').items():
164 bindings = ', '.join(cmd_to_keys.get(name, []))
165 cmdlist.append((name, "Alias for '{}'".format(cmd), bindings))
166
167 return cmdlist
168
[end of qutebrowser/completion/models/miscmodels.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/qutebrowser/completion/models/miscmodels.py b/qutebrowser/completion/models/miscmodels.py
--- a/qutebrowser/completion/models/miscmodels.py
+++ b/qutebrowser/completion/models/miscmodels.py
@@ -60,17 +60,33 @@
def quickmark():
"""A CompletionModel filled with all quickmarks."""
+ def delete(data):
+ """Delete a quickmark from the completion menu."""
+ name = data[0]
+ quickmark_manager = objreg.get('quickmark-manager')
+ log.completion.debug('Deleting quickmark {}'.format(name))
+ quickmark_manager.delete(name)
+
model = completionmodel.CompletionModel(column_widths=(30, 70, 0))
marks = objreg.get('quickmark-manager').marks.items()
- model.add_category(listcategory.ListCategory('Quickmarks', marks))
+ model.add_category(listcategory.ListCategory('Quickmarks', marks,
+ delete_func=delete))
return model
def bookmark():
"""A CompletionModel filled with all bookmarks."""
+ def delete(data):
+ """Delete a bookmark from the completion menu."""
+ urlstr = data[0]
+ log.completion.debug('Deleting bookmark {}'.format(urlstr))
+ bookmark_manager = objreg.get('bookmark-manager')
+ bookmark_manager.delete(urlstr)
+
model = completionmodel.CompletionModel(column_widths=(30, 70, 0))
marks = objreg.get('bookmark-manager').marks.items()
- model.add_category(listcategory.ListCategory('Bookmarks', marks))
+ model.add_category(listcategory.ListCategory('Bookmarks', marks,
+ delete_func=delete))
return model
|
{"golden_diff": "diff --git a/qutebrowser/completion/models/miscmodels.py b/qutebrowser/completion/models/miscmodels.py\n--- a/qutebrowser/completion/models/miscmodels.py\n+++ b/qutebrowser/completion/models/miscmodels.py\n@@ -60,17 +60,33 @@\n \n def quickmark():\n \"\"\"A CompletionModel filled with all quickmarks.\"\"\"\n+ def delete(data):\n+ \"\"\"Delete a quickmark from the completion menu.\"\"\"\n+ name = data[0]\n+ quickmark_manager = objreg.get('quickmark-manager')\n+ log.completion.debug('Deleting quickmark {}'.format(name))\n+ quickmark_manager.delete(name)\n+\n model = completionmodel.CompletionModel(column_widths=(30, 70, 0))\n marks = objreg.get('quickmark-manager').marks.items()\n- model.add_category(listcategory.ListCategory('Quickmarks', marks))\n+ model.add_category(listcategory.ListCategory('Quickmarks', marks,\n+ delete_func=delete))\n return model\n \n \n def bookmark():\n \"\"\"A CompletionModel filled with all bookmarks.\"\"\"\n+ def delete(data):\n+ \"\"\"Delete a bookmark from the completion menu.\"\"\"\n+ urlstr = data[0]\n+ log.completion.debug('Deleting bookmark {}'.format(urlstr))\n+ bookmark_manager = objreg.get('bookmark-manager')\n+ bookmark_manager.delete(urlstr)\n+\n model = completionmodel.CompletionModel(column_widths=(30, 70, 0))\n marks = objreg.get('bookmark-manager').marks.items()\n- model.add_category(listcategory.ListCategory('Bookmarks', marks))\n+ model.add_category(listcategory.ListCategory('Bookmarks', marks,\n+ delete_func=delete))\n return model\n", "issue": ":completion-item-del with :bookmark-load/:quickmark-load\nCtrl-D should also delete quickmarks/bookmarks with `:bookmark-load` and `:quickmark-load` (it also doesn't on v0.11.0)\r\n\r\ncc @rcorre \n", "before_files": [{"content": "# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:\n\n# Copyright 2014-2017 Florian Bruhin (The Compiler) <[email protected]>\n#\n# This file is part of qutebrowser.\n#\n# qutebrowser is free software: you can redistribute it and/or modify\n# it under the terms of the GNU General Public License as published by\n# the Free Software Foundation, either version 3 of the License, or\n# (at your option) any later version.\n#\n# qutebrowser is distributed in the hope that it will be useful,\n# but WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n# GNU General Public License for more details.\n#\n# You should have received a copy of the GNU General Public License\n# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.\n\n\"\"\"Functions that return miscellaneous completion models.\"\"\"\n\nfrom qutebrowser.config import config, configdata\nfrom qutebrowser.utils import objreg, log\nfrom qutebrowser.commands import cmdutils\nfrom qutebrowser.completion.models import completionmodel, listcategory\n\n\ndef command():\n \"\"\"A CompletionModel filled with non-hidden commands and descriptions.\"\"\"\n model = completionmodel.CompletionModel(column_widths=(20, 60, 20))\n cmdlist = _get_cmd_completions(include_aliases=True, include_hidden=False)\n model.add_category(listcategory.ListCategory(\"Commands\", cmdlist))\n return model\n\n\ndef helptopic():\n \"\"\"A CompletionModel filled with help topics.\"\"\"\n model = completionmodel.CompletionModel()\n\n cmdlist = _get_cmd_completions(include_aliases=False, include_hidden=True,\n prefix=':')\n settings = []\n for sectname, sectdata in configdata.DATA.items():\n for optname in sectdata:\n try:\n desc = sectdata.descriptions[optname]\n except (KeyError, AttributeError):\n # Some stuff (especially ValueList items) don't have a\n # description.\n desc = \"\"\n else:\n desc = desc.splitlines()[0]\n name = '{}->{}'.format(sectname, optname)\n settings.append((name, desc))\n\n model.add_category(listcategory.ListCategory(\"Commands\", cmdlist))\n model.add_category(listcategory.ListCategory(\"Settings\", settings))\n return model\n\n\ndef quickmark():\n \"\"\"A CompletionModel filled with all quickmarks.\"\"\"\n model = completionmodel.CompletionModel(column_widths=(30, 70, 0))\n marks = objreg.get('quickmark-manager').marks.items()\n model.add_category(listcategory.ListCategory('Quickmarks', marks))\n return model\n\n\ndef bookmark():\n \"\"\"A CompletionModel filled with all bookmarks.\"\"\"\n model = completionmodel.CompletionModel(column_widths=(30, 70, 0))\n marks = objreg.get('bookmark-manager').marks.items()\n model.add_category(listcategory.ListCategory('Bookmarks', marks))\n return model\n\n\ndef session():\n \"\"\"A CompletionModel filled with session names.\"\"\"\n model = completionmodel.CompletionModel()\n try:\n manager = objreg.get('session-manager')\n sessions = ((name,) for name in manager.list_sessions()\n if not name.startswith('_'))\n model.add_category(listcategory.ListCategory(\"Sessions\", sessions))\n except OSError:\n log.completion.exception(\"Failed to list sessions!\")\n return model\n\n\ndef buffer():\n \"\"\"A model to complete on open tabs across all windows.\n\n Used for switching the buffer command.\n \"\"\"\n def delete_buffer(data):\n \"\"\"Close the selected tab.\"\"\"\n win_id, tab_index = data[0].split('/')\n tabbed_browser = objreg.get('tabbed-browser', scope='window',\n window=int(win_id))\n tabbed_browser.on_tab_close_requested(int(tab_index) - 1)\n\n model = completionmodel.CompletionModel(column_widths=(6, 40, 54))\n\n for win_id in objreg.window_registry:\n tabbed_browser = objreg.get('tabbed-browser', scope='window',\n window=win_id)\n if tabbed_browser.shutting_down:\n continue\n tabs = []\n for idx in range(tabbed_browser.count()):\n tab = tabbed_browser.widget(idx)\n tabs.append((\"{}/{}\".format(win_id, idx + 1),\n tab.url().toDisplayString(),\n tabbed_browser.page_title(idx)))\n cat = listcategory.ListCategory(\"{}\".format(win_id), tabs,\n delete_func=delete_buffer)\n model.add_category(cat)\n\n return model\n\n\ndef bind(key):\n \"\"\"A CompletionModel filled with all bindable commands and descriptions.\n\n Args:\n key: the key being bound.\n \"\"\"\n model = completionmodel.CompletionModel(column_widths=(20, 60, 20))\n cmd_text = objreg.get('key-config').get_bindings_for('normal').get(key)\n\n if cmd_text:\n cmd_name = cmd_text.split(' ')[0]\n cmd = cmdutils.cmd_dict.get(cmd_name)\n data = [(cmd_text, cmd.desc, key)]\n model.add_category(listcategory.ListCategory(\"Current\", data))\n\n cmdlist = _get_cmd_completions(include_hidden=True, include_aliases=True)\n model.add_category(listcategory.ListCategory(\"Commands\", cmdlist))\n return model\n\n\ndef _get_cmd_completions(include_hidden, include_aliases, prefix=''):\n \"\"\"Get a list of completions info for commands, sorted by name.\n\n Args:\n include_hidden: True to include commands annotated with hide=True.\n include_aliases: True to include command aliases.\n prefix: String to append to the command name.\n\n Return: A list of tuples of form (name, description, bindings).\n \"\"\"\n assert cmdutils.cmd_dict\n cmdlist = []\n cmd_to_keys = objreg.get('key-config').get_reverse_bindings_for('normal')\n for obj in set(cmdutils.cmd_dict.values()):\n hide_debug = obj.debug and not objreg.get('args').debug\n hide_hidden = obj.hide and not include_hidden\n if not (hide_debug or hide_hidden or obj.deprecated):\n bindings = ', '.join(cmd_to_keys.get(obj.name, []))\n cmdlist.append((prefix + obj.name, obj.desc, bindings))\n\n if include_aliases:\n for name, cmd in config.section('aliases').items():\n bindings = ', '.join(cmd_to_keys.get(name, []))\n cmdlist.append((name, \"Alias for '{}'\".format(cmd), bindings))\n\n return cmdlist\n", "path": "qutebrowser/completion/models/miscmodels.py"}]}
| 2,416 | 369 |
gh_patches_debug_12417
|
rasdani/github-patches
|
git_diff
|
sanic-org__sanic-666
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
__main__ top-level script shadowing ImportError
Given `main.py`:
```python
import nonexistent # assuming this is... non-existent
from sanic import Sanic, response
app = Sanic(__name__)
@app.route('/')
async def index(request):
return response.html('<p>Hello</p>')
```
When we try to import something non-existent, exception `ImportError` will be thrown,
[line 38 of __main__.py](https://github.com/channelcat/sanic/blob/5fd62098bd2f2722876a0873d5856d70046d3889/sanic/__main__.py#L38) does not preserve the exception, reporting preset message (what's provided on commandline) instead. This is what we will get:
```
python -m sanic main.app
No module named main found.
Example File: project/sanic_server.py -> app
Example Module: project.sanic_server.app
```
It is very hard to find the true cause if the import statement that failed is, let's say, buried three levels of modules deep, for example.
</issue>
<code>
[start of sanic/__main__.py]
1 from argparse import ArgumentParser
2 from importlib import import_module
3
4 from sanic.log import log
5 from sanic.app import Sanic
6
7 if __name__ == "__main__":
8 parser = ArgumentParser(prog='sanic')
9 parser.add_argument('--host', dest='host', type=str, default='127.0.0.1')
10 parser.add_argument('--port', dest='port', type=int, default=8000)
11 parser.add_argument('--cert', dest='cert', type=str,
12 help='location of certificate for SSL')
13 parser.add_argument('--key', dest='key', type=str,
14 help='location of keyfile for SSL.')
15 parser.add_argument('--workers', dest='workers', type=int, default=1, )
16 parser.add_argument('--debug', dest='debug', action="store_true")
17 parser.add_argument('module')
18 args = parser.parse_args()
19
20 try:
21 module_parts = args.module.split(".")
22 module_name = ".".join(module_parts[:-1])
23 app_name = module_parts[-1]
24
25 module = import_module(module_name)
26 app = getattr(module, app_name, None)
27 if not isinstance(app, Sanic):
28 raise ValueError("Module is not a Sanic app, it is a {}. "
29 "Perhaps you meant {}.app?"
30 .format(type(app).__name__, args.module))
31 if args.cert is not None or args.key is not None:
32 ssl = {'cert': args.cert, 'key': args.key}
33 else:
34 ssl = None
35
36 app.run(host=args.host, port=args.port,
37 workers=args.workers, debug=args.debug, ssl=ssl)
38 except ImportError:
39 log.error("No module named {} found.\n"
40 " Example File: project/sanic_server.py -> app\n"
41 " Example Module: project.sanic_server.app"
42 .format(module_name))
43 except ValueError as e:
44 log.error("{}".format(e))
45
[end of sanic/__main__.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/sanic/__main__.py b/sanic/__main__.py
--- a/sanic/__main__.py
+++ b/sanic/__main__.py
@@ -35,10 +35,10 @@
app.run(host=args.host, port=args.port,
workers=args.workers, debug=args.debug, ssl=ssl)
- except ImportError:
+ except ImportError as e:
log.error("No module named {} found.\n"
" Example File: project/sanic_server.py -> app\n"
" Example Module: project.sanic_server.app"
- .format(module_name))
+ .format(e.name))
except ValueError as e:
log.error("{}".format(e))
|
{"golden_diff": "diff --git a/sanic/__main__.py b/sanic/__main__.py\n--- a/sanic/__main__.py\n+++ b/sanic/__main__.py\n@@ -35,10 +35,10 @@\n \n app.run(host=args.host, port=args.port,\n workers=args.workers, debug=args.debug, ssl=ssl)\n- except ImportError:\n+ except ImportError as e:\n log.error(\"No module named {} found.\\n\"\n \" Example File: project/sanic_server.py -> app\\n\"\n \" Example Module: project.sanic_server.app\"\n- .format(module_name))\n+ .format(e.name))\n except ValueError as e:\n log.error(\"{}\".format(e))\n", "issue": "__main__ top-level script shadowing ImportError\nGiven `main.py`:\r\n```python\r\nimport nonexistent # assuming this is... non-existent\r\nfrom sanic import Sanic, response\r\n\r\n\r\napp = Sanic(__name__)\r\n\r\n\r\[email protected]('/')\r\nasync def index(request):\r\n return response.html('<p>Hello</p>')\r\n```\r\n\r\nWhen we try to import something non-existent, exception `ImportError` will be thrown,\r\n[line 38 of __main__.py](https://github.com/channelcat/sanic/blob/5fd62098bd2f2722876a0873d5856d70046d3889/sanic/__main__.py#L38) does not preserve the exception, reporting preset message (what's provided on commandline) instead. This is what we will get:\r\n\r\n```\r\npython -m sanic main.app\r\nNo module named main found.\r\n Example File: project/sanic_server.py -> app\r\n Example Module: project.sanic_server.app\r\n```\r\n\r\nIt is very hard to find the true cause if the import statement that failed is, let's say, buried three levels of modules deep, for example.\n", "before_files": [{"content": "from argparse import ArgumentParser\nfrom importlib import import_module\n\nfrom sanic.log import log\nfrom sanic.app import Sanic\n\nif __name__ == \"__main__\":\n parser = ArgumentParser(prog='sanic')\n parser.add_argument('--host', dest='host', type=str, default='127.0.0.1')\n parser.add_argument('--port', dest='port', type=int, default=8000)\n parser.add_argument('--cert', dest='cert', type=str,\n help='location of certificate for SSL')\n parser.add_argument('--key', dest='key', type=str,\n help='location of keyfile for SSL.')\n parser.add_argument('--workers', dest='workers', type=int, default=1, )\n parser.add_argument('--debug', dest='debug', action=\"store_true\")\n parser.add_argument('module')\n args = parser.parse_args()\n\n try:\n module_parts = args.module.split(\".\")\n module_name = \".\".join(module_parts[:-1])\n app_name = module_parts[-1]\n\n module = import_module(module_name)\n app = getattr(module, app_name, None)\n if not isinstance(app, Sanic):\n raise ValueError(\"Module is not a Sanic app, it is a {}. \"\n \"Perhaps you meant {}.app?\"\n .format(type(app).__name__, args.module))\n if args.cert is not None or args.key is not None:\n ssl = {'cert': args.cert, 'key': args.key}\n else:\n ssl = None\n\n app.run(host=args.host, port=args.port,\n workers=args.workers, debug=args.debug, ssl=ssl)\n except ImportError:\n log.error(\"No module named {} found.\\n\"\n \" Example File: project/sanic_server.py -> app\\n\"\n \" Example Module: project.sanic_server.app\"\n .format(module_name))\n except ValueError as e:\n log.error(\"{}\".format(e))\n", "path": "sanic/__main__.py"}]}
| 1,289 | 155 |
gh_patches_debug_10871
|
rasdani/github-patches
|
git_diff
|
nilearn__nilearn-2140
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
test_mask_reducer failing on circle CI
testing the mask reducer from nilearn.decompositions.base sometimes fails on circleCI, e.g.
https://travis-ci.org/nilearn/nilearn/builds/583674961?utm_source=github_status&utm_medium=notification
the process gets a SIGABRT
could be due to the recent unvendoring of joblib, although this error started more recently
so far I haven't been able to reproduce this locally
</issue>
<code>
[start of nilearn/__init__.py]
1 """
2 Machine Learning module for NeuroImaging in python
3 --------------------------------------------------
4
5 Documentation is available in the docstrings and online at
6 http://nilearn.github.io.
7
8 Contents
9 --------
10 Nilearn aims at simplifying the use of the scikit-learn package in the context of
11 neuroimaging. It provides specific input/output functions, algorithms and
12 visualization tools.
13
14 Submodules
15 ---------
16 datasets --- Utilities to download NeuroImaging datasets
17 decoding --- Decoding tools and algorithms
18 decomposition --- Includes a subject level variant of the ICA
19 algorithm called Canonical ICA
20 connectome --- Set of tools for computing functional connectivity matrices
21 and for sparse multi-subjects learning of Gaussian graphical models
22 image --- Set of functions defining mathematical operations
23 working on Niimg-like objects
24 input_data --- includes scikit-learn tranformers and tools to
25 preprocess neuro-imaging data
26 masking --- Utilities to compute and operate on brain masks
27 mass_univariate --- Defines a Massively Univariate Linear Model
28 estimated with OLS and permutation test
29 plotting --- Plotting code for nilearn
30 region --- Set of functions for extracting region-defined
31 signals, clustering methods, connected regions extraction
32 signal --- Set of preprocessing functions for time series
33 """
34
35 import gzip
36 import sys
37 import warnings
38
39 from distutils.version import LooseVersion
40
41 from .version import _check_module_dependencies, __version__
42
43
44 def _py2_deprecation_warning():
45 py2_warning = ('Python2 support is deprecated and will be removed in '
46 'the next release. Consider switching to Python 3.6 or 3.7.'
47 )
48 warnings.filterwarnings('once', message=py2_warning)
49 warnings.warn(message=py2_warning,
50 category=DeprecationWarning,
51 stacklevel=3,
52 )
53
54 def _py34_deprecation_warning():
55 py34_warning = ('Python 3.4 support is deprecated and will be removed in '
56 'the next release. Consider switching to Python 3.6 or 3.7.'
57 )
58 warnings.filterwarnings('once', message=py34_warning)
59 warnings.warn(message=py34_warning,
60 category=DeprecationWarning,
61 stacklevel=3,
62 )
63
64
65 def _python_deprecation_warnings():
66 if sys.version_info.major == 2:
67 _py2_deprecation_warning()
68 elif sys.version_info.major == 3 and sys.version_info.minor == 4:
69 _py34_deprecation_warning()
70
71
72 _check_module_dependencies()
73 _python_deprecation_warnings()
74
75 # Temporary work around to address formatting issues in doc tests
76 # with NumPy 1.14. NumPy had made more consistent str/repr formatting
77 # of numpy arrays. Hence we print the options to old versions.
78 import numpy as np
79 if LooseVersion(np.__version__) >= LooseVersion("1.14"):
80 # See issue #1600 in nilearn for reason to add try and except
81 try:
82 from ._utils.testing import is_nose_running
83 if is_nose_running():
84 np.set_printoptions(legacy='1.13')
85 except ImportError:
86 pass
87
88 # Monkey-patch gzip to have faster reads on large gzip files
89 if hasattr(gzip.GzipFile, 'max_read_chunk'):
90 gzip.GzipFile.max_read_chunk = 100 * 1024 * 1024 # 100Mb
91
92 # Boolean controlling the default globbing technique when using check_niimg
93 # and the os.path.expanduser usage in CacheMixin.
94 # Default value it True, set it to False to completely deactivate this
95 # behavior.
96 EXPAND_PATH_WILDCARDS = True
97
98 # Boolean controlling whether the joblib caches should be
99 # flushed if the version of certain modules changes (eg nibabel, as it
100 # does not respect the backward compatibility in some of its internal
101 # structures
102 # This is used in nilearn._utils.cache_mixin
103 CHECK_CACHE_VERSION = True
104
105 # list all submodules available in nilearn and version
106 __all__ = ['datasets', 'decoding', 'decomposition', 'connectome',
107 'image', 'input_data', 'masking', 'mass_univariate', 'plotting',
108 'region', 'signal', 'surface', 'parcellations', '__version__']
109
110
[end of nilearn/__init__.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/nilearn/__init__.py b/nilearn/__init__.py
--- a/nilearn/__init__.py
+++ b/nilearn/__init__.py
@@ -35,11 +35,17 @@
import gzip
import sys
import warnings
+import os
from distutils.version import LooseVersion
from .version import _check_module_dependencies, __version__
+# Workaround issue discovered in intel-openmp 2019.5:
+# https://github.com/ContinuumIO/anaconda-issues/issues/11294
+#
+# see also https://github.com/scikit-learn/scikit-learn/pull/15020
+os.environ.setdefault("KMP_INIT_AT_FORK", "FALSE")
def _py2_deprecation_warning():
py2_warning = ('Python2 support is deprecated and will be removed in '
|
{"golden_diff": "diff --git a/nilearn/__init__.py b/nilearn/__init__.py\n--- a/nilearn/__init__.py\n+++ b/nilearn/__init__.py\n@@ -35,11 +35,17 @@\n import gzip\n import sys\n import warnings\n+import os\n \n from distutils.version import LooseVersion\n \n from .version import _check_module_dependencies, __version__\n \n+# Workaround issue discovered in intel-openmp 2019.5:\n+# https://github.com/ContinuumIO/anaconda-issues/issues/11294\n+#\n+# see also https://github.com/scikit-learn/scikit-learn/pull/15020\n+os.environ.setdefault(\"KMP_INIT_AT_FORK\", \"FALSE\")\n \n def _py2_deprecation_warning():\n py2_warning = ('Python2 support is deprecated and will be removed in '\n", "issue": "test_mask_reducer failing on circle CI\ntesting the mask reducer from nilearn.decompositions.base sometimes fails on circleCI, e.g.\r\nhttps://travis-ci.org/nilearn/nilearn/builds/583674961?utm_source=github_status&utm_medium=notification\r\n\r\nthe process gets a SIGABRT\r\n\r\ncould be due to the recent unvendoring of joblib, although this error started more recently\r\n\r\nso far I haven't been able to reproduce this locally\n", "before_files": [{"content": "\"\"\"\nMachine Learning module for NeuroImaging in python\n--------------------------------------------------\n\nDocumentation is available in the docstrings and online at\nhttp://nilearn.github.io.\n\nContents\n--------\nNilearn aims at simplifying the use of the scikit-learn package in the context of\nneuroimaging. It provides specific input/output functions, algorithms and\nvisualization tools.\n\nSubmodules\n---------\ndatasets --- Utilities to download NeuroImaging datasets\ndecoding --- Decoding tools and algorithms\ndecomposition --- Includes a subject level variant of the ICA\n algorithm called Canonical ICA\nconnectome --- Set of tools for computing functional connectivity matrices\n and for sparse multi-subjects learning of Gaussian graphical models\nimage --- Set of functions defining mathematical operations\n working on Niimg-like objects\ninput_data --- includes scikit-learn tranformers and tools to\n preprocess neuro-imaging data\nmasking --- Utilities to compute and operate on brain masks\nmass_univariate --- Defines a Massively Univariate Linear Model\n estimated with OLS and permutation test\nplotting --- Plotting code for nilearn\nregion --- Set of functions for extracting region-defined\n signals, clustering methods, connected regions extraction\nsignal --- Set of preprocessing functions for time series\n\"\"\"\n\nimport gzip\nimport sys\nimport warnings\n\nfrom distutils.version import LooseVersion\n\nfrom .version import _check_module_dependencies, __version__\n\n\ndef _py2_deprecation_warning():\n py2_warning = ('Python2 support is deprecated and will be removed in '\n 'the next release. Consider switching to Python 3.6 or 3.7.'\n )\n warnings.filterwarnings('once', message=py2_warning)\n warnings.warn(message=py2_warning,\n category=DeprecationWarning,\n stacklevel=3,\n )\n\ndef _py34_deprecation_warning():\n py34_warning = ('Python 3.4 support is deprecated and will be removed in '\n 'the next release. Consider switching to Python 3.6 or 3.7.'\n )\n warnings.filterwarnings('once', message=py34_warning)\n warnings.warn(message=py34_warning,\n category=DeprecationWarning,\n stacklevel=3,\n )\n\n\ndef _python_deprecation_warnings():\n if sys.version_info.major == 2:\n _py2_deprecation_warning()\n elif sys.version_info.major == 3 and sys.version_info.minor == 4:\n _py34_deprecation_warning()\n\n\n_check_module_dependencies()\n_python_deprecation_warnings()\n\n# Temporary work around to address formatting issues in doc tests\n# with NumPy 1.14. NumPy had made more consistent str/repr formatting\n# of numpy arrays. Hence we print the options to old versions.\nimport numpy as np\nif LooseVersion(np.__version__) >= LooseVersion(\"1.14\"):\n # See issue #1600 in nilearn for reason to add try and except\n try:\n from ._utils.testing import is_nose_running\n if is_nose_running():\n np.set_printoptions(legacy='1.13')\n except ImportError:\n pass\n\n# Monkey-patch gzip to have faster reads on large gzip files\nif hasattr(gzip.GzipFile, 'max_read_chunk'):\n gzip.GzipFile.max_read_chunk = 100 * 1024 * 1024 # 100Mb\n\n# Boolean controlling the default globbing technique when using check_niimg\n# and the os.path.expanduser usage in CacheMixin.\n# Default value it True, set it to False to completely deactivate this\n# behavior.\nEXPAND_PATH_WILDCARDS = True\n\n# Boolean controlling whether the joblib caches should be\n# flushed if the version of certain modules changes (eg nibabel, as it\n# does not respect the backward compatibility in some of its internal\n# structures\n# This is used in nilearn._utils.cache_mixin\nCHECK_CACHE_VERSION = True\n\n# list all submodules available in nilearn and version\n__all__ = ['datasets', 'decoding', 'decomposition', 'connectome',\n 'image', 'input_data', 'masking', 'mass_univariate', 'plotting',\n 'region', 'signal', 'surface', 'parcellations', '__version__']\n\n", "path": "nilearn/__init__.py"}]}
| 1,802 | 194 |
gh_patches_debug_20948
|
rasdani/github-patches
|
git_diff
|
buildbot__buildbot-5156
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
buildbot-worker doesn't support ipv6 address for master connection
I'm trying the following command line:
```shell
/usr/bin/buildbot-worker create-worker . "[2001\:\:324]:9989" test toto
```
But it gives the following error:
```
Traceback (most recent call last):
File "/usr/bin/buildbot-worker", line 11, in <module>
load_entry_point('buildbot-worker==2.0.1.post2', 'console_scripts', 'buildbot-worker')()
File "/usr/lib/python3/dist-packages/buildbot_worker/scripts/runner.py", line 238, in run
config.parseOptions()
File "/usr/lib/python3/dist-packages/twisted/python/usage.py", line 267, in parseOptions
self.subOptions.parseOptions(rest)
File "/usr/lib/python3/dist-packages/twisted/python/usage.py", line 273, in parseOptions
self.parseArgs(*args)
File "/usr/lib/python3/dist-packages/buildbot_worker/scripts/runner.py", line 183, in parseArgs
self['host'], self['port'] = self.validateMasterArgument(master)
File "/usr/lib/python3/dist-packages/buildbot_worker/scripts/runner.py", line 161, in validateMasterArgument
master, port = master_arg.split(":")
ValueError: too many values to unpack (expected 2)
```
Is Ipv6 address supposed to be supported?
</issue>
<code>
[start of worker/buildbot_worker/scripts/runner.py]
1 # This file is part of Buildbot. Buildbot is free software: you can
2 # redistribute it and/or modify it under the terms of the GNU General Public
3 # License as published by the Free Software Foundation, version 2.
4 #
5 # This program is distributed in the hope that it will be useful, but WITHOUT
6 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
7 # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
8 # details.
9 #
10 # You should have received a copy of the GNU General Public License along with
11 # this program; if not, write to the Free Software Foundation, Inc., 51
12 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
13 #
14 # Copyright Buildbot Team Members
15
16 # N.B.: don't import anything that might pull in a reactor yet. Some of our
17 # subcommands want to load modules that need the gtk reactor.
18
19 from __future__ import absolute_import
20 from __future__ import division
21 from __future__ import print_function
22
23 import os
24 import re
25 import sys
26 import textwrap
27
28 from twisted.python import log
29 from twisted.python import reflect
30 from twisted.python import usage
31
32 # the create/start/stop commands should all be run as the same user,
33 # preferably a separate 'buildbot' account.
34
35 # Note that the terms 'options' and 'config' are used interchangeably here - in
36 # fact, they are interchanged several times. Caveat legator.
37
38
39 class MakerBase(usage.Options):
40 optFlags = [
41 ['help', 'h', "Display this message"],
42 ["quiet", "q", "Do not emit the commands being run"],
43 ]
44
45 longdesc = textwrap.dedent("""
46 Operates upon the specified <basedir> (or the current directory, if not
47 specified).
48 """)
49
50 # on tab completion, suggest directories as first argument
51 if hasattr(usage, 'Completions'):
52 # only set completion suggestion if running with
53 # twisted version (>=11.1.0) that supports it
54 compData = usage.Completions(
55 extraActions=[usage.CompleteDirs(descr="worker base directory")])
56
57 opt_h = usage.Options.opt_help
58
59 def parseArgs(self, *args):
60 if args:
61 self['basedir'] = args[0]
62 else:
63 # Use the current directory if no basedir was specified.
64 self['basedir'] = os.getcwd()
65 if len(args) > 1:
66 raise usage.UsageError("I wasn't expecting so many arguments")
67
68 def postOptions(self):
69 self['basedir'] = os.path.abspath(self['basedir'])
70
71
72 class StartOptions(MakerBase):
73 subcommandFunction = "buildbot_worker.scripts.start.startCommand"
74 optFlags = [
75 ['quiet', 'q', "Don't display startup log messages"],
76 ['nodaemon', None, "Don't daemonize (stay in foreground)"],
77 ]
78
79 def getSynopsis(self):
80 return "Usage: buildbot-worker start [<basedir>]"
81
82
83 class StopOptions(MakerBase):
84 subcommandFunction = "buildbot_worker.scripts.stop.stop"
85
86 def getSynopsis(self):
87 return "Usage: buildbot-worker stop [<basedir>]"
88
89
90 class RestartOptions(MakerBase):
91 subcommandFunction = "buildbot_worker.scripts.restart.restart"
92 optFlags = [
93 ['quiet', 'q', "Don't display startup log messages"],
94 ['nodaemon', None, "Don't daemonize (stay in foreground)"],
95 ]
96
97 def getSynopsis(self):
98 return "Usage: buildbot-worker restart [<basedir>]"
99
100
101 class CreateWorkerOptions(MakerBase):
102 subcommandFunction = "buildbot_worker.scripts.create_worker.createWorker"
103 optFlags = [
104 ["force", "f", "Re-use an existing directory"],
105 ["relocatable", "r",
106 "Create a relocatable buildbot.tac"],
107 ["no-logrotate", "n",
108 "Do not permit buildmaster rotate logs by itself"],
109 ['use-tls', None,
110 "Uses TLS to connect to master"],
111 ['delete-leftover-dirs', None,
112 'Delete folders that are not required by the master on connection'],
113 ]
114 optParameters = [
115 ["keepalive", "k", 600,
116 "Interval at which keepalives should be sent (in seconds)"],
117 ["umask", None, "None",
118 "controls permissions of generated files. "
119 "Use --umask=0o22 to be world-readable"],
120 ["maxdelay", None, 300,
121 "Maximum time between connection attempts"],
122 ["maxretries", None, 'None',
123 "Maximum number of retries before worker shutdown"],
124 ["numcpus", None, "None",
125 "Number of available cpus to use on a build. "],
126 ["log-size", "s", "10000000",
127 "size at which to rotate twisted log files"],
128 ["log-count", "l", "10",
129 "limit the number of kept old twisted log files "
130 "(None for unlimited)"],
131 ["allow-shutdown", "a", None,
132 "Allows the worker to initiate a graceful shutdown. One of "
133 "'signal' or 'file'"]
134 ]
135
136 longdesc = textwrap.dedent("""
137 This command creates a buildbot worker directory and buildbot.tac
138 file. The bot will use the <name> and <passwd> arguments to authenticate
139 itself when connecting to the master. All commands are run in a
140 build-specific subdirectory of <basedir>. <master> is a string of the
141 form 'hostname[:port]', and specifies where the buildmaster can be reached.
142 port defaults to 9989.
143
144 The appropriate values for <name>, <passwd>, and <master> should be
145 provided to you by the buildmaster administrator. You must choose <basedir>
146 yourself.
147 """)
148
149 def validateMasterArgument(self, master_arg):
150 """
151 Parse the <master> argument.
152
153 @param master_arg: the <master> argument to parse
154
155 @return: tuple of master's host and port
156 @raise UsageError: on errors parsing the argument
157 """
158 if master_arg[:5] == "http:":
159 raise usage.UsageError("<master> is not a URL - do not use URL")
160
161 if ":" not in master_arg:
162 master = master_arg
163 port = 9989
164 else:
165 master, port = master_arg.split(":")
166
167 if not master:
168 raise usage.UsageError("invalid <master> argument '{}'".format(
169 master_arg))
170 try:
171 port = int(port)
172 except ValueError:
173 raise usage.UsageError("invalid master port '{}', "
174 "needs to be a number".format(port))
175
176 return master, port
177
178 def getSynopsis(self):
179 return "Usage: buildbot-worker create-worker " \
180 "[options] <basedir> <master> <name> <passwd>"
181
182 def parseArgs(self, *args):
183 if len(args) != 4:
184 raise usage.UsageError("incorrect number of arguments")
185 basedir, master, name, passwd = args
186 self['basedir'] = basedir
187 self['host'], self['port'] = self.validateMasterArgument(master)
188 self['name'] = name
189 self['passwd'] = passwd
190
191 def postOptions(self):
192 MakerBase.postOptions(self)
193
194 # check and convert numeric parameters
195 for argument in ["keepalive", "maxdelay", "log-size"]:
196 try:
197 self[argument] = int(self[argument])
198 except ValueError:
199 raise usage.UsageError("{} parameter needs to be a number".format(
200 argument))
201
202 for argument in ["log-count", "maxretries", "umask", "numcpus"]:
203 if not re.match(r'^(0o)?\d+$', self[argument]) and \
204 self[argument] != 'None':
205 raise usage.UsageError("{} parameter needs to be a number"
206 " or None".format(argument))
207
208 if self['allow-shutdown'] not in [None, 'signal', 'file']:
209 raise usage.UsageError("allow-shutdown needs to be one of"
210 " 'signal' or 'file'")
211
212
213 class Options(usage.Options):
214 synopsis = "Usage: buildbot-worker <command> [command options]"
215
216 subCommands = [
217 # the following are all admin commands
218 ['create-worker', None, CreateWorkerOptions,
219 "Create and populate a directory for a new worker"],
220 ['start', None, StartOptions, "Start a worker"],
221 ['stop', None, StopOptions, "Stop a worker"],
222 ['restart', None, RestartOptions,
223 "Restart a worker"],
224 ]
225
226 def opt_version(self):
227 import buildbot_worker # pylint: disable=import-outside-toplevel
228 print("worker version: {}".format(buildbot_worker.version))
229 usage.Options.opt_version(self)
230
231 def opt_verbose(self):
232 log.startLogging(sys.stderr)
233
234 def postOptions(self):
235 if not hasattr(self, 'subOptions'):
236 raise usage.UsageError("must specify a command")
237
238
239 def run():
240 config = Options()
241 try:
242 config.parseOptions()
243 except usage.error as e:
244 print("{}: {}".format(sys.argv[0], e))
245 print()
246 c = getattr(config, 'subOptions', config)
247 print(str(c))
248 sys.exit(1)
249
250 subconfig = config.subOptions
251 subcommandFunction = reflect.namedObject(subconfig.subcommandFunction)
252 sys.exit(subcommandFunction(subconfig))
253
[end of worker/buildbot_worker/scripts/runner.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/worker/buildbot_worker/scripts/runner.py b/worker/buildbot_worker/scripts/runner.py
--- a/worker/buildbot_worker/scripts/runner.py
+++ b/worker/buildbot_worker/scripts/runner.py
@@ -158,11 +158,24 @@
if master_arg[:5] == "http:":
raise usage.UsageError("<master> is not a URL - do not use URL")
- if ":" not in master_arg:
+ if master_arg.startswith("[") and "]" in master_arg:
+ # detect ipv6 address with format [2001:1:2:3:4::1]:4321
+ master, port_tmp = master_arg.split("]")
+ master = master[1:]
+ if ":" not in port_tmp:
+ port = 9989
+ else:
+ port = port_tmp.split(":")[1]
+
+ elif ":" not in master_arg:
master = master_arg
port = 9989
else:
- master, port = master_arg.split(":")
+ try:
+ master, port = master_arg.split(":")
+ except ValueError:
+ raise usage.UsageError("invalid <master> argument '{}', "
+ "if it is an ipv6 address, it must be enclosed by []".format(master_arg))
if not master:
raise usage.UsageError("invalid <master> argument '{}'".format(
|
{"golden_diff": "diff --git a/worker/buildbot_worker/scripts/runner.py b/worker/buildbot_worker/scripts/runner.py\n--- a/worker/buildbot_worker/scripts/runner.py\n+++ b/worker/buildbot_worker/scripts/runner.py\n@@ -158,11 +158,24 @@\n if master_arg[:5] == \"http:\":\n raise usage.UsageError(\"<master> is not a URL - do not use URL\")\n \n- if \":\" not in master_arg:\n+ if master_arg.startswith(\"[\") and \"]\" in master_arg:\n+ # detect ipv6 address with format [2001:1:2:3:4::1]:4321\n+ master, port_tmp = master_arg.split(\"]\")\n+ master = master[1:]\n+ if \":\" not in port_tmp:\n+ port = 9989\n+ else:\n+ port = port_tmp.split(\":\")[1]\n+\n+ elif \":\" not in master_arg:\n master = master_arg\n port = 9989\n else:\n- master, port = master_arg.split(\":\")\n+ try:\n+ master, port = master_arg.split(\":\")\n+ except ValueError:\n+ raise usage.UsageError(\"invalid <master> argument '{}', \"\n+ \"if it is an ipv6 address, it must be enclosed by []\".format(master_arg))\n \n if not master:\n raise usage.UsageError(\"invalid <master> argument '{}'\".format(\n", "issue": "buildbot-worker doesn't support ipv6 address for master connection\nI'm trying the following command line:\r\n```shell\r\n/usr/bin/buildbot-worker create-worker . \"[2001\\:\\:324]:9989\" test toto\r\n```\r\nBut it gives the following error:\r\n```\r\nTraceback (most recent call last):\r\n File \"/usr/bin/buildbot-worker\", line 11, in <module>\r\n load_entry_point('buildbot-worker==2.0.1.post2', 'console_scripts', 'buildbot-worker')()\r\n File \"/usr/lib/python3/dist-packages/buildbot_worker/scripts/runner.py\", line 238, in run\r\n config.parseOptions()\r\n File \"/usr/lib/python3/dist-packages/twisted/python/usage.py\", line 267, in parseOptions\r\n self.subOptions.parseOptions(rest)\r\n File \"/usr/lib/python3/dist-packages/twisted/python/usage.py\", line 273, in parseOptions\r\n self.parseArgs(*args)\r\n File \"/usr/lib/python3/dist-packages/buildbot_worker/scripts/runner.py\", line 183, in parseArgs\r\n self['host'], self['port'] = self.validateMasterArgument(master)\r\n File \"/usr/lib/python3/dist-packages/buildbot_worker/scripts/runner.py\", line 161, in validateMasterArgument\r\n master, port = master_arg.split(\":\")\r\nValueError: too many values to unpack (expected 2)\r\n```\r\n\r\nIs Ipv6 address supposed to be supported?\r\n\n", "before_files": [{"content": "# This file is part of Buildbot. Buildbot is free software: you can\n# redistribute it and/or modify it under the terms of the GNU General Public\n# License as published by the Free Software Foundation, version 2.\n#\n# This program is distributed in the hope that it will be useful, but WITHOUT\n# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\n# details.\n#\n# You should have received a copy of the GNU General Public License along with\n# this program; if not, write to the Free Software Foundation, Inc., 51\n# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n#\n# Copyright Buildbot Team Members\n\n# N.B.: don't import anything that might pull in a reactor yet. Some of our\n# subcommands want to load modules that need the gtk reactor.\n\nfrom __future__ import absolute_import\nfrom __future__ import division\nfrom __future__ import print_function\n\nimport os\nimport re\nimport sys\nimport textwrap\n\nfrom twisted.python import log\nfrom twisted.python import reflect\nfrom twisted.python import usage\n\n# the create/start/stop commands should all be run as the same user,\n# preferably a separate 'buildbot' account.\n\n# Note that the terms 'options' and 'config' are used interchangeably here - in\n# fact, they are interchanged several times. Caveat legator.\n\n\nclass MakerBase(usage.Options):\n optFlags = [\n ['help', 'h', \"Display this message\"],\n [\"quiet\", \"q\", \"Do not emit the commands being run\"],\n ]\n\n longdesc = textwrap.dedent(\"\"\"\n Operates upon the specified <basedir> (or the current directory, if not\n specified).\n \"\"\")\n\n # on tab completion, suggest directories as first argument\n if hasattr(usage, 'Completions'):\n # only set completion suggestion if running with\n # twisted version (>=11.1.0) that supports it\n compData = usage.Completions(\n extraActions=[usage.CompleteDirs(descr=\"worker base directory\")])\n\n opt_h = usage.Options.opt_help\n\n def parseArgs(self, *args):\n if args:\n self['basedir'] = args[0]\n else:\n # Use the current directory if no basedir was specified.\n self['basedir'] = os.getcwd()\n if len(args) > 1:\n raise usage.UsageError(\"I wasn't expecting so many arguments\")\n\n def postOptions(self):\n self['basedir'] = os.path.abspath(self['basedir'])\n\n\nclass StartOptions(MakerBase):\n subcommandFunction = \"buildbot_worker.scripts.start.startCommand\"\n optFlags = [\n ['quiet', 'q', \"Don't display startup log messages\"],\n ['nodaemon', None, \"Don't daemonize (stay in foreground)\"],\n ]\n\n def getSynopsis(self):\n return \"Usage: buildbot-worker start [<basedir>]\"\n\n\nclass StopOptions(MakerBase):\n subcommandFunction = \"buildbot_worker.scripts.stop.stop\"\n\n def getSynopsis(self):\n return \"Usage: buildbot-worker stop [<basedir>]\"\n\n\nclass RestartOptions(MakerBase):\n subcommandFunction = \"buildbot_worker.scripts.restart.restart\"\n optFlags = [\n ['quiet', 'q', \"Don't display startup log messages\"],\n ['nodaemon', None, \"Don't daemonize (stay in foreground)\"],\n ]\n\n def getSynopsis(self):\n return \"Usage: buildbot-worker restart [<basedir>]\"\n\n\nclass CreateWorkerOptions(MakerBase):\n subcommandFunction = \"buildbot_worker.scripts.create_worker.createWorker\"\n optFlags = [\n [\"force\", \"f\", \"Re-use an existing directory\"],\n [\"relocatable\", \"r\",\n \"Create a relocatable buildbot.tac\"],\n [\"no-logrotate\", \"n\",\n \"Do not permit buildmaster rotate logs by itself\"],\n ['use-tls', None,\n \"Uses TLS to connect to master\"],\n ['delete-leftover-dirs', None,\n 'Delete folders that are not required by the master on connection'],\n ]\n optParameters = [\n [\"keepalive\", \"k\", 600,\n \"Interval at which keepalives should be sent (in seconds)\"],\n [\"umask\", None, \"None\",\n \"controls permissions of generated files. \"\n \"Use --umask=0o22 to be world-readable\"],\n [\"maxdelay\", None, 300,\n \"Maximum time between connection attempts\"],\n [\"maxretries\", None, 'None',\n \"Maximum number of retries before worker shutdown\"],\n [\"numcpus\", None, \"None\",\n \"Number of available cpus to use on a build. \"],\n [\"log-size\", \"s\", \"10000000\",\n \"size at which to rotate twisted log files\"],\n [\"log-count\", \"l\", \"10\",\n \"limit the number of kept old twisted log files \"\n \"(None for unlimited)\"],\n [\"allow-shutdown\", \"a\", None,\n \"Allows the worker to initiate a graceful shutdown. One of \"\n \"'signal' or 'file'\"]\n ]\n\n longdesc = textwrap.dedent(\"\"\"\n This command creates a buildbot worker directory and buildbot.tac\n file. The bot will use the <name> and <passwd> arguments to authenticate\n itself when connecting to the master. All commands are run in a\n build-specific subdirectory of <basedir>. <master> is a string of the\n form 'hostname[:port]', and specifies where the buildmaster can be reached.\n port defaults to 9989.\n\n The appropriate values for <name>, <passwd>, and <master> should be\n provided to you by the buildmaster administrator. You must choose <basedir>\n yourself.\n \"\"\")\n\n def validateMasterArgument(self, master_arg):\n \"\"\"\n Parse the <master> argument.\n\n @param master_arg: the <master> argument to parse\n\n @return: tuple of master's host and port\n @raise UsageError: on errors parsing the argument\n \"\"\"\n if master_arg[:5] == \"http:\":\n raise usage.UsageError(\"<master> is not a URL - do not use URL\")\n\n if \":\" not in master_arg:\n master = master_arg\n port = 9989\n else:\n master, port = master_arg.split(\":\")\n\n if not master:\n raise usage.UsageError(\"invalid <master> argument '{}'\".format(\n master_arg))\n try:\n port = int(port)\n except ValueError:\n raise usage.UsageError(\"invalid master port '{}', \"\n \"needs to be a number\".format(port))\n\n return master, port\n\n def getSynopsis(self):\n return \"Usage: buildbot-worker create-worker \" \\\n \"[options] <basedir> <master> <name> <passwd>\"\n\n def parseArgs(self, *args):\n if len(args) != 4:\n raise usage.UsageError(\"incorrect number of arguments\")\n basedir, master, name, passwd = args\n self['basedir'] = basedir\n self['host'], self['port'] = self.validateMasterArgument(master)\n self['name'] = name\n self['passwd'] = passwd\n\n def postOptions(self):\n MakerBase.postOptions(self)\n\n # check and convert numeric parameters\n for argument in [\"keepalive\", \"maxdelay\", \"log-size\"]:\n try:\n self[argument] = int(self[argument])\n except ValueError:\n raise usage.UsageError(\"{} parameter needs to be a number\".format(\n argument))\n\n for argument in [\"log-count\", \"maxretries\", \"umask\", \"numcpus\"]:\n if not re.match(r'^(0o)?\\d+$', self[argument]) and \\\n self[argument] != 'None':\n raise usage.UsageError(\"{} parameter needs to be a number\"\n \" or None\".format(argument))\n\n if self['allow-shutdown'] not in [None, 'signal', 'file']:\n raise usage.UsageError(\"allow-shutdown needs to be one of\"\n \" 'signal' or 'file'\")\n\n\nclass Options(usage.Options):\n synopsis = \"Usage: buildbot-worker <command> [command options]\"\n\n subCommands = [\n # the following are all admin commands\n ['create-worker', None, CreateWorkerOptions,\n \"Create and populate a directory for a new worker\"],\n ['start', None, StartOptions, \"Start a worker\"],\n ['stop', None, StopOptions, \"Stop a worker\"],\n ['restart', None, RestartOptions,\n \"Restart a worker\"],\n ]\n\n def opt_version(self):\n import buildbot_worker # pylint: disable=import-outside-toplevel\n print(\"worker version: {}\".format(buildbot_worker.version))\n usage.Options.opt_version(self)\n\n def opt_verbose(self):\n log.startLogging(sys.stderr)\n\n def postOptions(self):\n if not hasattr(self, 'subOptions'):\n raise usage.UsageError(\"must specify a command\")\n\n\ndef run():\n config = Options()\n try:\n config.parseOptions()\n except usage.error as e:\n print(\"{}: {}\".format(sys.argv[0], e))\n print()\n c = getattr(config, 'subOptions', config)\n print(str(c))\n sys.exit(1)\n\n subconfig = config.subOptions\n subcommandFunction = reflect.namedObject(subconfig.subcommandFunction)\n sys.exit(subcommandFunction(subconfig))\n", "path": "worker/buildbot_worker/scripts/runner.py"}]}
| 3,631 | 319 |
gh_patches_debug_36180
|
rasdani/github-patches
|
git_diff
|
getredash__redash-6505
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Error when running CSV download with InfluxDB as data source
Below is the error log for the Redash application.
Downloading CSV with InfluxDB as the data source causes an error.
The error log shows the following error
Since the test connection succeeds, we believe it is an application anomaly in Redash.
```
server_1 | KeyError: 'type'
server_1 | [2023-07-07 05:01:02,196][PID:9087][ERROR][redash.app] Exception on /api/queries/71/results/2093.csv [GET]
server_1 | Traceback (most recent call last):
server_1 | File "/usr/local/lib/python3.7/site-packages/flask/app.py", line 1949, in full_dispatch_request
server_1 | rv = self.dispatch_request()
server_1 | File "/usr/local/lib/python3.7/site-packages/flask/app.py", line 1935, in dispatch_request
server_1 | return self.view_functions[rule.endpoint](**req.view_args)
server_1 | File "/usr/local/lib/python3.7/site-packages/flask_restful/__init__.py", line 458, in wrapper
server_1 | resp = resource(*args, **kwargs)
server_1 | File "/usr/local/lib/python3.7/site-packages/flask_login/utils.py", line 261, in decorated_view
server_1 | return func(*args, **kwargs)
server_1 | File "/usr/local/lib/python3.7/site-packages/flask/views.py", line 89, in view
server_1 | return self.dispatch_request(*args, **kwargs)
server_1 | File "/app/redash/handlers/base.py", line 33, in dispatch_request
server_1 | return super(BaseResource, self).dispatch_request(*args, **kwargs)
server_1 | File "/usr/local/lib/python3.7/site-packages/flask_restful/__init__.py", line 573, in dispatch_request
server_1 | resp = meth(*args, **kwargs)
server_1 | File "/app/redash/permissions.py", line 71, in decorated
server_1 | return fn(*args, **kwargs)
server_1 | File "/app/redash/handlers/query_results.py", line 409, in get
server_1 | response = response_builders[filetype](query_result)
server_1 | File "/app/redash/handlers/query_results.py", line 439, in make_csv_response
server_1 | serialize_query_result_to_dsv(query_result, ","), 200, headers
server_1 | File "/app/redash/serializers/query_result.py", line 87, in serialize_query_result_to_dsv
server_1 | fieldnames, special_columns = _get_column_lists(query_data["columns"] or [])
server_1 | File "/app/redash/serializers/query_result.py", line 68, in _get_column_lists
server_1 | if col["type"] == col_type:
server_1 | KeyError: 'type'
```
Below is the JSON data when CSV download fails.
(Some parts are excerpted due to the length of the file.)
```
{
"query_result": {
"id": 2093,
"query": "SELECT\n SUM(d3) / 60\nFROM\n charger \nWHERE\n chg_id = '1'\n AND time >= '2023-04-30T15:00:00Z'\n AND time < '2023-05-03T15:00:00Z'\nGROUP BY chg_id, time(15m) fill(linear)\nlimit 10;",
"data": {
"columns": [{ "name": "time" }, { "name": "sum" }, { "name": "chg_id" }],
"rows": [
{ "time": "2023-04-30T15:00:00Z", "sum": 0, "chg_id": "1" },
]
}
}
}
```
Below is the JSON data for a successful CSV download.
```
"columns": [
{ "name": "id", "friendly_name": "id", "type": "integer" },
{
"name": "project_id",
"friendly_name": "project_id",
"type": "integer"
},
{ "name": "name", "friendly_name": "name", "type": "string" },
{ "name": "filters", "friendly_name": "filters", "type": null },
{ "name": "user_id", "friendly_name": "user_id", "type": "integer" },
{
"name": "column_names",
"friendly_name": "column_names",
"type": null
},
{
```
In the normal case, an element is generated for each column,
In the case of failed data, three columns made up one element.
Therefore, the required type element was missing, resulting in a program error.
The following is a part of the program that caused the error.
```
for col in columns:
fieldnames.append(col["name"])
for col_type in special_types.keys():
if col["type"] == col_type:
special_columns[col["name"]] = special_types[col_type]
```
This is just a guess, I am guessing, but it seems to me that the SQL results being executed against InfluxDB are special and are not being converted properly in Redash, which is what is causing the problem.
All text translated by Google Translate.
</issue>
<code>
[start of redash/query_runner/influx_db.py]
1 import logging
2
3 from redash.query_runner import BaseQueryRunner, register
4 from redash.utils import json_dumps
5
6 logger = logging.getLogger(__name__)
7
8 try:
9 from influxdb import InfluxDBClient
10
11 enabled = True
12
13 except ImportError:
14 enabled = False
15
16
17 def _transform_result(results):
18 result_columns = []
19 result_rows = []
20
21 for result in results:
22 for series in result.raw.get("series", []):
23 for column in series["columns"]:
24 if column not in result_columns:
25 result_columns.append(column)
26 tags = series.get("tags", {})
27 for key in tags.keys():
28 if key not in result_columns:
29 result_columns.append(key)
30
31 for result in results:
32 for series in result.raw.get("series", []):
33 for point in series["values"]:
34 result_row = {}
35 for column in result_columns:
36 tags = series.get("tags", {})
37 if column in tags:
38 result_row[column] = tags[column]
39 elif column in series["columns"]:
40 index = series["columns"].index(column)
41 value = point[index]
42 result_row[column] = value
43 result_rows.append(result_row)
44
45 return json_dumps({"columns": [{"name": c} for c in result_columns], "rows": result_rows})
46
47
48 class InfluxDB(BaseQueryRunner):
49 should_annotate_query = False
50 noop_query = "show measurements limit 1"
51
52 @classmethod
53 def configuration_schema(cls):
54 return {
55 "type": "object",
56 "properties": {"url": {"type": "string"}},
57 "required": ["url"],
58 }
59
60 @classmethod
61 def enabled(cls):
62 return enabled
63
64 @classmethod
65 def type(cls):
66 return "influxdb"
67
68 def run_query(self, query, user):
69 client = InfluxDBClient.from_dsn(self.configuration["url"])
70
71 logger.debug("influxdb url: %s", self.configuration["url"])
72 logger.debug("influxdb got query: %s", query)
73
74 try:
75 results = client.query(query)
76 if not isinstance(results, list):
77 results = [results]
78
79 json_data = _transform_result(results)
80 error = None
81 except Exception as ex:
82 json_data = None
83 error = str(ex)
84
85 return json_data, error
86
87
88 register(InfluxDB)
89
[end of redash/query_runner/influx_db.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/redash/query_runner/influx_db.py b/redash/query_runner/influx_db.py
--- a/redash/query_runner/influx_db.py
+++ b/redash/query_runner/influx_db.py
@@ -1,6 +1,12 @@
import logging
-from redash.query_runner import BaseQueryRunner, register
+from redash.query_runner import (
+ TYPE_FLOAT,
+ TYPE_INTEGER,
+ TYPE_STRING,
+ BaseQueryRunner,
+ register,
+)
from redash.utils import json_dumps
logger = logging.getLogger(__name__)
@@ -14,25 +20,36 @@
enabled = False
+TYPES_MAP = {
+ str: TYPE_STRING,
+ int: TYPE_INTEGER,
+ float: TYPE_FLOAT,
+}
+
+
+def _get_type(value):
+ return TYPES_MAP.get(type(value), TYPE_STRING)
+
+
def _transform_result(results):
- result_columns = []
+ column_names = []
result_rows = []
for result in results:
for series in result.raw.get("series", []):
for column in series["columns"]:
- if column not in result_columns:
- result_columns.append(column)
+ if column not in column_names:
+ column_names.append(column)
tags = series.get("tags", {})
for key in tags.keys():
- if key not in result_columns:
- result_columns.append(key)
+ if key not in column_names:
+ column_names.append(key)
for result in results:
for series in result.raw.get("series", []):
for point in series["values"]:
result_row = {}
- for column in result_columns:
+ for column in column_names:
tags = series.get("tags", {})
if column in tags:
result_row[column] = tags[column]
@@ -42,7 +59,12 @@
result_row[column] = value
result_rows.append(result_row)
- return json_dumps({"columns": [{"name": c} for c in result_columns], "rows": result_rows})
+ if len(result_rows) > 0:
+ result_columns = [{"name": c, "type": _get_type(result_rows[0][c])} for c in result_rows[0].keys()]
+ else:
+ result_columns = [{"name": c, "type": TYPE_STRING} for c in column_names]
+
+ return json_dumps({"columns": result_columns, "rows": result_rows})
class InfluxDB(BaseQueryRunner):
|
{"golden_diff": "diff --git a/redash/query_runner/influx_db.py b/redash/query_runner/influx_db.py\n--- a/redash/query_runner/influx_db.py\n+++ b/redash/query_runner/influx_db.py\n@@ -1,6 +1,12 @@\n import logging\n \n-from redash.query_runner import BaseQueryRunner, register\n+from redash.query_runner import (\n+ TYPE_FLOAT,\n+ TYPE_INTEGER,\n+ TYPE_STRING,\n+ BaseQueryRunner,\n+ register,\n+)\n from redash.utils import json_dumps\n \n logger = logging.getLogger(__name__)\n@@ -14,25 +20,36 @@\n enabled = False\n \n \n+TYPES_MAP = {\n+ str: TYPE_STRING,\n+ int: TYPE_INTEGER,\n+ float: TYPE_FLOAT,\n+}\n+\n+\n+def _get_type(value):\n+ return TYPES_MAP.get(type(value), TYPE_STRING)\n+\n+\n def _transform_result(results):\n- result_columns = []\n+ column_names = []\n result_rows = []\n \n for result in results:\n for series in result.raw.get(\"series\", []):\n for column in series[\"columns\"]:\n- if column not in result_columns:\n- result_columns.append(column)\n+ if column not in column_names:\n+ column_names.append(column)\n tags = series.get(\"tags\", {})\n for key in tags.keys():\n- if key not in result_columns:\n- result_columns.append(key)\n+ if key not in column_names:\n+ column_names.append(key)\n \n for result in results:\n for series in result.raw.get(\"series\", []):\n for point in series[\"values\"]:\n result_row = {}\n- for column in result_columns:\n+ for column in column_names:\n tags = series.get(\"tags\", {})\n if column in tags:\n result_row[column] = tags[column]\n@@ -42,7 +59,12 @@\n result_row[column] = value\n result_rows.append(result_row)\n \n- return json_dumps({\"columns\": [{\"name\": c} for c in result_columns], \"rows\": result_rows})\n+ if len(result_rows) > 0:\n+ result_columns = [{\"name\": c, \"type\": _get_type(result_rows[0][c])} for c in result_rows[0].keys()]\n+ else:\n+ result_columns = [{\"name\": c, \"type\": TYPE_STRING} for c in column_names]\n+\n+ return json_dumps({\"columns\": result_columns, \"rows\": result_rows})\n \n \n class InfluxDB(BaseQueryRunner):\n", "issue": "Error when running CSV download with InfluxDB as data source\nBelow is the error log for the Redash application.\r\n\r\nDownloading CSV with InfluxDB as the data source causes an error.\r\nThe error log shows the following error\r\nSince the test connection succeeds, we believe it is an application anomaly in Redash.\r\n\r\n```\r\nserver_1 | KeyError: 'type'\r\nserver_1 | [2023-07-07 05:01:02,196][PID:9087][ERROR][redash.app] Exception on /api/queries/71/results/2093.csv [GET]\r\nserver_1 | Traceback (most recent call last):\r\nserver_1 | File \"/usr/local/lib/python3.7/site-packages/flask/app.py\", line 1949, in full_dispatch_request\r\nserver_1 | rv = self.dispatch_request()\r\nserver_1 | File \"/usr/local/lib/python3.7/site-packages/flask/app.py\", line 1935, in dispatch_request\r\nserver_1 | return self.view_functions[rule.endpoint](**req.view_args)\r\nserver_1 | File \"/usr/local/lib/python3.7/site-packages/flask_restful/__init__.py\", line 458, in wrapper\r\nserver_1 | resp = resource(*args, **kwargs)\r\nserver_1 | File \"/usr/local/lib/python3.7/site-packages/flask_login/utils.py\", line 261, in decorated_view\r\nserver_1 | return func(*args, **kwargs)\r\nserver_1 | File \"/usr/local/lib/python3.7/site-packages/flask/views.py\", line 89, in view\r\nserver_1 | return self.dispatch_request(*args, **kwargs)\r\nserver_1 | File \"/app/redash/handlers/base.py\", line 33, in dispatch_request\r\nserver_1 | return super(BaseResource, self).dispatch_request(*args, **kwargs)\r\nserver_1 | File \"/usr/local/lib/python3.7/site-packages/flask_restful/__init__.py\", line 573, in dispatch_request\r\nserver_1 | resp = meth(*args, **kwargs)\r\nserver_1 | File \"/app/redash/permissions.py\", line 71, in decorated\r\nserver_1 | return fn(*args, **kwargs)\r\nserver_1 | File \"/app/redash/handlers/query_results.py\", line 409, in get\r\nserver_1 | response = response_builders[filetype](query_result)\r\nserver_1 | File \"/app/redash/handlers/query_results.py\", line 439, in make_csv_response\r\nserver_1 | serialize_query_result_to_dsv(query_result, \",\"), 200, headers\r\nserver_1 | File \"/app/redash/serializers/query_result.py\", line 87, in serialize_query_result_to_dsv\r\nserver_1 | fieldnames, special_columns = _get_column_lists(query_data[\"columns\"] or [])\r\nserver_1 | File \"/app/redash/serializers/query_result.py\", line 68, in _get_column_lists\r\nserver_1 | if col[\"type\"] == col_type:\r\nserver_1 | KeyError: 'type'\r\n```\r\nBelow is the JSON data when CSV download fails.\r\n(Some parts are excerpted due to the length of the file.)\r\n\r\n```\r\n{\r\n \"query_result\": {\r\n \"id\": 2093,\r\n \"query\": \"SELECT\\n SUM(d3) / 60\\nFROM\\n charger \\nWHERE\\n chg_id = '1'\\n AND time >= '2023-04-30T15:00:00Z'\\n AND time < '2023-05-03T15:00:00Z'\\nGROUP BY chg_id, time(15m) fill(linear)\\nlimit 10;\",\r\n \"data\": {\r\n \"columns\": [{ \"name\": \"time\" }, { \"name\": \"sum\" }, { \"name\": \"chg_id\" }],\r\n \"rows\": [\r\n { \"time\": \"2023-04-30T15:00:00Z\", \"sum\": 0, \"chg_id\": \"1\" },\r\n ]\r\n }\r\n }\r\n}\r\n```\r\n\r\nBelow is the JSON data for a successful CSV download.\r\n\r\n```\r\n \"columns\": [\r\n { \"name\": \"id\", \"friendly_name\": \"id\", \"type\": \"integer\" },\r\n {\r\n \"name\": \"project_id\",\r\n \"friendly_name\": \"project_id\",\r\n \"type\": \"integer\"\r\n },\r\n { \"name\": \"name\", \"friendly_name\": \"name\", \"type\": \"string\" },\r\n { \"name\": \"filters\", \"friendly_name\": \"filters\", \"type\": null },\r\n { \"name\": \"user_id\", \"friendly_name\": \"user_id\", \"type\": \"integer\" },\r\n {\r\n \"name\": \"column_names\",\r\n \"friendly_name\": \"column_names\",\r\n \"type\": null\r\n },\r\n {\r\n```\r\nIn the normal case, an element is generated for each column,\r\nIn the case of failed data, three columns made up one element.\r\nTherefore, the required type element was missing, resulting in a program error.\r\nThe following is a part of the program that caused the error.\r\n```\r\n for col in columns:\r\n fieldnames.append(col[\"name\"])\r\n\r\n for col_type in special_types.keys():\r\n if col[\"type\"] == col_type:\r\n special_columns[col[\"name\"]] = special_types[col_type]\r\n```\r\nThis is just a guess, I am guessing, but it seems to me that the SQL results being executed against InfluxDB are special and are not being converted properly in Redash, which is what is causing the problem.\r\n\r\nAll text translated by Google Translate.\n", "before_files": [{"content": "import logging\n\nfrom redash.query_runner import BaseQueryRunner, register\nfrom redash.utils import json_dumps\n\nlogger = logging.getLogger(__name__)\n\ntry:\n from influxdb import InfluxDBClient\n\n enabled = True\n\nexcept ImportError:\n enabled = False\n\n\ndef _transform_result(results):\n result_columns = []\n result_rows = []\n\n for result in results:\n for series in result.raw.get(\"series\", []):\n for column in series[\"columns\"]:\n if column not in result_columns:\n result_columns.append(column)\n tags = series.get(\"tags\", {})\n for key in tags.keys():\n if key not in result_columns:\n result_columns.append(key)\n\n for result in results:\n for series in result.raw.get(\"series\", []):\n for point in series[\"values\"]:\n result_row = {}\n for column in result_columns:\n tags = series.get(\"tags\", {})\n if column in tags:\n result_row[column] = tags[column]\n elif column in series[\"columns\"]:\n index = series[\"columns\"].index(column)\n value = point[index]\n result_row[column] = value\n result_rows.append(result_row)\n\n return json_dumps({\"columns\": [{\"name\": c} for c in result_columns], \"rows\": result_rows})\n\n\nclass InfluxDB(BaseQueryRunner):\n should_annotate_query = False\n noop_query = \"show measurements limit 1\"\n\n @classmethod\n def configuration_schema(cls):\n return {\n \"type\": \"object\",\n \"properties\": {\"url\": {\"type\": \"string\"}},\n \"required\": [\"url\"],\n }\n\n @classmethod\n def enabled(cls):\n return enabled\n\n @classmethod\n def type(cls):\n return \"influxdb\"\n\n def run_query(self, query, user):\n client = InfluxDBClient.from_dsn(self.configuration[\"url\"])\n\n logger.debug(\"influxdb url: %s\", self.configuration[\"url\"])\n logger.debug(\"influxdb got query: %s\", query)\n\n try:\n results = client.query(query)\n if not isinstance(results, list):\n results = [results]\n\n json_data = _transform_result(results)\n error = None\n except Exception as ex:\n json_data = None\n error = str(ex)\n\n return json_data, error\n\n\nregister(InfluxDB)\n", "path": "redash/query_runner/influx_db.py"}]}
| 2,524 | 548 |
gh_patches_debug_7638
|
rasdani/github-patches
|
git_diff
|
Lightning-AI__pytorch-lightning-1512
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
bug(logger): wandb fails on sweep
## 🐛 Bug
When using `wandb` sweeps for hyperparameters search, I get this error:
> wandb: ERROR Attempted to change value of key "dropout_std" from 0.030424838979365657 to 0.030424838979365654
The reason is I ran:
```python
wandb_logger.log_hyperparams(params)
```
Which I guess has some problem with floating-point numbers in high accuracy?
bug(logger): wandb fails on sweep
## 🐛 Bug
When using `wandb` sweeps for hyperparameters search, I get this error:
> wandb: ERROR Attempted to change value of key "dropout_std" from 0.030424838979365657 to 0.030424838979365654
The reason is I ran:
```python
wandb_logger.log_hyperparams(params)
```
Which I guess has some problem with floating-point numbers in high accuracy?
</issue>
<code>
[start of pytorch_lightning/loggers/wandb.py]
1 """
2 Weights and Biases
3 ------------------
4 """
5 import os
6 from argparse import Namespace
7 from typing import Optional, List, Dict, Union, Any
8
9 import torch.nn as nn
10
11 try:
12 import wandb
13 from wandb.wandb_run import Run
14 except ImportError: # pragma: no-cover
15 raise ImportError('You want to use `wandb` logger which is not installed yet,' # pragma: no-cover
16 ' install it with `pip install wandb`.')
17
18 from pytorch_lightning.loggers.base import LightningLoggerBase, rank_zero_only
19
20
21 class WandbLogger(LightningLoggerBase):
22 """
23 Log using `Weights and Biases <https://www.wandb.com/>`_. Install it with pip:
24
25 .. code-block:: bash
26
27 pip install wandb
28
29 Args:
30 name: Display name for the run.
31 save_dir: Path where data is saved.
32 offline: Run offline (data can be streamed later to wandb servers).
33 id: Sets the version, mainly used to resume a previous run.
34 anonymous: Enables or explicitly disables anonymous logging.
35 version: Sets the version, mainly used to resume a previous run.
36 project: The name of the project to which this run will belong.
37 tags: Tags associated with this run.
38 log_model: Save checkpoints in wandb dir to upload on W&B servers.
39 experiment: WandB experiment object
40 entity: The team posting this run (default: your username or your default team)
41
42 Example:
43 >>> from pytorch_lightning.loggers import WandbLogger
44 >>> from pytorch_lightning import Trainer
45 >>> wandb_logger = WandbLogger()
46 >>> trainer = Trainer(logger=wandb_logger)
47
48 See Also:
49 - `Tutorial <https://app.wandb.ai/cayush/pytorchlightning/reports/
50 Use-Pytorch-Lightning-with-Weights-%26-Biases--Vmlldzo2NjQ1Mw>`__
51 on how to use W&B with Pytorch Lightning.
52
53 """
54
55 def __init__(self,
56 name: Optional[str] = None,
57 save_dir: Optional[str] = None,
58 offline: bool = False,
59 id: Optional[str] = None,
60 anonymous: bool = False,
61 version: Optional[str] = None,
62 project: Optional[str] = None,
63 tags: Optional[List[str]] = None,
64 log_model: bool = False,
65 experiment=None,
66 entity=None):
67 super().__init__()
68 self._name = name
69 self._save_dir = save_dir
70 self._anonymous = 'allow' if anonymous else None
71 self._id = version or id
72 self._tags = tags
73 self._project = project
74 self._experiment = experiment
75 self._offline = offline
76 self._entity = entity
77 self._log_model = log_model
78
79 def __getstate__(self):
80 state = self.__dict__.copy()
81 # args needed to reload correct experiment
82 state['_id'] = self._experiment.id if self._experiment is not None else None
83
84 # cannot be pickled
85 state['_experiment'] = None
86 return state
87
88 @property
89 def experiment(self) -> Run:
90 r"""
91
92 Actual wandb object. To use wandb features in your
93 :class:`~pytorch_lightning.core.lightning.LightningModule` do the following.
94
95 Example::
96
97 self.logger.experiment.some_wandb_function()
98
99 """
100 if self._experiment is None:
101 if self._offline:
102 os.environ['WANDB_MODE'] = 'dryrun'
103 self._experiment = wandb.init(
104 name=self._name, dir=self._save_dir, project=self._project, anonymous=self._anonymous,
105 reinit=True, id=self._id, resume='allow', tags=self._tags, entity=self._entity)
106 # save checkpoints in wandb dir to upload on W&B servers
107 if self._log_model:
108 self.save_dir = self._experiment.dir
109 return self._experiment
110
111 def watch(self, model: nn.Module, log: str = 'gradients', log_freq: int = 100):
112 self.experiment.watch(model, log=log, log_freq=log_freq)
113
114 @rank_zero_only
115 def log_hyperparams(self, params: Union[Dict[str, Any], Namespace]) -> None:
116 params = self._convert_params(params)
117 self.experiment.config.update(params)
118
119 @rank_zero_only
120 def log_metrics(self, metrics: Dict[str, float], step: Optional[int] = None) -> None:
121 if step is not None:
122 metrics['global_step'] = step
123 self.experiment.log(metrics)
124
125 @property
126 def name(self) -> str:
127 # don't create an experiment if we don't have one
128 name = self._experiment.project_name() if self._experiment else None
129 return name
130
131 @property
132 def version(self) -> str:
133 # don't create an experiment if we don't have one
134 return self._experiment.id if self._experiment else None
135
[end of pytorch_lightning/loggers/wandb.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/pytorch_lightning/loggers/wandb.py b/pytorch_lightning/loggers/wandb.py
--- a/pytorch_lightning/loggers/wandb.py
+++ b/pytorch_lightning/loggers/wandb.py
@@ -114,7 +114,7 @@
@rank_zero_only
def log_hyperparams(self, params: Union[Dict[str, Any], Namespace]) -> None:
params = self._convert_params(params)
- self.experiment.config.update(params)
+ self.experiment.config.update(params, allow_val_change=True)
@rank_zero_only
def log_metrics(self, metrics: Dict[str, float], step: Optional[int] = None) -> None:
|
{"golden_diff": "diff --git a/pytorch_lightning/loggers/wandb.py b/pytorch_lightning/loggers/wandb.py\n--- a/pytorch_lightning/loggers/wandb.py\n+++ b/pytorch_lightning/loggers/wandb.py\n@@ -114,7 +114,7 @@\n @rank_zero_only\n def log_hyperparams(self, params: Union[Dict[str, Any], Namespace]) -> None:\n params = self._convert_params(params)\n- self.experiment.config.update(params)\n+ self.experiment.config.update(params, allow_val_change=True)\n \n @rank_zero_only\n def log_metrics(self, metrics: Dict[str, float], step: Optional[int] = None) -> None:\n", "issue": "bug(logger): wandb fails on sweep\n## \ud83d\udc1b Bug\r\n\r\nWhen using `wandb` sweeps for hyperparameters search, I get this error:\r\n> wandb: ERROR Attempted to change value of key \"dropout_std\" from 0.030424838979365657 to 0.030424838979365654\r\n\r\nThe reason is I ran:\r\n```python\r\nwandb_logger.log_hyperparams(params)\r\n```\r\n\r\nWhich I guess has some problem with floating-point numbers in high accuracy?\r\n\nbug(logger): wandb fails on sweep\n## \ud83d\udc1b Bug\r\n\r\nWhen using `wandb` sweeps for hyperparameters search, I get this error:\r\n> wandb: ERROR Attempted to change value of key \"dropout_std\" from 0.030424838979365657 to 0.030424838979365654\r\n\r\nThe reason is I ran:\r\n```python\r\nwandb_logger.log_hyperparams(params)\r\n```\r\n\r\nWhich I guess has some problem with floating-point numbers in high accuracy?\r\n\n", "before_files": [{"content": "\"\"\"\nWeights and Biases\n------------------\n\"\"\"\nimport os\nfrom argparse import Namespace\nfrom typing import Optional, List, Dict, Union, Any\n\nimport torch.nn as nn\n\ntry:\n import wandb\n from wandb.wandb_run import Run\nexcept ImportError: # pragma: no-cover\n raise ImportError('You want to use `wandb` logger which is not installed yet,' # pragma: no-cover\n ' install it with `pip install wandb`.')\n\nfrom pytorch_lightning.loggers.base import LightningLoggerBase, rank_zero_only\n\n\nclass WandbLogger(LightningLoggerBase):\n \"\"\"\n Log using `Weights and Biases <https://www.wandb.com/>`_. Install it with pip:\n\n .. code-block:: bash\n\n pip install wandb\n\n Args:\n name: Display name for the run.\n save_dir: Path where data is saved.\n offline: Run offline (data can be streamed later to wandb servers).\n id: Sets the version, mainly used to resume a previous run.\n anonymous: Enables or explicitly disables anonymous logging.\n version: Sets the version, mainly used to resume a previous run.\n project: The name of the project to which this run will belong.\n tags: Tags associated with this run.\n log_model: Save checkpoints in wandb dir to upload on W&B servers.\n experiment: WandB experiment object\n entity: The team posting this run (default: your username or your default team)\n\n Example:\n >>> from pytorch_lightning.loggers import WandbLogger\n >>> from pytorch_lightning import Trainer\n >>> wandb_logger = WandbLogger()\n >>> trainer = Trainer(logger=wandb_logger)\n\n See Also:\n - `Tutorial <https://app.wandb.ai/cayush/pytorchlightning/reports/\n Use-Pytorch-Lightning-with-Weights-%26-Biases--Vmlldzo2NjQ1Mw>`__\n on how to use W&B with Pytorch Lightning.\n\n \"\"\"\n\n def __init__(self,\n name: Optional[str] = None,\n save_dir: Optional[str] = None,\n offline: bool = False,\n id: Optional[str] = None,\n anonymous: bool = False,\n version: Optional[str] = None,\n project: Optional[str] = None,\n tags: Optional[List[str]] = None,\n log_model: bool = False,\n experiment=None,\n entity=None):\n super().__init__()\n self._name = name\n self._save_dir = save_dir\n self._anonymous = 'allow' if anonymous else None\n self._id = version or id\n self._tags = tags\n self._project = project\n self._experiment = experiment\n self._offline = offline\n self._entity = entity\n self._log_model = log_model\n\n def __getstate__(self):\n state = self.__dict__.copy()\n # args needed to reload correct experiment\n state['_id'] = self._experiment.id if self._experiment is not None else None\n\n # cannot be pickled\n state['_experiment'] = None\n return state\n\n @property\n def experiment(self) -> Run:\n r\"\"\"\n\n Actual wandb object. To use wandb features in your\n :class:`~pytorch_lightning.core.lightning.LightningModule` do the following.\n\n Example::\n\n self.logger.experiment.some_wandb_function()\n\n \"\"\"\n if self._experiment is None:\n if self._offline:\n os.environ['WANDB_MODE'] = 'dryrun'\n self._experiment = wandb.init(\n name=self._name, dir=self._save_dir, project=self._project, anonymous=self._anonymous,\n reinit=True, id=self._id, resume='allow', tags=self._tags, entity=self._entity)\n # save checkpoints in wandb dir to upload on W&B servers\n if self._log_model:\n self.save_dir = self._experiment.dir\n return self._experiment\n\n def watch(self, model: nn.Module, log: str = 'gradients', log_freq: int = 100):\n self.experiment.watch(model, log=log, log_freq=log_freq)\n\n @rank_zero_only\n def log_hyperparams(self, params: Union[Dict[str, Any], Namespace]) -> None:\n params = self._convert_params(params)\n self.experiment.config.update(params)\n\n @rank_zero_only\n def log_metrics(self, metrics: Dict[str, float], step: Optional[int] = None) -> None:\n if step is not None:\n metrics['global_step'] = step\n self.experiment.log(metrics)\n\n @property\n def name(self) -> str:\n # don't create an experiment if we don't have one\n name = self._experiment.project_name() if self._experiment else None\n return name\n\n @property\n def version(self) -> str:\n # don't create an experiment if we don't have one\n return self._experiment.id if self._experiment else None\n", "path": "pytorch_lightning/loggers/wandb.py"}]}
| 2,209 | 156 |
gh_patches_debug_23916
|
rasdani/github-patches
|
git_diff
|
pypa__virtualenv-2220
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
`--prompt .` : the dot causes the basename of the current directory to be used
**What's the problem this feature will solve?**
<!-- What are you trying to do, that you are unable to achieve with pip as it currently stands? -->
I'd like an easy way to have the prompt reflect the directory the env was created in.
**Describe the solution you'd like**
<!-- Clear and concise description of what you want to happen. -->
I'd like `--prompt .` to use the basename of the current directory for the prompt, similar to what venv does.
More specifically, the prompt should be the directory in parentheses.
<!-- Provide examples of real world use cases that this would enable and how it solves the problem described above. -->
```bash
$ mkdir foo
$ cd foo
$ virtualenv venv --prompt .
$ source venv/bin/activate
(foo) $
```
**Alternative Solutions**
<!-- Have you tried to workaround the problem using pip or other tools? Or a different approach to solving this issue? Please elaborate here. -->
We could change the default prompt to be this. that'd be cool.
**Additional context**
<!-- Add any other context, links, etc. about the feature here. -->
This as been in the venv implementation of Pyhon since Python 3.9.something.
Python 3 documentation: https://docs.python.org/3/library/venv.html#api
> prompt – a String to be used after virtual environment is activated (defaults to None which means directory name of the environment would be used). _If the special string "." is provided, the basename of the current directory is used as the prompt._
</issue>
<code>
[start of src/virtualenv/run/plugin/activators.py]
1 from __future__ import absolute_import, unicode_literals
2
3 from argparse import ArgumentTypeError
4 from collections import OrderedDict
5
6 from .base import ComponentBuilder
7
8
9 class ActivationSelector(ComponentBuilder):
10 def __init__(self, interpreter, parser):
11 self.default = None
12 possible = OrderedDict(
13 (k, v) for k, v in self.options("virtualenv.activate").items() if v.supports(interpreter)
14 )
15 super(ActivationSelector, self).__init__(interpreter, parser, "activators", possible)
16 self.parser.description = "options for activation scripts"
17 self.active = None
18
19 def add_selector_arg_parse(self, name, choices):
20 self.default = ",".join(choices)
21 self.parser.add_argument(
22 "--{}".format(name),
23 default=self.default,
24 metavar="comma_sep_list",
25 required=False,
26 help="activators to generate - default is all supported",
27 type=self._extract_activators,
28 )
29
30 def _extract_activators(self, entered_str):
31 elements = [e.strip() for e in entered_str.split(",") if e.strip()]
32 missing = [e for e in elements if e not in self.possible]
33 if missing:
34 raise ArgumentTypeError("the following activators are not available {}".format(",".join(missing)))
35 return elements
36
37 def handle_selected_arg_parse(self, options):
38 selected_activators = (
39 self._extract_activators(self.default) if options.activators is self.default else options.activators
40 )
41 self.active = {k: v for k, v in self.possible.items() if k in selected_activators}
42 self.parser.add_argument(
43 "--prompt",
44 dest="prompt",
45 metavar="prompt",
46 help="provides an alternative prompt prefix for this environment",
47 default=None,
48 )
49 for activator in self.active.values():
50 activator.add_parser_arguments(self.parser, self.interpreter)
51
52 def create(self, options):
53 return [activator_class(options) for activator_class in self.active.values()]
54
[end of src/virtualenv/run/plugin/activators.py]
[start of src/virtualenv/activation/activator.py]
1 from __future__ import absolute_import, unicode_literals
2
3 from abc import ABCMeta, abstractmethod
4
5 from six import add_metaclass
6
7
8 @add_metaclass(ABCMeta)
9 class Activator(object):
10 """Generates an activate script for the virtual environment"""
11
12 def __init__(self, options):
13 """Create a new activator generator.
14
15 :param options: the parsed options as defined within :meth:`add_parser_arguments`
16 """
17 self.flag_prompt = options.prompt
18
19 @classmethod
20 def supports(cls, interpreter):
21 """Check if the activation script is supported in the given interpreter.
22
23 :param interpreter: the interpreter we need to support
24 :return: ``True`` if supported, ``False`` otherwise
25 """
26 return True
27
28 @classmethod
29 def add_parser_arguments(cls, parser, interpreter):
30 """
31 Add CLI arguments for this activation script.
32
33 :param parser: the CLI parser
34 :param interpreter: the interpreter this virtual environment is based of
35 """
36
37 @abstractmethod
38 def generate(self, creator):
39 """Generate the activate script for the given creator.
40
41 :param creator: the creator (based of :class:`virtualenv.create.creator.Creator`) we used to create this \
42 virtual environment
43 """
44 raise NotImplementedError
45
[end of src/virtualenv/activation/activator.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/src/virtualenv/activation/activator.py b/src/virtualenv/activation/activator.py
--- a/src/virtualenv/activation/activator.py
+++ b/src/virtualenv/activation/activator.py
@@ -1,5 +1,6 @@
from __future__ import absolute_import, unicode_literals
+import os
from abc import ABCMeta, abstractmethod
from six import add_metaclass
@@ -14,7 +15,7 @@
:param options: the parsed options as defined within :meth:`add_parser_arguments`
"""
- self.flag_prompt = options.prompt
+ self.flag_prompt = os.path.basename(os.getcwd()) if options.prompt == "." else options.prompt
@classmethod
def supports(cls, interpreter):
diff --git a/src/virtualenv/run/plugin/activators.py b/src/virtualenv/run/plugin/activators.py
--- a/src/virtualenv/run/plugin/activators.py
+++ b/src/virtualenv/run/plugin/activators.py
@@ -43,7 +43,10 @@
"--prompt",
dest="prompt",
metavar="prompt",
- help="provides an alternative prompt prefix for this environment",
+ help=(
+ "provides an alternative prompt prefix for this environment "
+ "(value of . means name of the current working directory)"
+ ),
default=None,
)
for activator in self.active.values():
|
{"golden_diff": "diff --git a/src/virtualenv/activation/activator.py b/src/virtualenv/activation/activator.py\n--- a/src/virtualenv/activation/activator.py\n+++ b/src/virtualenv/activation/activator.py\n@@ -1,5 +1,6 @@\n from __future__ import absolute_import, unicode_literals\n \n+import os\n from abc import ABCMeta, abstractmethod\n \n from six import add_metaclass\n@@ -14,7 +15,7 @@\n \n :param options: the parsed options as defined within :meth:`add_parser_arguments`\n \"\"\"\n- self.flag_prompt = options.prompt\n+ self.flag_prompt = os.path.basename(os.getcwd()) if options.prompt == \".\" else options.prompt\n \n @classmethod\n def supports(cls, interpreter):\ndiff --git a/src/virtualenv/run/plugin/activators.py b/src/virtualenv/run/plugin/activators.py\n--- a/src/virtualenv/run/plugin/activators.py\n+++ b/src/virtualenv/run/plugin/activators.py\n@@ -43,7 +43,10 @@\n \"--prompt\",\n dest=\"prompt\",\n metavar=\"prompt\",\n- help=\"provides an alternative prompt prefix for this environment\",\n+ help=(\n+ \"provides an alternative prompt prefix for this environment \"\n+ \"(value of . means name of the current working directory)\"\n+ ),\n default=None,\n )\n for activator in self.active.values():\n", "issue": "`--prompt .` : the dot causes the basename of the current directory to be used\n**What's the problem this feature will solve?**\r\n<!-- What are you trying to do, that you are unable to achieve with pip as it currently stands? -->\r\nI'd like an easy way to have the prompt reflect the directory the env was created in.\r\n\r\n**Describe the solution you'd like**\r\n<!-- Clear and concise description of what you want to happen. -->\r\nI'd like `--prompt .` to use the basename of the current directory for the prompt, similar to what venv does. \r\nMore specifically, the prompt should be the directory in parentheses. \r\n\r\n<!-- Provide examples of real world use cases that this would enable and how it solves the problem described above. -->\r\n```bash\r\n$ mkdir foo\r\n$ cd foo\r\n$ virtualenv venv --prompt .\r\n$ source venv/bin/activate\r\n(foo) $ \r\n```\r\n\r\n**Alternative Solutions**\r\n<!-- Have you tried to workaround the problem using pip or other tools? Or a different approach to solving this issue? Please elaborate here. -->\r\nWe could change the default prompt to be this. that'd be cool. \r\n\r\n**Additional context**\r\n<!-- Add any other context, links, etc. about the feature here. -->\r\nThis as been in the venv implementation of Pyhon since Python 3.9.something.\r\n\r\nPython 3 documentation: https://docs.python.org/3/library/venv.html#api \r\n\r\n> prompt \u2013 a String to be used after virtual environment is activated (defaults to None which means directory name of the environment would be used). _If the special string \".\" is provided, the basename of the current directory is used as the prompt._\r\n\n", "before_files": [{"content": "from __future__ import absolute_import, unicode_literals\n\nfrom argparse import ArgumentTypeError\nfrom collections import OrderedDict\n\nfrom .base import ComponentBuilder\n\n\nclass ActivationSelector(ComponentBuilder):\n def __init__(self, interpreter, parser):\n self.default = None\n possible = OrderedDict(\n (k, v) for k, v in self.options(\"virtualenv.activate\").items() if v.supports(interpreter)\n )\n super(ActivationSelector, self).__init__(interpreter, parser, \"activators\", possible)\n self.parser.description = \"options for activation scripts\"\n self.active = None\n\n def add_selector_arg_parse(self, name, choices):\n self.default = \",\".join(choices)\n self.parser.add_argument(\n \"--{}\".format(name),\n default=self.default,\n metavar=\"comma_sep_list\",\n required=False,\n help=\"activators to generate - default is all supported\",\n type=self._extract_activators,\n )\n\n def _extract_activators(self, entered_str):\n elements = [e.strip() for e in entered_str.split(\",\") if e.strip()]\n missing = [e for e in elements if e not in self.possible]\n if missing:\n raise ArgumentTypeError(\"the following activators are not available {}\".format(\",\".join(missing)))\n return elements\n\n def handle_selected_arg_parse(self, options):\n selected_activators = (\n self._extract_activators(self.default) if options.activators is self.default else options.activators\n )\n self.active = {k: v for k, v in self.possible.items() if k in selected_activators}\n self.parser.add_argument(\n \"--prompt\",\n dest=\"prompt\",\n metavar=\"prompt\",\n help=\"provides an alternative prompt prefix for this environment\",\n default=None,\n )\n for activator in self.active.values():\n activator.add_parser_arguments(self.parser, self.interpreter)\n\n def create(self, options):\n return [activator_class(options) for activator_class in self.active.values()]\n", "path": "src/virtualenv/run/plugin/activators.py"}, {"content": "from __future__ import absolute_import, unicode_literals\n\nfrom abc import ABCMeta, abstractmethod\n\nfrom six import add_metaclass\n\n\n@add_metaclass(ABCMeta)\nclass Activator(object):\n \"\"\"Generates an activate script for the virtual environment\"\"\"\n\n def __init__(self, options):\n \"\"\"Create a new activator generator.\n\n :param options: the parsed options as defined within :meth:`add_parser_arguments`\n \"\"\"\n self.flag_prompt = options.prompt\n\n @classmethod\n def supports(cls, interpreter):\n \"\"\"Check if the activation script is supported in the given interpreter.\n\n :param interpreter: the interpreter we need to support\n :return: ``True`` if supported, ``False`` otherwise\n \"\"\"\n return True\n\n @classmethod\n def add_parser_arguments(cls, parser, interpreter):\n \"\"\"\n Add CLI arguments for this activation script.\n\n :param parser: the CLI parser\n :param interpreter: the interpreter this virtual environment is based of\n \"\"\"\n\n @abstractmethod\n def generate(self, creator):\n \"\"\"Generate the activate script for the given creator.\n\n :param creator: the creator (based of :class:`virtualenv.create.creator.Creator`) we used to create this \\\n virtual environment\n \"\"\"\n raise NotImplementedError\n", "path": "src/virtualenv/activation/activator.py"}]}
| 1,803 | 309 |
gh_patches_debug_38221
|
rasdani/github-patches
|
git_diff
|
ros__ros_comm-492
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
rospy.sleep(): request for specific exception if time moved backwards
I kindly request for the TODO of rospy.sleep() in [rospy.timer.py](https://github.com/ros/ros_comm/blob/hydro-devel/clients/rospy/src/rospy/timer.py) to be implemented and use a specific exception if ros time moved backwards.
I had trouble to find the cause of a python node shutting down, when using 'rosbag play -l --clock bagfile'. When the implementation follows the ros tutorials on python the ROSInterruptException is always catched:
``` python
if __name__ == '__main__':
try:
talker()
except rospy.ROSInterruptException: pass
```
And there is no error message telling you, that time moved backwards.
</issue>
<code>
[start of clients/rospy/src/rospy/timer.py]
1 # Software License Agreement (BSD License)
2 #
3 # Copyright (c) 2010, Willow Garage, Inc.
4 # All rights reserved.
5 #
6 # Redistribution and use in source and binary forms, with or without
7 # modification, are permitted provided that the following conditions
8 # are met:
9 #
10 # * Redistributions of source code must retain the above copyright
11 # notice, this list of conditions and the following disclaimer.
12 # * Redistributions in binary form must reproduce the above
13 # copyright notice, this list of conditions and the following
14 # disclaimer in the documentation and/or other materials provided
15 # with the distribution.
16 # * Neither the name of Willow Garage, Inc. nor the names of its
17 # contributors may be used to endorse or promote products derived
18 # from this software without specific prior written permission.
19 #
20 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
23 # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
24 # COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
25 # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
26 # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
27 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
28 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
30 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31 # POSSIBILITY OF SUCH DAMAGE.
32 #
33 # Revision $Id: __init__.py 12069 2010-11-09 20:31:55Z kwc $
34
35 import threading
36 import time
37
38 # for Time, Duration
39 import genpy
40
41 import rospy.core
42 import rospy.rostime
43
44 # author: tfield (Timers)
45 # author: kwc (Rate, sleep)
46
47 class Rate(object):
48 """
49 Convenience class for sleeping in a loop at a specified rate
50 """
51
52 def __init__(self, hz):
53 """
54 Constructor.
55 @param hz: hz rate to determine sleeping
56 @type hz: int
57 """
58 # #1403
59 self.last_time = rospy.rostime.get_rostime()
60 self.sleep_dur = rospy.rostime.Duration(0, int(1e9/hz))
61
62 def sleep(self):
63 """
64 Attempt sleep at the specified rate. sleep() takes into
65 account the time elapsed since the last successful
66 sleep().
67
68 @raise ROSInterruptException: if ROS time is set backwards or if
69 ROS shutdown occurs before sleep completes
70 """
71 curr_time = rospy.rostime.get_rostime()
72 # detect time jumping backwards
73 if self.last_time > curr_time:
74 self.last_time = curr_time
75
76 # calculate sleep interval
77 elapsed = curr_time - self.last_time
78 sleep(self.sleep_dur - elapsed)
79 self.last_time = self.last_time + self.sleep_dur
80
81 # detect time jumping forwards, as well as loops that are
82 # inherently too slow
83 if curr_time - self.last_time > self.sleep_dur * 2:
84 self.last_time = curr_time
85
86 # TODO: may want more specific exceptions for sleep
87 def sleep(duration):
88 """
89 sleep for the specified duration in ROS time. If duration
90 is negative, sleep immediately returns.
91
92 @param duration: seconds (or rospy.Duration) to sleep
93 @type duration: float or Duration
94 @raise ROSInterruptException: if ROS time is set backwards or if
95 ROS shutdown occurs before sleep completes
96 """
97 if rospy.rostime.is_wallclock():
98 if isinstance(duration, genpy.Duration):
99 duration = duration.to_sec()
100 if duration < 0:
101 return
102 else:
103 rospy.rostime.wallsleep(duration)
104 else:
105 initial_rostime = rospy.rostime.get_rostime()
106 if not isinstance(duration, genpy.Duration):
107 duration = genpy.Duration.from_sec(duration)
108
109 rostime_cond = rospy.rostime.get_rostime_cond()
110
111 # #3123
112 if initial_rostime == genpy.Time(0):
113 # break loop if time is initialized or node is shutdown
114 while initial_rostime == genpy.Time(0) and \
115 not rospy.core.is_shutdown():
116 with rostime_cond:
117 rostime_cond.wait(0.3)
118 initial_rostime = rospy.rostime.get_rostime()
119
120 sleep_t = initial_rostime + duration
121
122 # break loop if sleep_t is reached, time moves backwards, or
123 # node is shutdown
124 while rospy.rostime.get_rostime() < sleep_t and \
125 rospy.rostime.get_rostime() >= initial_rostime and \
126 not rospy.core.is_shutdown():
127 with rostime_cond:
128 rostime_cond.wait(0.5)
129
130 if rospy.rostime.get_rostime() < initial_rostime:
131 raise rospy.exceptions.ROSInterruptException("ROS time moved backwards")
132 if rospy.core.is_shutdown():
133 raise rospy.exceptions.ROSInterruptException("ROS shutdown request")
134
135 class TimerEvent(object):
136 """
137 Constructor.
138 @param last_expected: in a perfect world, this is when the previous callback should have happened
139 @type last_expected: rospy.Time
140 @param last_real: when the callback actually happened
141 @type last_real: rospy.Time
142 @param current_expected: in a perfect world, this is when the current callback should have been called
143 @type current_expected: rospy.Time
144 @param last_duration: contains the duration of the last callback (end time minus start time) in seconds.
145 Note that this is always in wall-clock time.
146 @type last_duration: float
147 """
148 def __init__(self, last_expected, last_real, current_expected, current_real, last_duration):
149 self.last_expected = last_expected
150 self.last_real = last_real
151 self.current_expected = current_expected
152 self.current_real = current_real
153 self.last_duration = last_duration
154
155 class Timer(threading.Thread):
156 """
157 Convenience class for calling a callback at a specified rate
158 """
159
160 def __init__(self, period, callback, oneshot=False):
161 """
162 Constructor.
163 @param period: desired period between callbacks
164 @type period: rospy.Time
165 @param callback: callback to be called
166 @type callback: function taking rospy.TimerEvent
167 @param oneshot: if True, fire only once, otherwise fire continuously until shutdown is called [default: False]
168 @type oneshot: bool
169 """
170 threading.Thread.__init__(self)
171 self._period = period
172 self._callback = callback
173 self._oneshot = oneshot
174 self._shutdown = False
175 self.setDaemon(True)
176 self.start()
177
178 def shutdown(self):
179 """
180 Stop firing callbacks.
181 """
182 self._shutdown = True
183
184 def run(self):
185 r = Rate(1.0 / self._period.to_sec())
186 current_expected = rospy.rostime.get_rostime() + self._period
187 last_expected, last_real, last_duration = None, None, None
188 while not rospy.core.is_shutdown() and not self._shutdown:
189 r.sleep()
190 if self._shutdown:
191 break
192 current_real = rospy.rostime.get_rostime()
193 start = time.time()
194 self._callback(TimerEvent(last_expected, last_real, current_expected, current_real, last_duration))
195 if self._oneshot:
196 break
197 last_duration = time.time() - start
198 last_expected, last_real = current_expected, current_real
199 current_expected += self._period
200
[end of clients/rospy/src/rospy/timer.py]
[start of clients/rospy/src/rospy/exceptions.py]
1 # Software License Agreement (BSD License)
2 #
3 # Copyright (c) 2008, Willow Garage, Inc.
4 # All rights reserved.
5 #
6 # Redistribution and use in source and binary forms, with or without
7 # modification, are permitted provided that the following conditions
8 # are met:
9 #
10 # * Redistributions of source code must retain the above copyright
11 # notice, this list of conditions and the following disclaimer.
12 # * Redistributions in binary form must reproduce the above
13 # copyright notice, this list of conditions and the following
14 # disclaimer in the documentation and/or other materials provided
15 # with the distribution.
16 # * Neither the name of Willow Garage, Inc. nor the names of its
17 # contributors may be used to endorse or promote products derived
18 # from this software without specific prior written permission.
19 #
20 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
23 # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
24 # COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
25 # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
26 # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
27 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
28 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
30 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31 # POSSIBILITY OF SUCH DAMAGE.
32 #
33 # Revision $Id$
34
35 """rospy exception types"""
36
37 class ROSException(Exception):
38 """
39 Base exception class for ROS clients
40 """
41 pass
42
43 class ROSSerializationException(ROSException):
44 """
45 Exception for message serialization errors
46 """
47 pass
48
49 class ROSInitException(ROSException):
50 """
51 Exception for errors initializing ROS state
52 """
53 pass
54
55 class ROSInterruptException(ROSException, KeyboardInterrupt):
56 """
57 Exception for operations that interrupted, e.g. due to shutdown.
58
59 This is a subclass of both L{ROSException} and KeyboardInterrupt
60 so that it can be used in logic tht expects either.
61 """
62 pass
63
64 class ROSInternalException(Exception):
65 """
66 Base class for exceptions that are internal to the ROS system
67 """
68 pass
69
70 class TransportException(ROSInternalException):
71 """
72 Base class for transport-related exceptions
73 """
74 pass
75
76 class TransportTerminated(TransportException):
77 """
78 Internal class for representing broken connections
79 """
80 pass
81
82 class TransportInitError(TransportException):
83 """
84 Internal exception for representing exceptions that occur
85 establishing transports
86 """
87 pass
88
89
[end of clients/rospy/src/rospy/exceptions.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/clients/rospy/src/rospy/exceptions.py b/clients/rospy/src/rospy/exceptions.py
--- a/clients/rospy/src/rospy/exceptions.py
+++ b/clients/rospy/src/rospy/exceptions.py
@@ -61,6 +61,15 @@
"""
pass
+class ROSTimeMovedBackwardsException(ROSInterruptException):
+ """
+ Exception if time moved backwards
+ """
+ def __init__(self, time):
+ self.time = time
+ """The amount of time in seconds."""
+ super(ROSTimeMovedBackwardsException, self).__init__("ROS time moved backwards")
+
class ROSInternalException(Exception):
"""
Base class for exceptions that are internal to the ROS system
diff --git a/clients/rospy/src/rospy/timer.py b/clients/rospy/src/rospy/timer.py
--- a/clients/rospy/src/rospy/timer.py
+++ b/clients/rospy/src/rospy/timer.py
@@ -65,8 +65,10 @@
account the time elapsed since the last successful
sleep().
- @raise ROSInterruptException: if ROS time is set backwards or if
- ROS shutdown occurs before sleep completes
+ @raise ROSInterruptException: if ROS shutdown occurs before
+ sleep completes
+ @raise ROSTimeMovedBackwardsException: if ROS time is set
+ backwards
"""
curr_time = rospy.rostime.get_rostime()
# detect time jumping backwards
@@ -83,7 +85,6 @@
if curr_time - self.last_time > self.sleep_dur * 2:
self.last_time = curr_time
-# TODO: may want more specific exceptions for sleep
def sleep(duration):
"""
sleep for the specified duration in ROS time. If duration
@@ -91,8 +92,10 @@
@param duration: seconds (or rospy.Duration) to sleep
@type duration: float or Duration
- @raise ROSInterruptException: if ROS time is set backwards or if
- ROS shutdown occurs before sleep completes
+ @raise ROSInterruptException: if ROS shutdown occurs before sleep
+ completes
+ @raise ROSTimeMovedBackwardsException: if ROS time is set
+ backwards
"""
if rospy.rostime.is_wallclock():
if isinstance(duration, genpy.Duration):
@@ -128,7 +131,9 @@
rostime_cond.wait(0.5)
if rospy.rostime.get_rostime() < initial_rostime:
- raise rospy.exceptions.ROSInterruptException("ROS time moved backwards")
+ time_jump = (initial_rostime - rospy.rostime.get_rostime()).to_sec()
+ rospy.core.logerr("ROS time moved backwards: %ss", time_jump)
+ raise rospy.exceptions.ROSTimeMovedBackwardsException(time_jump)
if rospy.core.is_shutdown():
raise rospy.exceptions.ROSInterruptException("ROS shutdown request")
|
{"golden_diff": "diff --git a/clients/rospy/src/rospy/exceptions.py b/clients/rospy/src/rospy/exceptions.py\n--- a/clients/rospy/src/rospy/exceptions.py\n+++ b/clients/rospy/src/rospy/exceptions.py\n@@ -61,6 +61,15 @@\n \"\"\" \n pass\n \n+class ROSTimeMovedBackwardsException(ROSInterruptException): \n+ \"\"\"\n+ Exception if time moved backwards\n+ \"\"\"\n+ def __init__(self, time):\n+ self.time = time\n+ \"\"\"The amount of time in seconds.\"\"\"\n+ super(ROSTimeMovedBackwardsException, self).__init__(\"ROS time moved backwards\")\n+\n class ROSInternalException(Exception):\n \"\"\"\n Base class for exceptions that are internal to the ROS system\ndiff --git a/clients/rospy/src/rospy/timer.py b/clients/rospy/src/rospy/timer.py\n--- a/clients/rospy/src/rospy/timer.py\n+++ b/clients/rospy/src/rospy/timer.py\n@@ -65,8 +65,10 @@\n account the time elapsed since the last successful\n sleep().\n \n- @raise ROSInterruptException: if ROS time is set backwards or if\n- ROS shutdown occurs before sleep completes\n+ @raise ROSInterruptException: if ROS shutdown occurs before\n+ sleep completes\n+ @raise ROSTimeMovedBackwardsException: if ROS time is set\n+ backwards\n \"\"\"\n curr_time = rospy.rostime.get_rostime()\n # detect time jumping backwards\n@@ -83,7 +85,6 @@\n if curr_time - self.last_time > self.sleep_dur * 2:\n self.last_time = curr_time\n \n-# TODO: may want more specific exceptions for sleep\n def sleep(duration):\n \"\"\"\n sleep for the specified duration in ROS time. If duration\n@@ -91,8 +92,10 @@\n \n @param duration: seconds (or rospy.Duration) to sleep\n @type duration: float or Duration\n- @raise ROSInterruptException: if ROS time is set backwards or if\n- ROS shutdown occurs before sleep completes\n+ @raise ROSInterruptException: if ROS shutdown occurs before sleep\n+ completes\n+ @raise ROSTimeMovedBackwardsException: if ROS time is set\n+ backwards\n \"\"\"\n if rospy.rostime.is_wallclock():\n if isinstance(duration, genpy.Duration):\n@@ -128,7 +131,9 @@\n rostime_cond.wait(0.5)\n \n if rospy.rostime.get_rostime() < initial_rostime:\n- raise rospy.exceptions.ROSInterruptException(\"ROS time moved backwards\")\n+ time_jump = (initial_rostime - rospy.rostime.get_rostime()).to_sec()\n+ rospy.core.logerr(\"ROS time moved backwards: %ss\", time_jump)\n+ raise rospy.exceptions.ROSTimeMovedBackwardsException(time_jump)\n if rospy.core.is_shutdown():\n raise rospy.exceptions.ROSInterruptException(\"ROS shutdown request\")\n", "issue": "rospy.sleep(): request for specific exception if time moved backwards\nI kindly request for the TODO of rospy.sleep() in [rospy.timer.py](https://github.com/ros/ros_comm/blob/hydro-devel/clients/rospy/src/rospy/timer.py) to be implemented and use a specific exception if ros time moved backwards.\nI had trouble to find the cause of a python node shutting down, when using 'rosbag play -l --clock bagfile'. When the implementation follows the ros tutorials on python the ROSInterruptException is always catched:\n\n``` python\nif __name__ == '__main__':\n try:\n talker()\n except rospy.ROSInterruptException: pass\n```\n\nAnd there is no error message telling you, that time moved backwards.\n\n", "before_files": [{"content": "# Software License Agreement (BSD License)\n#\n# Copyright (c) 2010, Willow Garage, Inc.\n# All rights reserved.\n#\n# Redistribution and use in source and binary forms, with or without\n# modification, are permitted provided that the following conditions\n# are met:\n#\n# * Redistributions of source code must retain the above copyright\n# notice, this list of conditions and the following disclaimer.\n# * Redistributions in binary form must reproduce the above\n# copyright notice, this list of conditions and the following\n# disclaimer in the documentation and/or other materials provided\n# with the distribution.\n# * Neither the name of Willow Garage, Inc. nor the names of its\n# contributors may be used to endorse or promote products derived\n# from this software without specific prior written permission.\n#\n# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n# \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS\n# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE\n# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,\n# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN\n# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\n# POSSIBILITY OF SUCH DAMAGE.\n#\n# Revision $Id: __init__.py 12069 2010-11-09 20:31:55Z kwc $\n\nimport threading\nimport time\n\n# for Time, Duration\nimport genpy\n\nimport rospy.core\nimport rospy.rostime\n\n# author: tfield (Timers)\n# author: kwc (Rate, sleep)\n\nclass Rate(object):\n \"\"\"\n Convenience class for sleeping in a loop at a specified rate\n \"\"\"\n \n def __init__(self, hz):\n \"\"\"\n Constructor.\n @param hz: hz rate to determine sleeping\n @type hz: int\n \"\"\"\n # #1403\n self.last_time = rospy.rostime.get_rostime()\n self.sleep_dur = rospy.rostime.Duration(0, int(1e9/hz))\n\n def sleep(self):\n \"\"\"\n Attempt sleep at the specified rate. sleep() takes into\n account the time elapsed since the last successful\n sleep().\n \n @raise ROSInterruptException: if ROS time is set backwards or if\n ROS shutdown occurs before sleep completes\n \"\"\"\n curr_time = rospy.rostime.get_rostime()\n # detect time jumping backwards\n if self.last_time > curr_time:\n self.last_time = curr_time\n\n # calculate sleep interval\n elapsed = curr_time - self.last_time\n sleep(self.sleep_dur - elapsed)\n self.last_time = self.last_time + self.sleep_dur\n\n # detect time jumping forwards, as well as loops that are\n # inherently too slow\n if curr_time - self.last_time > self.sleep_dur * 2:\n self.last_time = curr_time\n\n# TODO: may want more specific exceptions for sleep\ndef sleep(duration):\n \"\"\"\n sleep for the specified duration in ROS time. If duration\n is negative, sleep immediately returns.\n \n @param duration: seconds (or rospy.Duration) to sleep\n @type duration: float or Duration\n @raise ROSInterruptException: if ROS time is set backwards or if\n ROS shutdown occurs before sleep completes\n \"\"\"\n if rospy.rostime.is_wallclock():\n if isinstance(duration, genpy.Duration):\n duration = duration.to_sec()\n if duration < 0:\n return\n else:\n rospy.rostime.wallsleep(duration)\n else:\n initial_rostime = rospy.rostime.get_rostime()\n if not isinstance(duration, genpy.Duration):\n duration = genpy.Duration.from_sec(duration)\n\n rostime_cond = rospy.rostime.get_rostime_cond()\n\n # #3123\n if initial_rostime == genpy.Time(0):\n # break loop if time is initialized or node is shutdown\n while initial_rostime == genpy.Time(0) and \\\n not rospy.core.is_shutdown():\n with rostime_cond:\n rostime_cond.wait(0.3)\n initial_rostime = rospy.rostime.get_rostime()\n\n sleep_t = initial_rostime + duration\n\n # break loop if sleep_t is reached, time moves backwards, or\n # node is shutdown\n while rospy.rostime.get_rostime() < sleep_t and \\\n rospy.rostime.get_rostime() >= initial_rostime and \\\n not rospy.core.is_shutdown():\n with rostime_cond:\n rostime_cond.wait(0.5)\n\n if rospy.rostime.get_rostime() < initial_rostime:\n raise rospy.exceptions.ROSInterruptException(\"ROS time moved backwards\")\n if rospy.core.is_shutdown():\n raise rospy.exceptions.ROSInterruptException(\"ROS shutdown request\")\n\nclass TimerEvent(object):\n \"\"\"\n Constructor.\n @param last_expected: in a perfect world, this is when the previous callback should have happened\n @type last_expected: rospy.Time\n @param last_real: when the callback actually happened\n @type last_real: rospy.Time\n @param current_expected: in a perfect world, this is when the current callback should have been called\n @type current_expected: rospy.Time\n @param last_duration: contains the duration of the last callback (end time minus start time) in seconds.\n Note that this is always in wall-clock time.\n @type last_duration: float\n \"\"\"\n def __init__(self, last_expected, last_real, current_expected, current_real, last_duration):\n self.last_expected = last_expected\n self.last_real = last_real\n self.current_expected = current_expected\n self.current_real = current_real\n self.last_duration = last_duration\n\nclass Timer(threading.Thread):\n \"\"\"\n Convenience class for calling a callback at a specified rate\n \"\"\"\n\n def __init__(self, period, callback, oneshot=False):\n \"\"\"\n Constructor.\n @param period: desired period between callbacks\n @type period: rospy.Time\n @param callback: callback to be called\n @type callback: function taking rospy.TimerEvent\n @param oneshot: if True, fire only once, otherwise fire continuously until shutdown is called [default: False]\n @type oneshot: bool\n \"\"\"\n threading.Thread.__init__(self)\n self._period = period\n self._callback = callback\n self._oneshot = oneshot\n self._shutdown = False\n self.setDaemon(True)\n self.start()\n\n def shutdown(self):\n \"\"\"\n Stop firing callbacks.\n \"\"\"\n self._shutdown = True\n \n def run(self):\n r = Rate(1.0 / self._period.to_sec())\n current_expected = rospy.rostime.get_rostime() + self._period\n last_expected, last_real, last_duration = None, None, None\n while not rospy.core.is_shutdown() and not self._shutdown:\n r.sleep()\n if self._shutdown:\n break\n current_real = rospy.rostime.get_rostime()\n start = time.time()\n self._callback(TimerEvent(last_expected, last_real, current_expected, current_real, last_duration))\n if self._oneshot:\n break\n last_duration = time.time() - start\n last_expected, last_real = current_expected, current_real\n current_expected += self._period\n", "path": "clients/rospy/src/rospy/timer.py"}, {"content": "# Software License Agreement (BSD License)\n#\n# Copyright (c) 2008, Willow Garage, Inc.\n# All rights reserved.\n#\n# Redistribution and use in source and binary forms, with or without\n# modification, are permitted provided that the following conditions\n# are met:\n#\n# * Redistributions of source code must retain the above copyright\n# notice, this list of conditions and the following disclaimer.\n# * Redistributions in binary form must reproduce the above\n# copyright notice, this list of conditions and the following\n# disclaimer in the documentation and/or other materials provided\n# with the distribution.\n# * Neither the name of Willow Garage, Inc. nor the names of its\n# contributors may be used to endorse or promote products derived\n# from this software without specific prior written permission.\n#\n# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n# \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS\n# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE\n# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,\n# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN\n# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\n# POSSIBILITY OF SUCH DAMAGE.\n#\n# Revision $Id$\n\n\"\"\"rospy exception types\"\"\"\n\nclass ROSException(Exception): \n \"\"\"\n Base exception class for ROS clients\n \"\"\"\n pass \n\nclass ROSSerializationException(ROSException):\n \"\"\"\n Exception for message serialization errors\n \"\"\" \n pass\n\nclass ROSInitException(ROSException):\n \"\"\"\n Exception for errors initializing ROS state\n \"\"\" \n pass\n\nclass ROSInterruptException(ROSException, KeyboardInterrupt):\n \"\"\"\n Exception for operations that interrupted, e.g. due to shutdown.\n\n This is a subclass of both L{ROSException} and KeyboardInterrupt\n so that it can be used in logic tht expects either.\n \"\"\" \n pass\n\nclass ROSInternalException(Exception):\n \"\"\"\n Base class for exceptions that are internal to the ROS system\n \"\"\" \n pass\n\nclass TransportException(ROSInternalException):\n \"\"\"\n Base class for transport-related exceptions\n \"\"\" \n pass\n\nclass TransportTerminated(TransportException):\n \"\"\"\n Internal class for representing broken connections\n \"\"\" \n pass\n\nclass TransportInitError(TransportException):\n \"\"\"\n Internal exception for representing exceptions that occur\n establishing transports\n \"\"\"\n pass\n\n", "path": "clients/rospy/src/rospy/exceptions.py"}]}
| 3,656 | 672 |
gh_patches_debug_28922
|
rasdani/github-patches
|
git_diff
|
bridgecrewio__checkov-3612
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Outdated check for `google_container_cluster` binary authorization
**Describe the issue**
`Check: CKV_GCP_66: "Ensure use of Binary Authorization"` is not checking [against the updated property](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster#nested_binary_authorization) causing the check to fail.
The current property states that the old method [`enable_binary_authorization`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster#enable_binary_authorization) is deprecated in favor the new [`binary_authorization`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster#nested_binary_authorization) block
**Examples**
Before:
```hcl
enable_binary_authorization = true
```
Now:
```hcl
binary_authorization {
evaluation_mode = "PROJECT_SINGLETON_POLICY_ENFORCE"
}
```
**Version (please complete the following information):**
- Checkov Version 2.1.149
</issue>
<code>
[start of checkov/terraform/checks/resource/gcp/GKEBinaryAuthorization.py]
1 from checkov.terraform.checks.resource.base_resource_value_check import BaseResourceValueCheck
2 from checkov.common.models.enums import CheckCategories
3
4
5 class GKEBinaryAuthorization(BaseResourceValueCheck):
6 def __init__(self) -> None:
7 name = "Ensure use of Binary Authorization"
8 id = "CKV_GCP_66"
9 supported_resources = ("google_container_cluster",)
10 categories = (CheckCategories.KUBERNETES,)
11 super().__init__(name=name, id=id, categories=categories, supported_resources=supported_resources)
12
13 def get_inspected_key(self) -> str:
14 return "enable_binary_authorization"
15
16
17 check = GKEBinaryAuthorization()
18
[end of checkov/terraform/checks/resource/gcp/GKEBinaryAuthorization.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/checkov/terraform/checks/resource/gcp/GKEBinaryAuthorization.py b/checkov/terraform/checks/resource/gcp/GKEBinaryAuthorization.py
--- a/checkov/terraform/checks/resource/gcp/GKEBinaryAuthorization.py
+++ b/checkov/terraform/checks/resource/gcp/GKEBinaryAuthorization.py
@@ -1,17 +1,29 @@
-from checkov.terraform.checks.resource.base_resource_value_check import BaseResourceValueCheck
-from checkov.common.models.enums import CheckCategories
+from checkov.common.models.enums import CheckCategories, CheckResult
+from checkov.terraform.checks.resource.base_resource_check import BaseResourceCheck
-class GKEBinaryAuthorization(BaseResourceValueCheck):
- def __init__(self) -> None:
+class GKEBinaryAuthorization(BaseResourceCheck):
+ def __init__(self):
name = "Ensure use of Binary Authorization"
id = "CKV_GCP_66"
- supported_resources = ("google_container_cluster",)
- categories = (CheckCategories.KUBERNETES,)
+ supported_resources = ['google_container_cluster']
+ categories = [CheckCategories.KUBERNETES]
super().__init__(name=name, id=id, categories=categories, supported_resources=supported_resources)
- def get_inspected_key(self) -> str:
- return "enable_binary_authorization"
+ def scan_resource_conf(self, conf):
+ if 'binary_authorization' in conf.keys():
+ binary_authorization = conf["binary_authorization"][0]
+ if isinstance(binary_authorization, dict) and 'evaluation_mode' in binary_authorization:
+ # Google provider version >= v4.31.0
+ if binary_authorization.get("evaluation_mode") == ["PROJECT_SINGLETON_POLICY_ENFORCE"]:
+ return CheckResult.PASSED
+ # Google provider version v4.29.0 and v4.30.0
+ elif binary_authorization.get("evaluation_mode") == [True]:
+ return CheckResult.PASSED
+ # Google provider version <= v4.28.0
+ if conf.get("enable_binary_authorization") == [True]:
+ return CheckResult.PASSED
+ return CheckResult.FAILED
check = GKEBinaryAuthorization()
|
{"golden_diff": "diff --git a/checkov/terraform/checks/resource/gcp/GKEBinaryAuthorization.py b/checkov/terraform/checks/resource/gcp/GKEBinaryAuthorization.py\n--- a/checkov/terraform/checks/resource/gcp/GKEBinaryAuthorization.py\n+++ b/checkov/terraform/checks/resource/gcp/GKEBinaryAuthorization.py\n@@ -1,17 +1,29 @@\n-from checkov.terraform.checks.resource.base_resource_value_check import BaseResourceValueCheck\n-from checkov.common.models.enums import CheckCategories\n+from checkov.common.models.enums import CheckCategories, CheckResult\n+from checkov.terraform.checks.resource.base_resource_check import BaseResourceCheck\n \n \n-class GKEBinaryAuthorization(BaseResourceValueCheck):\n- def __init__(self) -> None:\n+class GKEBinaryAuthorization(BaseResourceCheck):\n+ def __init__(self):\n name = \"Ensure use of Binary Authorization\"\n id = \"CKV_GCP_66\"\n- supported_resources = (\"google_container_cluster\",)\n- categories = (CheckCategories.KUBERNETES,)\n+ supported_resources = ['google_container_cluster']\n+ categories = [CheckCategories.KUBERNETES]\n super().__init__(name=name, id=id, categories=categories, supported_resources=supported_resources)\n \n- def get_inspected_key(self) -> str:\n- return \"enable_binary_authorization\"\n+ def scan_resource_conf(self, conf):\n+ if 'binary_authorization' in conf.keys():\n+ binary_authorization = conf[\"binary_authorization\"][0]\n+ if isinstance(binary_authorization, dict) and 'evaluation_mode' in binary_authorization:\n+ # Google provider version >= v4.31.0\n+ if binary_authorization.get(\"evaluation_mode\") == [\"PROJECT_SINGLETON_POLICY_ENFORCE\"]:\n+ return CheckResult.PASSED\n+ # Google provider version v4.29.0 and v4.30.0\n+ elif binary_authorization.get(\"evaluation_mode\") == [True]:\n+ return CheckResult.PASSED\n+ # Google provider version <= v4.28.0\n+ if conf.get(\"enable_binary_authorization\") == [True]:\n+ return CheckResult.PASSED\n+ return CheckResult.FAILED\n \n \n check = GKEBinaryAuthorization()\n", "issue": "Outdated check for `google_container_cluster` binary authorization\n**Describe the issue**\r\n`Check: CKV_GCP_66: \"Ensure use of Binary Authorization\"` is not checking [against the updated property](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster#nested_binary_authorization) causing the check to fail.\r\n\r\nThe current property states that the old method [`enable_binary_authorization`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster#enable_binary_authorization) is deprecated in favor the new [`binary_authorization`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster#nested_binary_authorization) block\r\n\r\n**Examples**\r\n\r\nBefore:\r\n```hcl\r\nenable_binary_authorization = true\r\n```\r\n\r\nNow:\r\n```hcl\r\n binary_authorization {\r\n evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\r\n }\r\n```\r\n\r\n**Version (please complete the following information):**\r\n - Checkov Version 2.1.149\r\n\r\n\n", "before_files": [{"content": "from checkov.terraform.checks.resource.base_resource_value_check import BaseResourceValueCheck\nfrom checkov.common.models.enums import CheckCategories\n\n\nclass GKEBinaryAuthorization(BaseResourceValueCheck):\n def __init__(self) -> None:\n name = \"Ensure use of Binary Authorization\"\n id = \"CKV_GCP_66\"\n supported_resources = (\"google_container_cluster\",)\n categories = (CheckCategories.KUBERNETES,)\n super().__init__(name=name, id=id, categories=categories, supported_resources=supported_resources)\n\n def get_inspected_key(self) -> str:\n return \"enable_binary_authorization\"\n\n\ncheck = GKEBinaryAuthorization()\n", "path": "checkov/terraform/checks/resource/gcp/GKEBinaryAuthorization.py"}]}
| 938 | 493 |
gh_patches_debug_298
|
rasdani/github-patches
|
git_diff
|
ipython__ipython-9645
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Readlinelike display of options crashes ipython terminal.
</issue>
<code>
[start of setup.py]
1 #!/usr/bin/env python
2 # -*- coding: utf-8 -*-
3 """Setup script for IPython.
4
5 Under Posix environments it works like a typical setup.py script.
6 Under Windows, the command sdist is not supported, since IPython
7 requires utilities which are not available under Windows."""
8
9 #-----------------------------------------------------------------------------
10 # Copyright (c) 2008-2011, IPython Development Team.
11 # Copyright (c) 2001-2007, Fernando Perez <[email protected]>
12 # Copyright (c) 2001, Janko Hauser <[email protected]>
13 # Copyright (c) 2001, Nathaniel Gray <[email protected]>
14 #
15 # Distributed under the terms of the Modified BSD License.
16 #
17 # The full license is in the file COPYING.rst, distributed with this software.
18 #-----------------------------------------------------------------------------
19
20 #-----------------------------------------------------------------------------
21 # Minimal Python version sanity check
22 #-----------------------------------------------------------------------------
23 from __future__ import print_function
24
25 import sys
26
27 # This check is also made in IPython/__init__, don't forget to update both when
28 # changing Python version requirements.
29 v = sys.version_info
30 if v[:2] < (2,7) or (v[0] >= 3 and v[:2] < (3,3)):
31 error = "ERROR: IPython requires Python version 2.7 or 3.3 or above."
32 print(error, file=sys.stderr)
33 sys.exit(1)
34
35 PY3 = (sys.version_info[0] >= 3)
36
37 # At least we're on the python version we need, move on.
38
39 #-------------------------------------------------------------------------------
40 # Imports
41 #-------------------------------------------------------------------------------
42
43 # Stdlib imports
44 import os
45
46 from glob import glob
47
48 # BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
49 # update it when the contents of directories change.
50 if os.path.exists('MANIFEST'): os.remove('MANIFEST')
51
52 from distutils.core import setup
53
54 # Our own imports
55 from setupbase import target_update
56
57 from setupbase import (
58 setup_args,
59 find_packages,
60 find_package_data,
61 check_package_data_first,
62 find_entry_points,
63 build_scripts_entrypt,
64 find_data_files,
65 git_prebuild,
66 install_symlinked,
67 install_lib_symlink,
68 install_scripts_for_symlink,
69 unsymlink,
70 )
71
72 isfile = os.path.isfile
73 pjoin = os.path.join
74
75 #-------------------------------------------------------------------------------
76 # Handle OS specific things
77 #-------------------------------------------------------------------------------
78
79 if os.name in ('nt','dos'):
80 os_name = 'windows'
81 else:
82 os_name = os.name
83
84 # Under Windows, 'sdist' has not been supported. Now that the docs build with
85 # Sphinx it might work, but let's not turn it on until someone confirms that it
86 # actually works.
87 if os_name == 'windows' and 'sdist' in sys.argv:
88 print('The sdist command is not available under Windows. Exiting.')
89 sys.exit(1)
90
91
92 #-------------------------------------------------------------------------------
93 # Things related to the IPython documentation
94 #-------------------------------------------------------------------------------
95
96 # update the manuals when building a source dist
97 if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
98
99 # List of things to be updated. Each entry is a triplet of args for
100 # target_update()
101 to_update = [
102 ('docs/man/ipython.1.gz',
103 ['docs/man/ipython.1'],
104 'cd docs/man && gzip -9c ipython.1 > ipython.1.gz'),
105 ]
106
107
108 [ target_update(*t) for t in to_update ]
109
110 #---------------------------------------------------------------------------
111 # Find all the packages, package data, and data_files
112 #---------------------------------------------------------------------------
113
114 packages = find_packages()
115 package_data = find_package_data()
116
117 data_files = find_data_files()
118
119 setup_args['packages'] = packages
120 setup_args['package_data'] = package_data
121 setup_args['data_files'] = data_files
122
123 #---------------------------------------------------------------------------
124 # custom distutils commands
125 #---------------------------------------------------------------------------
126 # imports here, so they are after setuptools import if there was one
127 from distutils.command.sdist import sdist
128 from distutils.command.upload import upload
129
130 class UploadWindowsInstallers(upload):
131
132 description = "Upload Windows installers to PyPI (only used from tools/release_windows.py)"
133 user_options = upload.user_options + [
134 ('files=', 'f', 'exe file (or glob) to upload')
135 ]
136 def initialize_options(self):
137 upload.initialize_options(self)
138 meta = self.distribution.metadata
139 base = '{name}-{version}'.format(
140 name=meta.get_name(),
141 version=meta.get_version()
142 )
143 self.files = os.path.join('dist', '%s.*.exe' % base)
144
145 def run(self):
146 for dist_file in glob(self.files):
147 self.upload_file('bdist_wininst', 'any', dist_file)
148
149 setup_args['cmdclass'] = {
150 'build_py': \
151 check_package_data_first(git_prebuild('IPython')),
152 'sdist' : git_prebuild('IPython', sdist),
153 'upload_wininst' : UploadWindowsInstallers,
154 'symlink': install_symlinked,
155 'install_lib_symlink': install_lib_symlink,
156 'install_scripts_sym': install_scripts_for_symlink,
157 'unsymlink': unsymlink,
158 }
159
160
161 #---------------------------------------------------------------------------
162 # Handle scripts, dependencies, and setuptools specific things
163 #---------------------------------------------------------------------------
164
165 # For some commands, use setuptools. Note that we do NOT list install here!
166 # If you want a setuptools-enhanced install, just run 'setupegg.py install'
167 needs_setuptools = set(('develop', 'release', 'bdist_egg', 'bdist_rpm',
168 'bdist', 'bdist_dumb', 'bdist_wininst', 'bdist_wheel',
169 'egg_info', 'easy_install', 'upload', 'install_egg_info',
170 ))
171
172 if len(needs_setuptools.intersection(sys.argv)) > 0:
173 import setuptools
174
175 # This dict is used for passing extra arguments that are setuptools
176 # specific to setup
177 setuptools_extra_args = {}
178
179 # setuptools requirements
180
181 extras_require = dict(
182 parallel = ['ipyparallel'],
183 qtconsole = ['qtconsole'],
184 doc = ['Sphinx>=1.3'],
185 test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments', 'nbformat', 'ipykernel', 'numpy'],
186 terminal = [],
187 kernel = ['ipykernel'],
188 nbformat = ['nbformat'],
189 notebook = ['notebook', 'ipywidgets'],
190 nbconvert = ['nbconvert'],
191 )
192
193 install_requires = [
194 'setuptools>=18.5',
195 'decorator',
196 'pickleshare',
197 'simplegeneric>0.8',
198 'traitlets>=4.2',
199 'prompt_toolkit>=1.0.1,<2.0.0',
200 'pygments',
201 ]
202
203 # Platform-specific dependencies:
204 # This is the correct way to specify these,
205 # but requires pip >= 6. pip < 6 ignores these.
206
207 extras_require.update({
208 ':python_version == "2.7"': ['backports.shutil_get_terminal_size'],
209 ':python_version == "2.7" or python_version == "3.3"': ['pathlib2'],
210 ':sys_platform != "win32"': ['pexpect'],
211 ':sys_platform == "darwin"': ['appnope'],
212 ':sys_platform == "win32"': ['colorama', 'win_unicode_console'],
213 'test:python_version == "2.7"': ['mock'],
214 })
215 # FIXME: re-specify above platform dependencies for pip < 6
216 # These would result in non-portable bdists.
217 if not any(arg.startswith('bdist') for arg in sys.argv):
218 if sys.version_info < (3, 3):
219 extras_require['test'].append('mock')
220
221 if sys.platform == 'darwin':
222 install_requires.extend(['appnope'])
223 have_readline = False
224 try:
225 import readline
226 except ImportError:
227 pass
228 else:
229 if 'libedit' not in readline.__doc__:
230 have_readline = True
231 if not have_readline:
232 install_requires.extend(['gnureadline'])
233
234 if sys.platform.startswith('win'):
235 extras_require['terminal'].append('pyreadline>=2.0')
236 else:
237 install_requires.append('pexpect')
238
239 # workaround pypa/setuptools#147, where setuptools misspells
240 # platform_python_implementation as python_implementation
241 if 'setuptools' in sys.modules:
242 for key in list(extras_require):
243 if 'platform_python_implementation' in key:
244 new_key = key.replace('platform_python_implementation', 'python_implementation')
245 extras_require[new_key] = extras_require.pop(key)
246
247 everything = set()
248 for key, deps in extras_require.items():
249 if ':' not in key:
250 everything.update(deps)
251 extras_require['all'] = everything
252
253 if 'setuptools' in sys.modules:
254 setuptools_extra_args['zip_safe'] = False
255 setuptools_extra_args['entry_points'] = {
256 'console_scripts': find_entry_points(),
257 'pygments.lexers': [
258 'ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer',
259 'ipython = IPython.lib.lexers:IPythonLexer',
260 'ipython3 = IPython.lib.lexers:IPython3Lexer',
261 ],
262 }
263 setup_args['extras_require'] = extras_require
264 requires = setup_args['install_requires'] = install_requires
265
266 # Script to be run by the windows binary installer after the default setup
267 # routine, to add shortcuts and similar windows-only things. Windows
268 # post-install scripts MUST reside in the scripts/ dir, otherwise distutils
269 # doesn't find them.
270 if 'bdist_wininst' in sys.argv:
271 if len(sys.argv) > 2 and \
272 ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):
273 print("ERROR: bdist_wininst must be run alone. Exiting.", file=sys.stderr)
274 sys.exit(1)
275 setup_args['data_files'].append(
276 ['Scripts', ('scripts/ipython.ico', 'scripts/ipython_nb.ico')])
277 setup_args['scripts'] = [pjoin('scripts','ipython_win_post_install.py')]
278 setup_args['options'] = {"bdist_wininst":
279 {"install_script":
280 "ipython_win_post_install.py"}}
281
282 else:
283 # scripts has to be a non-empty list, or install_scripts isn't called
284 setup_args['scripts'] = [e.split('=')[0].strip() for e in find_entry_points()]
285
286 setup_args['cmdclass']['build_scripts'] = build_scripts_entrypt
287
288 #---------------------------------------------------------------------------
289 # Do the actual setup now
290 #---------------------------------------------------------------------------
291
292 setup_args.update(setuptools_extra_args)
293
294
295
296 def main():
297 setup(**setup_args)
298
299 if __name__ == '__main__':
300 main()
301
[end of setup.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -196,7 +196,7 @@
'pickleshare',
'simplegeneric>0.8',
'traitlets>=4.2',
- 'prompt_toolkit>=1.0.1,<2.0.0',
+ 'prompt_toolkit>=1.0.3,<2.0.0',
'pygments',
]
|
{"golden_diff": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -196,7 +196,7 @@\n 'pickleshare',\n 'simplegeneric>0.8',\n 'traitlets>=4.2',\n- 'prompt_toolkit>=1.0.1,<2.0.0',\n+ 'prompt_toolkit>=1.0.3,<2.0.0',\n 'pygments',\n ]\n", "issue": "Readlinelike display of options crashes ipython terminal.\n\n", "before_files": [{"content": "#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n\"\"\"Setup script for IPython.\n\nUnder Posix environments it works like a typical setup.py script.\nUnder Windows, the command sdist is not supported, since IPython\nrequires utilities which are not available under Windows.\"\"\"\n\n#-----------------------------------------------------------------------------\n# Copyright (c) 2008-2011, IPython Development Team.\n# Copyright (c) 2001-2007, Fernando Perez <[email protected]>\n# Copyright (c) 2001, Janko Hauser <[email protected]>\n# Copyright (c) 2001, Nathaniel Gray <[email protected]>\n#\n# Distributed under the terms of the Modified BSD License.\n#\n# The full license is in the file COPYING.rst, distributed with this software.\n#-----------------------------------------------------------------------------\n\n#-----------------------------------------------------------------------------\n# Minimal Python version sanity check\n#-----------------------------------------------------------------------------\nfrom __future__ import print_function\n\nimport sys\n\n# This check is also made in IPython/__init__, don't forget to update both when\n# changing Python version requirements.\nv = sys.version_info\nif v[:2] < (2,7) or (v[0] >= 3 and v[:2] < (3,3)):\n error = \"ERROR: IPython requires Python version 2.7 or 3.3 or above.\"\n print(error, file=sys.stderr)\n sys.exit(1)\n\nPY3 = (sys.version_info[0] >= 3)\n\n# At least we're on the python version we need, move on.\n\n#-------------------------------------------------------------------------------\n# Imports\n#-------------------------------------------------------------------------------\n\n# Stdlib imports\nimport os\n\nfrom glob import glob\n\n# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly\n# update it when the contents of directories change.\nif os.path.exists('MANIFEST'): os.remove('MANIFEST')\n\nfrom distutils.core import setup\n\n# Our own imports\nfrom setupbase import target_update\n\nfrom setupbase import (\n setup_args,\n find_packages,\n find_package_data,\n check_package_data_first,\n find_entry_points,\n build_scripts_entrypt,\n find_data_files,\n git_prebuild,\n install_symlinked,\n install_lib_symlink,\n install_scripts_for_symlink,\n unsymlink,\n)\n\nisfile = os.path.isfile\npjoin = os.path.join\n\n#-------------------------------------------------------------------------------\n# Handle OS specific things\n#-------------------------------------------------------------------------------\n\nif os.name in ('nt','dos'):\n os_name = 'windows'\nelse:\n os_name = os.name\n\n# Under Windows, 'sdist' has not been supported. Now that the docs build with\n# Sphinx it might work, but let's not turn it on until someone confirms that it\n# actually works.\nif os_name == 'windows' and 'sdist' in sys.argv:\n print('The sdist command is not available under Windows. Exiting.')\n sys.exit(1)\n\n\n#-------------------------------------------------------------------------------\n# Things related to the IPython documentation\n#-------------------------------------------------------------------------------\n\n# update the manuals when building a source dist\nif len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):\n\n # List of things to be updated. Each entry is a triplet of args for\n # target_update()\n to_update = [\n ('docs/man/ipython.1.gz',\n ['docs/man/ipython.1'],\n 'cd docs/man && gzip -9c ipython.1 > ipython.1.gz'),\n ]\n\n\n [ target_update(*t) for t in to_update ]\n\n#---------------------------------------------------------------------------\n# Find all the packages, package data, and data_files\n#---------------------------------------------------------------------------\n\npackages = find_packages()\npackage_data = find_package_data()\n\ndata_files = find_data_files()\n\nsetup_args['packages'] = packages\nsetup_args['package_data'] = package_data\nsetup_args['data_files'] = data_files\n\n#---------------------------------------------------------------------------\n# custom distutils commands\n#---------------------------------------------------------------------------\n# imports here, so they are after setuptools import if there was one\nfrom distutils.command.sdist import sdist\nfrom distutils.command.upload import upload\n\nclass UploadWindowsInstallers(upload):\n\n description = \"Upload Windows installers to PyPI (only used from tools/release_windows.py)\"\n user_options = upload.user_options + [\n ('files=', 'f', 'exe file (or glob) to upload')\n ]\n def initialize_options(self):\n upload.initialize_options(self)\n meta = self.distribution.metadata\n base = '{name}-{version}'.format(\n name=meta.get_name(),\n version=meta.get_version()\n )\n self.files = os.path.join('dist', '%s.*.exe' % base)\n\n def run(self):\n for dist_file in glob(self.files):\n self.upload_file('bdist_wininst', 'any', dist_file)\n\nsetup_args['cmdclass'] = {\n 'build_py': \\\n check_package_data_first(git_prebuild('IPython')),\n 'sdist' : git_prebuild('IPython', sdist),\n 'upload_wininst' : UploadWindowsInstallers,\n 'symlink': install_symlinked,\n 'install_lib_symlink': install_lib_symlink,\n 'install_scripts_sym': install_scripts_for_symlink,\n 'unsymlink': unsymlink,\n}\n\n\n#---------------------------------------------------------------------------\n# Handle scripts, dependencies, and setuptools specific things\n#---------------------------------------------------------------------------\n\n# For some commands, use setuptools. Note that we do NOT list install here!\n# If you want a setuptools-enhanced install, just run 'setupegg.py install'\nneeds_setuptools = set(('develop', 'release', 'bdist_egg', 'bdist_rpm',\n 'bdist', 'bdist_dumb', 'bdist_wininst', 'bdist_wheel',\n 'egg_info', 'easy_install', 'upload', 'install_egg_info',\n ))\n\nif len(needs_setuptools.intersection(sys.argv)) > 0:\n import setuptools\n\n# This dict is used for passing extra arguments that are setuptools\n# specific to setup\nsetuptools_extra_args = {}\n\n# setuptools requirements\n\nextras_require = dict(\n parallel = ['ipyparallel'],\n qtconsole = ['qtconsole'],\n doc = ['Sphinx>=1.3'],\n test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments', 'nbformat', 'ipykernel', 'numpy'],\n terminal = [],\n kernel = ['ipykernel'],\n nbformat = ['nbformat'],\n notebook = ['notebook', 'ipywidgets'],\n nbconvert = ['nbconvert'],\n)\n\ninstall_requires = [\n 'setuptools>=18.5',\n 'decorator',\n 'pickleshare',\n 'simplegeneric>0.8',\n 'traitlets>=4.2',\n 'prompt_toolkit>=1.0.1,<2.0.0',\n 'pygments',\n]\n\n# Platform-specific dependencies:\n# This is the correct way to specify these,\n# but requires pip >= 6. pip < 6 ignores these.\n\nextras_require.update({\n ':python_version == \"2.7\"': ['backports.shutil_get_terminal_size'],\n ':python_version == \"2.7\" or python_version == \"3.3\"': ['pathlib2'],\n ':sys_platform != \"win32\"': ['pexpect'],\n ':sys_platform == \"darwin\"': ['appnope'],\n ':sys_platform == \"win32\"': ['colorama', 'win_unicode_console'],\n 'test:python_version == \"2.7\"': ['mock'],\n})\n# FIXME: re-specify above platform dependencies for pip < 6\n# These would result in non-portable bdists.\nif not any(arg.startswith('bdist') for arg in sys.argv):\n if sys.version_info < (3, 3):\n extras_require['test'].append('mock')\n\n if sys.platform == 'darwin':\n install_requires.extend(['appnope'])\n have_readline = False\n try:\n import readline\n except ImportError:\n pass\n else:\n if 'libedit' not in readline.__doc__:\n have_readline = True\n if not have_readline:\n install_requires.extend(['gnureadline'])\n\n if sys.platform.startswith('win'):\n extras_require['terminal'].append('pyreadline>=2.0')\n else:\n install_requires.append('pexpect')\n \n # workaround pypa/setuptools#147, where setuptools misspells\n # platform_python_implementation as python_implementation\n if 'setuptools' in sys.modules:\n for key in list(extras_require):\n if 'platform_python_implementation' in key:\n new_key = key.replace('platform_python_implementation', 'python_implementation')\n extras_require[new_key] = extras_require.pop(key)\n\neverything = set()\nfor key, deps in extras_require.items():\n if ':' not in key:\n everything.update(deps)\nextras_require['all'] = everything\n\nif 'setuptools' in sys.modules:\n setuptools_extra_args['zip_safe'] = False\n setuptools_extra_args['entry_points'] = {\n 'console_scripts': find_entry_points(),\n 'pygments.lexers': [\n 'ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer',\n 'ipython = IPython.lib.lexers:IPythonLexer',\n 'ipython3 = IPython.lib.lexers:IPython3Lexer',\n ],\n }\n setup_args['extras_require'] = extras_require\n requires = setup_args['install_requires'] = install_requires\n\n # Script to be run by the windows binary installer after the default setup\n # routine, to add shortcuts and similar windows-only things. Windows\n # post-install scripts MUST reside in the scripts/ dir, otherwise distutils\n # doesn't find them.\n if 'bdist_wininst' in sys.argv:\n if len(sys.argv) > 2 and \\\n ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):\n print(\"ERROR: bdist_wininst must be run alone. Exiting.\", file=sys.stderr)\n sys.exit(1)\n setup_args['data_files'].append(\n ['Scripts', ('scripts/ipython.ico', 'scripts/ipython_nb.ico')])\n setup_args['scripts'] = [pjoin('scripts','ipython_win_post_install.py')]\n setup_args['options'] = {\"bdist_wininst\":\n {\"install_script\":\n \"ipython_win_post_install.py\"}}\n\nelse:\n # scripts has to be a non-empty list, or install_scripts isn't called\n setup_args['scripts'] = [e.split('=')[0].strip() for e in find_entry_points()]\n\n setup_args['cmdclass']['build_scripts'] = build_scripts_entrypt\n\n#---------------------------------------------------------------------------\n# Do the actual setup now\n#---------------------------------------------------------------------------\n\nsetup_args.update(setuptools_extra_args)\n\n\n\ndef main():\n setup(**setup_args)\n\nif __name__ == '__main__':\n main()\n", "path": "setup.py"}]}
| 3,731 | 103 |
gh_patches_debug_54577
|
rasdani/github-patches
|
git_diff
|
zulip__zulip-27417
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Document option to paste URL to create a named link
We should document the new functionality in #18692.
I would add a "Via paste" tab to https://zulip.com/help/insert-a-link#insert-a-link_1, probably as the first tab, since that's often the most handy option.
</issue>
<code>
[start of zerver/lib/markdown/tabbed_sections.py]
1 import re
2 from typing import Any, Dict, List, Mapping, Optional
3
4 import markdown
5 from markdown.extensions import Extension
6 from markdown.preprocessors import Preprocessor
7 from typing_extensions import override
8
9 from zerver.lib.markdown.priorities import PREPROCESSOR_PRIORITES
10
11 START_TABBED_SECTION_REGEX = re.compile(r"^\{start_tabs\}$")
12 END_TABBED_SECTION_REGEX = re.compile(r"^\{end_tabs\}$")
13 TAB_CONTENT_REGEX = re.compile(r"^\{tab\|([^}]+)\}$")
14
15 TABBED_SECTION_TEMPLATE = """
16 <div class="tabbed-section {tab_class}" markdown="1">
17 {nav_bar}
18 <div class="blocks">
19 {blocks}
20 </div>
21 </div>
22 """.strip()
23
24 NAV_BAR_TEMPLATE = """
25 <ul class="nav">
26 {tabs}
27 </ul>
28 """.strip()
29
30 NAV_LIST_ITEM_TEMPLATE = """
31 <li data-tab-key="{data_tab_key}" tabindex="0">{label}</li>
32 """.strip()
33
34 DIV_TAB_CONTENT_TEMPLATE = """
35 <div data-tab-key="{data_tab_key}" markdown="1">
36 {content}
37 </div>
38 """.strip()
39
40 # If adding new entries here, also check if you need to update
41 # tabbed-instructions.js
42 TAB_SECTION_LABELS = {
43 "desktop-web": "Desktop/Web",
44 "ios": "iOS",
45 "android": "Android",
46 "mac": "macOS",
47 "windows": "Windows",
48 "linux": "Linux",
49 "python": "Python",
50 "js": "JavaScript",
51 "curl": "curl",
52 "zulip-send": "zulip-send",
53 "web": "Web",
54 "desktop": "Desktop",
55 "mobile": "Mobile",
56 "mm-default": "Default installation",
57 "mm-cloud": "Cloud instance",
58 "mm-docker": "Docker",
59 "mm-gitlab-omnibus": "GitLab Omnibus",
60 "mm-self-hosting-cloud-export": "Self hosting (cloud export)",
61 "require-invitations": "Require invitations",
62 "allow-anyone-to-join": "Allow anyone to join",
63 "restrict-by-email-domain": "Restrict by email domain",
64 "zoom": "Zoom",
65 "jitsi-meet": "Jitsi Meet",
66 "bigbluebutton": "BigBlueButton",
67 "disable": "Disabled",
68 "chrome": "Chrome",
69 "firefox": "Firefox",
70 "desktop-app": "Desktop app",
71 "system-proxy-settings": "System proxy settings",
72 "custom-proxy-settings": "Custom proxy settings",
73 "stream": "From a stream view",
74 "not-stream": "From other views",
75 "via-recent-conversations": "Via recent conversations",
76 "via-inbox-view": "Via inbox view",
77 "via-left-sidebar": "Via left sidebar",
78 "instructions-for-all-platforms": "Instructions for all platforms",
79 "public-streams": "Public streams",
80 "private-streams": "Private streams",
81 "web-public-streams": "Web-public streams",
82 "via-user-card": "Via user card",
83 "via-user-profile": "Via user profile",
84 "via-organization-settings": "Via organization settings",
85 "via-personal-settings": "Via personal settings",
86 "via-stream-settings": "Via stream settings",
87 "default-subdomain": "Default subdomain",
88 "custom-subdomain": "Custom subdomain",
89 "zulip-cloud": "Zulip Cloud",
90 "self-hosting": "Self hosting",
91 "okta": "Okta",
92 "onelogin": "OneLogin",
93 "azuread": "AzureAD",
94 "keycloak": "Keycloak",
95 "auth0": "Auth0",
96 "logged-in": "If you are logged in",
97 "logged-out": "If you are logged out",
98 "user": "User",
99 "bot": "Bot",
100 "on-sign-up": "On sign-up",
101 "via-markdown": "Via Markdown",
102 "via-compose-box-buttons": "Via compose box buttons",
103 "stream-compose": "Compose to a stream",
104 "dm-compose": "Compose a DM",
105 "v6": "Zulip Server 6.0+",
106 "v4": "Zulip Server 4.0+",
107 }
108
109
110 class TabbedSectionsGenerator(Extension):
111 @override
112 def extendMarkdown(self, md: markdown.Markdown) -> None:
113 md.preprocessors.register(
114 TabbedSectionsPreprocessor(md, self.getConfigs()),
115 "tabbed_sections",
116 PREPROCESSOR_PRIORITES["tabbed_sections"],
117 )
118
119
120 class TabbedSectionsPreprocessor(Preprocessor):
121 def __init__(self, md: markdown.Markdown, config: Mapping[str, Any]) -> None:
122 super().__init__(md)
123
124 @override
125 def run(self, lines: List[str]) -> List[str]:
126 tab_section = self.parse_tabs(lines)
127 while tab_section:
128 if "tabs" in tab_section:
129 tab_class = "has-tabs"
130 else:
131 tab_class = "no-tabs"
132 tab_section["tabs"] = [
133 {
134 "tab_key": "instructions-for-all-platforms",
135 "start": tab_section["start_tabs_index"],
136 }
137 ]
138 nav_bar = self.generate_nav_bar(tab_section)
139 content_blocks = self.generate_content_blocks(tab_section, lines)
140 rendered_tabs = TABBED_SECTION_TEMPLATE.format(
141 tab_class=tab_class, nav_bar=nav_bar, blocks=content_blocks
142 )
143
144 start = tab_section["start_tabs_index"]
145 end = tab_section["end_tabs_index"] + 1
146 lines = [*lines[:start], rendered_tabs, *lines[end:]]
147 tab_section = self.parse_tabs(lines)
148 return lines
149
150 def generate_content_blocks(self, tab_section: Dict[str, Any], lines: List[str]) -> str:
151 tab_content_blocks = []
152 for index, tab in enumerate(tab_section["tabs"]):
153 start_index = tab["start"] + 1
154 try:
155 # If there are more tabs, we can use the starting index
156 # of the next tab as the ending index of the previous one
157 end_index = tab_section["tabs"][index + 1]["start"]
158 except IndexError:
159 # Otherwise, just use the end of the entire section
160 end_index = tab_section["end_tabs_index"]
161
162 content = "\n".join(lines[start_index:end_index]).strip()
163 tab_content_block = DIV_TAB_CONTENT_TEMPLATE.format(
164 data_tab_key=tab["tab_key"],
165 # Wrapping the content in two newlines is necessary here.
166 # If we don't do this, the inner Markdown does not get
167 # rendered properly.
168 content=f"\n{content}\n",
169 )
170 tab_content_blocks.append(tab_content_block)
171 return "\n".join(tab_content_blocks)
172
173 def generate_nav_bar(self, tab_section: Dict[str, Any]) -> str:
174 li_elements = []
175 for tab in tab_section["tabs"]:
176 tab_key = tab.get("tab_key")
177 tab_label = TAB_SECTION_LABELS.get(tab_key)
178 if tab_label is None:
179 raise ValueError(
180 f"Tab '{tab_key}' is not present in TAB_SECTION_LABELS in zerver/lib/markdown/tabbed_sections.py"
181 )
182
183 li = NAV_LIST_ITEM_TEMPLATE.format(data_tab_key=tab_key, label=tab_label)
184 li_elements.append(li)
185
186 return NAV_BAR_TEMPLATE.format(tabs="\n".join(li_elements))
187
188 def parse_tabs(self, lines: List[str]) -> Optional[Dict[str, Any]]:
189 block: Dict[str, Any] = {}
190 for index, line in enumerate(lines):
191 start_match = START_TABBED_SECTION_REGEX.search(line)
192 if start_match:
193 block["start_tabs_index"] = index
194
195 tab_content_match = TAB_CONTENT_REGEX.search(line)
196 if tab_content_match:
197 block.setdefault("tabs", [])
198 tab = {"start": index, "tab_key": tab_content_match.group(1)}
199 block["tabs"].append(tab)
200
201 end_match = END_TABBED_SECTION_REGEX.search(line)
202 if end_match:
203 block["end_tabs_index"] = index
204 break
205 return block
206
207
208 def makeExtension(*args: Any, **kwargs: str) -> TabbedSectionsGenerator:
209 return TabbedSectionsGenerator(**kwargs)
210
[end of zerver/lib/markdown/tabbed_sections.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/zerver/lib/markdown/tabbed_sections.py b/zerver/lib/markdown/tabbed_sections.py
--- a/zerver/lib/markdown/tabbed_sections.py
+++ b/zerver/lib/markdown/tabbed_sections.py
@@ -98,6 +98,7 @@
"user": "User",
"bot": "Bot",
"on-sign-up": "On sign-up",
+ "via-paste": "Via paste",
"via-markdown": "Via Markdown",
"via-compose-box-buttons": "Via compose box buttons",
"stream-compose": "Compose to a stream",
|
{"golden_diff": "diff --git a/zerver/lib/markdown/tabbed_sections.py b/zerver/lib/markdown/tabbed_sections.py\n--- a/zerver/lib/markdown/tabbed_sections.py\n+++ b/zerver/lib/markdown/tabbed_sections.py\n@@ -98,6 +98,7 @@\n \"user\": \"User\",\n \"bot\": \"Bot\",\n \"on-sign-up\": \"On sign-up\",\n+ \"via-paste\": \"Via paste\",\n \"via-markdown\": \"Via Markdown\",\n \"via-compose-box-buttons\": \"Via compose box buttons\",\n \"stream-compose\": \"Compose to a stream\",\n", "issue": "Document option to paste URL to create a named link\nWe should document the new functionality in #18692.\r\n\r\nI would add a \"Via paste\" tab to https://zulip.com/help/insert-a-link#insert-a-link_1, probably as the first tab, since that's often the most handy option.\n", "before_files": [{"content": "import re\nfrom typing import Any, Dict, List, Mapping, Optional\n\nimport markdown\nfrom markdown.extensions import Extension\nfrom markdown.preprocessors import Preprocessor\nfrom typing_extensions import override\n\nfrom zerver.lib.markdown.priorities import PREPROCESSOR_PRIORITES\n\nSTART_TABBED_SECTION_REGEX = re.compile(r\"^\\{start_tabs\\}$\")\nEND_TABBED_SECTION_REGEX = re.compile(r\"^\\{end_tabs\\}$\")\nTAB_CONTENT_REGEX = re.compile(r\"^\\{tab\\|([^}]+)\\}$\")\n\nTABBED_SECTION_TEMPLATE = \"\"\"\n<div class=\"tabbed-section {tab_class}\" markdown=\"1\">\n{nav_bar}\n<div class=\"blocks\">\n{blocks}\n</div>\n</div>\n\"\"\".strip()\n\nNAV_BAR_TEMPLATE = \"\"\"\n<ul class=\"nav\">\n{tabs}\n</ul>\n\"\"\".strip()\n\nNAV_LIST_ITEM_TEMPLATE = \"\"\"\n<li data-tab-key=\"{data_tab_key}\" tabindex=\"0\">{label}</li>\n\"\"\".strip()\n\nDIV_TAB_CONTENT_TEMPLATE = \"\"\"\n<div data-tab-key=\"{data_tab_key}\" markdown=\"1\">\n{content}\n</div>\n\"\"\".strip()\n\n# If adding new entries here, also check if you need to update\n# tabbed-instructions.js\nTAB_SECTION_LABELS = {\n \"desktop-web\": \"Desktop/Web\",\n \"ios\": \"iOS\",\n \"android\": \"Android\",\n \"mac\": \"macOS\",\n \"windows\": \"Windows\",\n \"linux\": \"Linux\",\n \"python\": \"Python\",\n \"js\": \"JavaScript\",\n \"curl\": \"curl\",\n \"zulip-send\": \"zulip-send\",\n \"web\": \"Web\",\n \"desktop\": \"Desktop\",\n \"mobile\": \"Mobile\",\n \"mm-default\": \"Default installation\",\n \"mm-cloud\": \"Cloud instance\",\n \"mm-docker\": \"Docker\",\n \"mm-gitlab-omnibus\": \"GitLab Omnibus\",\n \"mm-self-hosting-cloud-export\": \"Self hosting (cloud export)\",\n \"require-invitations\": \"Require invitations\",\n \"allow-anyone-to-join\": \"Allow anyone to join\",\n \"restrict-by-email-domain\": \"Restrict by email domain\",\n \"zoom\": \"Zoom\",\n \"jitsi-meet\": \"Jitsi Meet\",\n \"bigbluebutton\": \"BigBlueButton\",\n \"disable\": \"Disabled\",\n \"chrome\": \"Chrome\",\n \"firefox\": \"Firefox\",\n \"desktop-app\": \"Desktop app\",\n \"system-proxy-settings\": \"System proxy settings\",\n \"custom-proxy-settings\": \"Custom proxy settings\",\n \"stream\": \"From a stream view\",\n \"not-stream\": \"From other views\",\n \"via-recent-conversations\": \"Via recent conversations\",\n \"via-inbox-view\": \"Via inbox view\",\n \"via-left-sidebar\": \"Via left sidebar\",\n \"instructions-for-all-platforms\": \"Instructions for all platforms\",\n \"public-streams\": \"Public streams\",\n \"private-streams\": \"Private streams\",\n \"web-public-streams\": \"Web-public streams\",\n \"via-user-card\": \"Via user card\",\n \"via-user-profile\": \"Via user profile\",\n \"via-organization-settings\": \"Via organization settings\",\n \"via-personal-settings\": \"Via personal settings\",\n \"via-stream-settings\": \"Via stream settings\",\n \"default-subdomain\": \"Default subdomain\",\n \"custom-subdomain\": \"Custom subdomain\",\n \"zulip-cloud\": \"Zulip Cloud\",\n \"self-hosting\": \"Self hosting\",\n \"okta\": \"Okta\",\n \"onelogin\": \"OneLogin\",\n \"azuread\": \"AzureAD\",\n \"keycloak\": \"Keycloak\",\n \"auth0\": \"Auth0\",\n \"logged-in\": \"If you are logged in\",\n \"logged-out\": \"If you are logged out\",\n \"user\": \"User\",\n \"bot\": \"Bot\",\n \"on-sign-up\": \"On sign-up\",\n \"via-markdown\": \"Via Markdown\",\n \"via-compose-box-buttons\": \"Via compose box buttons\",\n \"stream-compose\": \"Compose to a stream\",\n \"dm-compose\": \"Compose a DM\",\n \"v6\": \"Zulip Server 6.0+\",\n \"v4\": \"Zulip Server 4.0+\",\n}\n\n\nclass TabbedSectionsGenerator(Extension):\n @override\n def extendMarkdown(self, md: markdown.Markdown) -> None:\n md.preprocessors.register(\n TabbedSectionsPreprocessor(md, self.getConfigs()),\n \"tabbed_sections\",\n PREPROCESSOR_PRIORITES[\"tabbed_sections\"],\n )\n\n\nclass TabbedSectionsPreprocessor(Preprocessor):\n def __init__(self, md: markdown.Markdown, config: Mapping[str, Any]) -> None:\n super().__init__(md)\n\n @override\n def run(self, lines: List[str]) -> List[str]:\n tab_section = self.parse_tabs(lines)\n while tab_section:\n if \"tabs\" in tab_section:\n tab_class = \"has-tabs\"\n else:\n tab_class = \"no-tabs\"\n tab_section[\"tabs\"] = [\n {\n \"tab_key\": \"instructions-for-all-platforms\",\n \"start\": tab_section[\"start_tabs_index\"],\n }\n ]\n nav_bar = self.generate_nav_bar(tab_section)\n content_blocks = self.generate_content_blocks(tab_section, lines)\n rendered_tabs = TABBED_SECTION_TEMPLATE.format(\n tab_class=tab_class, nav_bar=nav_bar, blocks=content_blocks\n )\n\n start = tab_section[\"start_tabs_index\"]\n end = tab_section[\"end_tabs_index\"] + 1\n lines = [*lines[:start], rendered_tabs, *lines[end:]]\n tab_section = self.parse_tabs(lines)\n return lines\n\n def generate_content_blocks(self, tab_section: Dict[str, Any], lines: List[str]) -> str:\n tab_content_blocks = []\n for index, tab in enumerate(tab_section[\"tabs\"]):\n start_index = tab[\"start\"] + 1\n try:\n # If there are more tabs, we can use the starting index\n # of the next tab as the ending index of the previous one\n end_index = tab_section[\"tabs\"][index + 1][\"start\"]\n except IndexError:\n # Otherwise, just use the end of the entire section\n end_index = tab_section[\"end_tabs_index\"]\n\n content = \"\\n\".join(lines[start_index:end_index]).strip()\n tab_content_block = DIV_TAB_CONTENT_TEMPLATE.format(\n data_tab_key=tab[\"tab_key\"],\n # Wrapping the content in two newlines is necessary here.\n # If we don't do this, the inner Markdown does not get\n # rendered properly.\n content=f\"\\n{content}\\n\",\n )\n tab_content_blocks.append(tab_content_block)\n return \"\\n\".join(tab_content_blocks)\n\n def generate_nav_bar(self, tab_section: Dict[str, Any]) -> str:\n li_elements = []\n for tab in tab_section[\"tabs\"]:\n tab_key = tab.get(\"tab_key\")\n tab_label = TAB_SECTION_LABELS.get(tab_key)\n if tab_label is None:\n raise ValueError(\n f\"Tab '{tab_key}' is not present in TAB_SECTION_LABELS in zerver/lib/markdown/tabbed_sections.py\"\n )\n\n li = NAV_LIST_ITEM_TEMPLATE.format(data_tab_key=tab_key, label=tab_label)\n li_elements.append(li)\n\n return NAV_BAR_TEMPLATE.format(tabs=\"\\n\".join(li_elements))\n\n def parse_tabs(self, lines: List[str]) -> Optional[Dict[str, Any]]:\n block: Dict[str, Any] = {}\n for index, line in enumerate(lines):\n start_match = START_TABBED_SECTION_REGEX.search(line)\n if start_match:\n block[\"start_tabs_index\"] = index\n\n tab_content_match = TAB_CONTENT_REGEX.search(line)\n if tab_content_match:\n block.setdefault(\"tabs\", [])\n tab = {\"start\": index, \"tab_key\": tab_content_match.group(1)}\n block[\"tabs\"].append(tab)\n\n end_match = END_TABBED_SECTION_REGEX.search(line)\n if end_match:\n block[\"end_tabs_index\"] = index\n break\n return block\n\n\ndef makeExtension(*args: Any, **kwargs: str) -> TabbedSectionsGenerator:\n return TabbedSectionsGenerator(**kwargs)\n", "path": "zerver/lib/markdown/tabbed_sections.py"}]}
| 2,929 | 130 |
gh_patches_debug_42433
|
rasdani/github-patches
|
git_diff
|
quantopian__zipline-463
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Support for nans in input data
If a ticker hasn't started trading yet, pandas' convention is to use nans. Currently it seems as if zipline raises an exception if there are nans in the input data. This should be fixed and the corresponding ticker to should not be included if it hasn't started trading yet.
</issue>
<code>
[start of zipline/sources/data_frame_source.py]
1
2 #
3 # Copyright 2013 Quantopian, Inc.
4 #
5 # Licensed under the Apache License, Version 2.0 (the "License");
6 # you may not use this file except in compliance with the License.
7 # You may obtain a copy of the License at
8 #
9 # http://www.apache.org/licenses/LICENSE-2.0
10 #
11 # Unless required by applicable law or agreed to in writing, software
12 # distributed under the License is distributed on an "AS IS" BASIS,
13 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 # See the License for the specific language governing permissions and
15 # limitations under the License.
16
17 """
18 Tools to generate data sources.
19 """
20 import pandas as pd
21
22 from zipline.gens.utils import hash_args
23
24 from zipline.sources.data_source import DataSource
25
26
27 class DataFrameSource(DataSource):
28 """
29 Yields all events in event_list that match the given sid_filter.
30 If no event_list is specified, generates an internal stream of events
31 to filter. Returns all events if filter is None.
32
33 Configuration options:
34
35 sids : list of values representing simulated internal sids
36 start : start date
37 delta : timedelta between internal events
38 filter : filter to remove the sids
39 """
40
41 def __init__(self, data, **kwargs):
42 assert isinstance(data.index, pd.tseries.index.DatetimeIndex)
43
44 self.data = data
45 # Unpack config dictionary with default values.
46 self.sids = kwargs.get('sids', data.columns)
47 self.start = kwargs.get('start', data.index[0])
48 self.end = kwargs.get('end', data.index[-1])
49
50 # Hash_value for downstream sorting.
51 self.arg_string = hash_args(data, **kwargs)
52
53 self._raw_data = None
54
55 @property
56 def mapping(self):
57 return {
58 'dt': (lambda x: x, 'dt'),
59 'sid': (lambda x: x, 'sid'),
60 'price': (float, 'price'),
61 'volume': (int, 'volume'),
62 }
63
64 @property
65 def instance_hash(self):
66 return self.arg_string
67
68 def raw_data_gen(self):
69 for dt, series in self.data.iterrows():
70 for sid, price in series.iteritems():
71 if sid in self.sids:
72 event = {
73 'dt': dt,
74 'sid': sid,
75 'price': price,
76 # Just chose something large
77 # if no volume available.
78 'volume': 1e9,
79 }
80 yield event
81
82 @property
83 def raw_data(self):
84 if not self._raw_data:
85 self._raw_data = self.raw_data_gen()
86 return self._raw_data
87
88
89 class DataPanelSource(DataSource):
90 """
91 Yields all events in event_list that match the given sid_filter.
92 If no event_list is specified, generates an internal stream of events
93 to filter. Returns all events if filter is None.
94
95 Configuration options:
96
97 sids : list of values representing simulated internal sids
98 start : start date
99 delta : timedelta between internal events
100 filter : filter to remove the sids
101 """
102
103 def __init__(self, data, **kwargs):
104 assert isinstance(data.major_axis, pd.tseries.index.DatetimeIndex)
105
106 self.data = data
107 # Unpack config dictionary with default values.
108 self.sids = kwargs.get('sids', data.items)
109 self.start = kwargs.get('start', data.major_axis[0])
110 self.end = kwargs.get('end', data.major_axis[-1])
111
112 # Hash_value for downstream sorting.
113 self.arg_string = hash_args(data, **kwargs)
114
115 self._raw_data = None
116
117 @property
118 def mapping(self):
119 mapping = {
120 'dt': (lambda x: x, 'dt'),
121 'sid': (lambda x: x, 'sid'),
122 'price': (float, 'price'),
123 'volume': (int, 'volume'),
124 }
125
126 # Add additional fields.
127 for field_name in self.data.minor_axis:
128 if field_name in ['price', 'volume', 'dt', 'sid']:
129 continue
130 mapping[field_name] = (lambda x: x, field_name)
131
132 return mapping
133
134 @property
135 def instance_hash(self):
136 return self.arg_string
137
138 def raw_data_gen(self):
139 for dt in self.data.major_axis:
140 df = self.data.major_xs(dt)
141 for sid, series in df.iteritems():
142 if sid in self.sids:
143 event = {
144 'dt': dt,
145 'sid': sid,
146 }
147 for field_name, value in series.iteritems():
148 event[field_name] = value
149
150 yield event
151
152 @property
153 def raw_data(self):
154 if not self._raw_data:
155 self._raw_data = self.raw_data_gen()
156 return self._raw_data
157
[end of zipline/sources/data_frame_source.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/zipline/sources/data_frame_source.py b/zipline/sources/data_frame_source.py
--- a/zipline/sources/data_frame_source.py
+++ b/zipline/sources/data_frame_source.py
@@ -1,6 +1,5 @@
-
#
-# Copyright 2013 Quantopian, Inc.
+# Copyright 2015 Quantopian, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,6 +16,7 @@
"""
Tools to generate data sources.
"""
+import numpy as np
import pandas as pd
from zipline.gens.utils import hash_args
@@ -26,16 +26,14 @@
class DataFrameSource(DataSource):
"""
- Yields all events in event_list that match the given sid_filter.
- If no event_list is specified, generates an internal stream of events
- to filter. Returns all events if filter is None.
+ Data source that yields from a pandas DataFrame.
- Configuration options:
+ :Axis layout:
+ * columns : sids
+ * index : datetime
- sids : list of values representing simulated internal sids
- start : start date
- delta : timedelta between internal events
- filter : filter to remove the sids
+ :Note:
+ Bars where the price is nan are filtered out.
"""
def __init__(self, data, **kwargs):
@@ -52,6 +50,8 @@
self._raw_data = None
+ self.started_sids = set()
+
@property
def mapping(self):
return {
@@ -69,6 +69,12 @@
for dt, series in self.data.iterrows():
for sid, price in series.iteritems():
if sid in self.sids:
+ # Skip SIDs that can not be forward filled
+ if np.isnan(price) and \
+ sid not in self.started_sids:
+ continue
+ self.started_sids.add(sid)
+
event = {
'dt': dt,
'sid': sid,
@@ -88,16 +94,15 @@
class DataPanelSource(DataSource):
"""
- Yields all events in event_list that match the given sid_filter.
- If no event_list is specified, generates an internal stream of events
- to filter. Returns all events if filter is None.
+ Data source that yields from a pandas Panel.
- Configuration options:
+ :Axis layout:
+ * items : sids
+ * major_axis : datetime
+ * minor_axis : price, volume, ...
- sids : list of values representing simulated internal sids
- start : start date
- delta : timedelta between internal events
- filter : filter to remove the sids
+ :Note:
+ Bars where the price is nan are filtered out.
"""
def __init__(self, data, **kwargs):
@@ -114,6 +119,8 @@
self._raw_data = None
+ self.started_sids = set()
+
@property
def mapping(self):
mapping = {
@@ -140,6 +147,12 @@
df = self.data.major_xs(dt)
for sid, series in df.iteritems():
if sid in self.sids:
+ # Skip SIDs that can not be forward filled
+ if np.isnan(series['price']) and \
+ sid not in self.started_sids:
+ continue
+ self.started_sids.add(sid)
+
event = {
'dt': dt,
'sid': sid,
|
{"golden_diff": "diff --git a/zipline/sources/data_frame_source.py b/zipline/sources/data_frame_source.py\n--- a/zipline/sources/data_frame_source.py\n+++ b/zipline/sources/data_frame_source.py\n@@ -1,6 +1,5 @@\n-\n #\n-# Copyright 2013 Quantopian, Inc.\n+# Copyright 2015 Quantopian, Inc.\n #\n # Licensed under the Apache License, Version 2.0 (the \"License\");\n # you may not use this file except in compliance with the License.\n@@ -17,6 +16,7 @@\n \"\"\"\n Tools to generate data sources.\n \"\"\"\n+import numpy as np\n import pandas as pd\n \n from zipline.gens.utils import hash_args\n@@ -26,16 +26,14 @@\n \n class DataFrameSource(DataSource):\n \"\"\"\n- Yields all events in event_list that match the given sid_filter.\n- If no event_list is specified, generates an internal stream of events\n- to filter. Returns all events if filter is None.\n+ Data source that yields from a pandas DataFrame.\n \n- Configuration options:\n+ :Axis layout:\n+ * columns : sids\n+ * index : datetime\n \n- sids : list of values representing simulated internal sids\n- start : start date\n- delta : timedelta between internal events\n- filter : filter to remove the sids\n+ :Note:\n+ Bars where the price is nan are filtered out.\n \"\"\"\n \n def __init__(self, data, **kwargs):\n@@ -52,6 +50,8 @@\n \n self._raw_data = None\n \n+ self.started_sids = set()\n+\n @property\n def mapping(self):\n return {\n@@ -69,6 +69,12 @@\n for dt, series in self.data.iterrows():\n for sid, price in series.iteritems():\n if sid in self.sids:\n+ # Skip SIDs that can not be forward filled\n+ if np.isnan(price) and \\\n+ sid not in self.started_sids:\n+ continue\n+ self.started_sids.add(sid)\n+\n event = {\n 'dt': dt,\n 'sid': sid,\n@@ -88,16 +94,15 @@\n \n class DataPanelSource(DataSource):\n \"\"\"\n- Yields all events in event_list that match the given sid_filter.\n- If no event_list is specified, generates an internal stream of events\n- to filter. Returns all events if filter is None.\n+ Data source that yields from a pandas Panel.\n \n- Configuration options:\n+ :Axis layout:\n+ * items : sids\n+ * major_axis : datetime\n+ * minor_axis : price, volume, ...\n \n- sids : list of values representing simulated internal sids\n- start : start date\n- delta : timedelta between internal events\n- filter : filter to remove the sids\n+ :Note:\n+ Bars where the price is nan are filtered out.\n \"\"\"\n \n def __init__(self, data, **kwargs):\n@@ -114,6 +119,8 @@\n \n self._raw_data = None\n \n+ self.started_sids = set()\n+\n @property\n def mapping(self):\n mapping = {\n@@ -140,6 +147,12 @@\n df = self.data.major_xs(dt)\n for sid, series in df.iteritems():\n if sid in self.sids:\n+ # Skip SIDs that can not be forward filled\n+ if np.isnan(series['price']) and \\\n+ sid not in self.started_sids:\n+ continue\n+ self.started_sids.add(sid)\n+\n event = {\n 'dt': dt,\n 'sid': sid,\n", "issue": "Support for nans in input data\nIf a ticker hasn't started trading yet, pandas' convention is to use nans. Currently it seems as if zipline raises an exception if there are nans in the input data. This should be fixed and the corresponding ticker to should not be included if it hasn't started trading yet.\n\n", "before_files": [{"content": "\n#\n# Copyright 2013 Quantopian, Inc.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\n\"\"\"\nTools to generate data sources.\n\"\"\"\nimport pandas as pd\n\nfrom zipline.gens.utils import hash_args\n\nfrom zipline.sources.data_source import DataSource\n\n\nclass DataFrameSource(DataSource):\n \"\"\"\n Yields all events in event_list that match the given sid_filter.\n If no event_list is specified, generates an internal stream of events\n to filter. Returns all events if filter is None.\n\n Configuration options:\n\n sids : list of values representing simulated internal sids\n start : start date\n delta : timedelta between internal events\n filter : filter to remove the sids\n \"\"\"\n\n def __init__(self, data, **kwargs):\n assert isinstance(data.index, pd.tseries.index.DatetimeIndex)\n\n self.data = data\n # Unpack config dictionary with default values.\n self.sids = kwargs.get('sids', data.columns)\n self.start = kwargs.get('start', data.index[0])\n self.end = kwargs.get('end', data.index[-1])\n\n # Hash_value for downstream sorting.\n self.arg_string = hash_args(data, **kwargs)\n\n self._raw_data = None\n\n @property\n def mapping(self):\n return {\n 'dt': (lambda x: x, 'dt'),\n 'sid': (lambda x: x, 'sid'),\n 'price': (float, 'price'),\n 'volume': (int, 'volume'),\n }\n\n @property\n def instance_hash(self):\n return self.arg_string\n\n def raw_data_gen(self):\n for dt, series in self.data.iterrows():\n for sid, price in series.iteritems():\n if sid in self.sids:\n event = {\n 'dt': dt,\n 'sid': sid,\n 'price': price,\n # Just chose something large\n # if no volume available.\n 'volume': 1e9,\n }\n yield event\n\n @property\n def raw_data(self):\n if not self._raw_data:\n self._raw_data = self.raw_data_gen()\n return self._raw_data\n\n\nclass DataPanelSource(DataSource):\n \"\"\"\n Yields all events in event_list that match the given sid_filter.\n If no event_list is specified, generates an internal stream of events\n to filter. Returns all events if filter is None.\n\n Configuration options:\n\n sids : list of values representing simulated internal sids\n start : start date\n delta : timedelta between internal events\n filter : filter to remove the sids\n \"\"\"\n\n def __init__(self, data, **kwargs):\n assert isinstance(data.major_axis, pd.tseries.index.DatetimeIndex)\n\n self.data = data\n # Unpack config dictionary with default values.\n self.sids = kwargs.get('sids', data.items)\n self.start = kwargs.get('start', data.major_axis[0])\n self.end = kwargs.get('end', data.major_axis[-1])\n\n # Hash_value for downstream sorting.\n self.arg_string = hash_args(data, **kwargs)\n\n self._raw_data = None\n\n @property\n def mapping(self):\n mapping = {\n 'dt': (lambda x: x, 'dt'),\n 'sid': (lambda x: x, 'sid'),\n 'price': (float, 'price'),\n 'volume': (int, 'volume'),\n }\n\n # Add additional fields.\n for field_name in self.data.minor_axis:\n if field_name in ['price', 'volume', 'dt', 'sid']:\n continue\n mapping[field_name] = (lambda x: x, field_name)\n\n return mapping\n\n @property\n def instance_hash(self):\n return self.arg_string\n\n def raw_data_gen(self):\n for dt in self.data.major_axis:\n df = self.data.major_xs(dt)\n for sid, series in df.iteritems():\n if sid in self.sids:\n event = {\n 'dt': dt,\n 'sid': sid,\n }\n for field_name, value in series.iteritems():\n event[field_name] = value\n\n yield event\n\n @property\n def raw_data(self):\n if not self._raw_data:\n self._raw_data = self.raw_data_gen()\n return self._raw_data\n", "path": "zipline/sources/data_frame_source.py"}]}
| 2,036 | 831 |
gh_patches_debug_7744
|
rasdani/github-patches
|
git_diff
|
mkdocs__mkdocs-289
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
`mkdocs serve` doesn't recover from build errors
For example, add a new page to the `pages` setting before you create the file, you then need to manually restart the serve command.
</issue>
<code>
[start of mkdocs/serve.py]
1 # coding: utf-8
2 from __future__ import print_function
3
4 from watchdog import events
5 from watchdog.observers.polling import PollingObserver
6 from mkdocs.build import build
7 from mkdocs.compat import httpserver, socketserver, urlunquote
8 from mkdocs.config import load_config
9 import os
10 import posixpath
11 import shutil
12 import sys
13 import tempfile
14
15
16 class BuildEventHandler(events.FileSystemEventHandler):
17 """
18 Perform a rebuild when anything in the theme or docs directory changes.
19 """
20 def __init__(self, options):
21 super(BuildEventHandler, self).__init__()
22 self.options = options
23
24 def on_any_event(self, event):
25 if not isinstance(event, events.DirModifiedEvent):
26 print('Rebuilding documentation...', end='')
27 config = load_config(options=self.options)
28 build(config, live_server=True)
29 print(' done')
30
31
32 class ConfigEventHandler(BuildEventHandler):
33 """
34 Perform a rebuild when the config file changes.
35 """
36 def on_any_event(self, event):
37 if os.path.basename(event.src_path) == 'mkdocs.yml':
38 super(ConfigEventHandler, self).on_any_event(event)
39
40
41 class FixedDirectoryHandler(httpserver.SimpleHTTPRequestHandler):
42 """
43 Override the default implementation to allow us to specify the served
44 directory, instead of being hardwired to the current working directory.
45 """
46 base_dir = os.getcwd()
47
48 def translate_path(self, path):
49 # abandon query parameters
50 path = path.split('?', 1)[0]
51 path = path.split('#', 1)[0]
52 path = posixpath.normpath(urlunquote(path))
53 words = path.split('/')
54 words = filter(None, words)
55 path = self.base_dir
56 for word in words:
57 drive, word = os.path.splitdrive(word)
58 head, word = os.path.split(word)
59 if word in (os.curdir, os.pardir):
60 continue
61 path = os.path.join(path, word)
62 return path
63
64 def log_message(self, format, *args):
65 date_str = self.log_date_time_string()
66 sys.stderr.write('[%s] %s\n' % (date_str, format % args))
67
68
69 def serve(config, options=None):
70 """
71 Start the devserver, and rebuild the docs whenever any changes take effect.
72 """
73 # Create a temporary build directory, and set some options to serve it
74 tempdir = tempfile.mkdtemp()
75 options['site_dir'] = tempdir
76
77 # Only use user-friendly URLs when running the live server
78 options['use_directory_urls'] = True
79
80 # Perform the initial build
81 config = load_config(options=options)
82 build(config, live_server=True)
83
84 # Note: We pass any command-line options through so that we
85 # can re-apply them if the config file is reloaded.
86 event_handler = BuildEventHandler(options)
87 config_event_handler = ConfigEventHandler(options)
88
89 # We could have used `Observer()`, which can be faster, but
90 # `PollingObserver()` works more universally.
91 observer = PollingObserver()
92 observer.schedule(event_handler, config['docs_dir'], recursive=True)
93 for theme_dir in config['theme_dir']:
94 observer.schedule(event_handler, theme_dir, recursive=True)
95 observer.schedule(config_event_handler, '.')
96 observer.start()
97
98 class TCPServer(socketserver.TCPServer):
99 allow_reuse_address = True
100
101 class DocsDirectoryHandler(FixedDirectoryHandler):
102 base_dir = config['site_dir']
103
104 host, port = config['dev_addr'].split(':', 1)
105 server = TCPServer((host, int(port)), DocsDirectoryHandler)
106
107 print('Running at: http://%s:%s/' % (host, port))
108 print('Live reload enabled.')
109 print('Hold ctrl+c to quit.')
110 try:
111 server.serve_forever()
112 except KeyboardInterrupt:
113 print('Stopping server...')
114
115 # Clean up
116 observer.stop()
117 observer.join()
118 shutil.rmtree(tempdir)
119 print('Quit complete')
120
[end of mkdocs/serve.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/mkdocs/serve.py b/mkdocs/serve.py
--- a/mkdocs/serve.py
+++ b/mkdocs/serve.py
@@ -34,8 +34,11 @@
Perform a rebuild when the config file changes.
"""
def on_any_event(self, event):
- if os.path.basename(event.src_path) == 'mkdocs.yml':
- super(ConfigEventHandler, self).on_any_event(event)
+ try:
+ if os.path.basename(event.src_path) == 'mkdocs.yml':
+ super(ConfigEventHandler, self).on_any_event(event)
+ except Exception as e:
+ print(e)
class FixedDirectoryHandler(httpserver.SimpleHTTPRequestHandler):
|
{"golden_diff": "diff --git a/mkdocs/serve.py b/mkdocs/serve.py\n--- a/mkdocs/serve.py\n+++ b/mkdocs/serve.py\n@@ -34,8 +34,11 @@\n Perform a rebuild when the config file changes.\n \"\"\"\n def on_any_event(self, event):\n- if os.path.basename(event.src_path) == 'mkdocs.yml':\n- super(ConfigEventHandler, self).on_any_event(event)\n+ try:\n+ if os.path.basename(event.src_path) == 'mkdocs.yml':\n+ super(ConfigEventHandler, self).on_any_event(event)\n+ except Exception as e:\n+ print(e)\n \n \n class FixedDirectoryHandler(httpserver.SimpleHTTPRequestHandler):\n", "issue": "`mkdocs serve` doesn't recover from build errors\nFor example, add a new page to the `pages` setting before you create the file, you then need to manually restart the serve command.\n\n", "before_files": [{"content": "# coding: utf-8\nfrom __future__ import print_function\n\nfrom watchdog import events\nfrom watchdog.observers.polling import PollingObserver\nfrom mkdocs.build import build\nfrom mkdocs.compat import httpserver, socketserver, urlunquote\nfrom mkdocs.config import load_config\nimport os\nimport posixpath\nimport shutil\nimport sys\nimport tempfile\n\n\nclass BuildEventHandler(events.FileSystemEventHandler):\n \"\"\"\n Perform a rebuild when anything in the theme or docs directory changes.\n \"\"\"\n def __init__(self, options):\n super(BuildEventHandler, self).__init__()\n self.options = options\n\n def on_any_event(self, event):\n if not isinstance(event, events.DirModifiedEvent):\n print('Rebuilding documentation...', end='')\n config = load_config(options=self.options)\n build(config, live_server=True)\n print(' done')\n\n\nclass ConfigEventHandler(BuildEventHandler):\n \"\"\"\n Perform a rebuild when the config file changes.\n \"\"\"\n def on_any_event(self, event):\n if os.path.basename(event.src_path) == 'mkdocs.yml':\n super(ConfigEventHandler, self).on_any_event(event)\n\n\nclass FixedDirectoryHandler(httpserver.SimpleHTTPRequestHandler):\n \"\"\"\n Override the default implementation to allow us to specify the served\n directory, instead of being hardwired to the current working directory.\n \"\"\"\n base_dir = os.getcwd()\n\n def translate_path(self, path):\n # abandon query parameters\n path = path.split('?', 1)[0]\n path = path.split('#', 1)[0]\n path = posixpath.normpath(urlunquote(path))\n words = path.split('/')\n words = filter(None, words)\n path = self.base_dir\n for word in words:\n drive, word = os.path.splitdrive(word)\n head, word = os.path.split(word)\n if word in (os.curdir, os.pardir):\n continue\n path = os.path.join(path, word)\n return path\n\n def log_message(self, format, *args):\n date_str = self.log_date_time_string()\n sys.stderr.write('[%s] %s\\n' % (date_str, format % args))\n\n\ndef serve(config, options=None):\n \"\"\"\n Start the devserver, and rebuild the docs whenever any changes take effect.\n \"\"\"\n # Create a temporary build directory, and set some options to serve it\n tempdir = tempfile.mkdtemp()\n options['site_dir'] = tempdir\n\n # Only use user-friendly URLs when running the live server\n options['use_directory_urls'] = True\n\n # Perform the initial build\n config = load_config(options=options)\n build(config, live_server=True)\n\n # Note: We pass any command-line options through so that we\n # can re-apply them if the config file is reloaded.\n event_handler = BuildEventHandler(options)\n config_event_handler = ConfigEventHandler(options)\n\n # We could have used `Observer()`, which can be faster, but\n # `PollingObserver()` works more universally.\n observer = PollingObserver()\n observer.schedule(event_handler, config['docs_dir'], recursive=True)\n for theme_dir in config['theme_dir']:\n observer.schedule(event_handler, theme_dir, recursive=True)\n observer.schedule(config_event_handler, '.')\n observer.start()\n\n class TCPServer(socketserver.TCPServer):\n allow_reuse_address = True\n\n class DocsDirectoryHandler(FixedDirectoryHandler):\n base_dir = config['site_dir']\n\n host, port = config['dev_addr'].split(':', 1)\n server = TCPServer((host, int(port)), DocsDirectoryHandler)\n\n print('Running at: http://%s:%s/' % (host, port))\n print('Live reload enabled.')\n print('Hold ctrl+c to quit.')\n try:\n server.serve_forever()\n except KeyboardInterrupt:\n print('Stopping server...')\n\n # Clean up\n observer.stop()\n observer.join()\n shutil.rmtree(tempdir)\n print('Quit complete')\n", "path": "mkdocs/serve.py"}]}
| 1,691 | 155 |
gh_patches_debug_13987
|
rasdani/github-patches
|
git_diff
|
spack__spack-4587
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Default Editor in Non-Interactive Mode
Hi,
with the latest updates in `develop` (tested: 790b06e0c363ce1598deb3bde217c4685701b61d) spack seems to require to know my `default editor` when installing software, even in non-interactive mode.
On the first call to `spack install` it now fails if *no editor is installed* on a system (which is quite often the case in docker images #4480):
```
Traceback (most recent call last):
File "/home/src/spack/bin/spack", line 80, in <module>
import spack.main # noqa
File "/home/src/spack/lib/spack/spack/__init__.py", line 227, in <module>
default = default_editors[0]
NameError: name 'default_editors' is not defined
```
This was not required earlier this week, so it might have been introduced quite recently. IMHO, spack should not need to know my editor for such a task :) (only for `spack create`-like commands)
Don't immediately raise an error when an editor is not found.
Fixes #4526.
@ax3l
</issue>
<code>
[start of lib/spack/spack/__init__.py]
1 # flake8: noqa
2 ##############################################################################
3 # Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
4 # Produced at the Lawrence Livermore National Laboratory.
5 #
6 # This file is part of Spack.
7 # Created by Todd Gamblin, [email protected], All rights reserved.
8 # LLNL-CODE-647188
9 #
10 # For details, see https://github.com/llnl/spack
11 # Please also see the NOTICE and LICENSE files for our notice and the LGPL.
12 #
13 # This program is free software; you can redistribute it and/or modify
14 # it under the terms of the GNU Lesser General Public License (as
15 # published by the Free Software Foundation) version 2.1, February 1999.
16 #
17 # This program is distributed in the hope that it will be useful, but
18 # WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
19 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
20 # conditions of the GNU Lesser General Public License for more details.
21 #
22 # You should have received a copy of the GNU Lesser General Public
23 # License along with this program; if not, write to the Free Software
24 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
25 ##############################################################################
26 import multiprocessing
27 import os
28 import sys
29 import tempfile
30 import getpass
31 from llnl.util.filesystem import *
32 import llnl.util.tty as tty
33
34 #-----------------------------------------------------------------------------
35 # Variables describing how Spack is laid out in its prefix.
36 #-----------------------------------------------------------------------------
37 # This file lives in $prefix/lib/spack/spack/__file__
38 spack_root = ancestor(__file__, 4)
39
40 # The spack script itself
41 spack_file = join_path(spack_root, "bin", "spack")
42
43 # spack directory hierarchy
44 lib_path = join_path(spack_root, "lib", "spack")
45 external_path = join_path(lib_path, "external")
46 build_env_path = join_path(lib_path, "env")
47 module_path = join_path(lib_path, "spack")
48 platform_path = join_path(module_path, 'platforms')
49 compilers_path = join_path(module_path, "compilers")
50 build_systems_path = join_path(module_path, 'build_systems')
51 operating_system_path = join_path(module_path, 'operating_systems')
52 test_path = join_path(module_path, "test")
53 hooks_path = join_path(module_path, "hooks")
54 var_path = join_path(spack_root, "var", "spack")
55 stage_path = join_path(var_path, "stage")
56 repos_path = join_path(var_path, "repos")
57 share_path = join_path(spack_root, "share", "spack")
58
59 # Paths to built-in Spack repositories.
60 packages_path = join_path(repos_path, "builtin")
61 mock_packages_path = join_path(repos_path, "builtin.mock")
62
63 # User configuration location
64 user_config_path = os.path.expanduser('~/.spack')
65
66 prefix = spack_root
67 opt_path = join_path(prefix, "opt")
68 etc_path = join_path(prefix, "etc")
69 system_etc_path = '/etc'
70
71 # GPG paths.
72 gpg_keys_path = join_path(var_path, "gpg")
73 mock_gpg_data_path = join_path(var_path, "gpg.mock", "data")
74 mock_gpg_keys_path = join_path(var_path, "gpg.mock", "keys")
75 gpg_path = join_path(opt_path, "spack", "gpg")
76
77
78 #-----------------------------------------------------------------------------
79 # Initial imports (only for use in this file -- see __all__ below.)
80 #-----------------------------------------------------------------------------
81 # These imports depend on the paths above, or on each other
82 # Group them here so it's easy to understand the order.
83 # TODO: refactor this stuff to be more init order agnostic.
84 import spack.repository
85 import spack.error
86 import spack.config
87 import spack.fetch_strategy
88 from spack.file_cache import FileCache
89 from spack.abi import ABI
90 from spack.concretize import DefaultConcretizer
91 from spack.version import Version
92 from spack.util.path import canonicalize_path
93
94
95 #-----------------------------------------------------------------------------
96 # Initialize various data structures & objects at the core of Spack.
97 #-----------------------------------------------------------------------------
98 # Version information
99 spack_version = Version("0.10.0")
100
101
102 # Set up the default packages database.
103 try:
104 repo = spack.repository.RepoPath()
105 sys.meta_path.append(repo)
106 except spack.error.SpackError as e:
107 tty.die('while initializing Spack RepoPath:', e.message)
108
109
110 # Tests ABI compatibility between packages
111 abi = ABI()
112
113
114 # This controls how things are concretized in spack.
115 # Replace it with a subclass if you want different
116 # policies.
117 concretizer = DefaultConcretizer()
118
119 #-----------------------------------------------------------------------------
120 # config.yaml options
121 #-----------------------------------------------------------------------------
122 _config = spack.config.get_config('config')
123
124
125 # Path where downloaded source code is cached
126 cache_path = canonicalize_path(
127 _config.get('source_cache', join_path(var_path, "cache")))
128 fetch_cache = spack.fetch_strategy.FsCache(cache_path)
129
130
131 # cache for miscellaneous stuff.
132 misc_cache_path = canonicalize_path(
133 _config.get('misc_cache', join_path(user_config_path, 'cache')))
134 misc_cache = FileCache(misc_cache_path)
135
136
137 # If this is enabled, tools that use SSL should not verify
138 # certifiates. e.g., curl should use the -k option.
139 insecure = not _config.get('verify_ssl', True)
140
141
142 # Whether spack should allow installation of unsafe versions of software.
143 # "Unsafe" versions are ones it doesn't have a checksum for.
144 do_checksum = _config.get('checksum', True)
145
146
147 # If this is True, spack will not clean the environment to remove
148 # potentially harmful variables before builds.
149 dirty = _config.get('dirty', False)
150
151
152 # The number of jobs to use when building in parallel.
153 # By default, use all cores on the machine.
154 build_jobs = _config.get('build_jobs', multiprocessing.cpu_count())
155
156
157 #-----------------------------------------------------------------------------
158 # When packages call 'from spack import *', this extra stuff is brought in.
159 #
160 # Spack internal code should call 'import spack' and accesses other
161 # variables (spack.repo, paths, etc.) directly.
162 #
163 # TODO: maybe this should be separated out to build_environment.py?
164 # TODO: it's not clear where all the stuff that needs to be included in
165 # packages should live. This file is overloaded for spack core vs.
166 # for packages.
167 #
168 #-----------------------------------------------------------------------------
169 __all__ = []
170
171 from spack.package import Package, run_before, run_after, on_package_attributes
172 from spack.build_systems.makefile import MakefilePackage
173 from spack.build_systems.autotools import AutotoolsPackage
174 from spack.build_systems.cmake import CMakePackage
175 from spack.build_systems.waf import WafPackage
176 from spack.build_systems.python import PythonPackage
177 from spack.build_systems.r import RPackage
178 from spack.build_systems.perl import PerlPackage
179
180 __all__ += [
181 'run_before',
182 'run_after',
183 'on_package_attributes',
184 'Package',
185 'MakefilePackage',
186 'AutotoolsPackage',
187 'CMakePackage',
188 'WafPackage',
189 'PythonPackage',
190 'RPackage',
191 'PerlPackage',
192 ]
193
194 from spack.version import Version, ver
195 __all__ += ['Version', 'ver']
196
197 from spack.spec import Spec, alldeps
198 __all__ += ['Spec', 'alldeps']
199
200 from spack.multimethod import when
201 __all__ += ['when']
202
203 import llnl.util.filesystem
204 from llnl.util.filesystem import *
205 __all__ += llnl.util.filesystem.__all__
206
207 import spack.directives
208 from spack.directives import *
209 __all__ += spack.directives.__all__
210
211 import spack.util.executable
212 from spack.util.executable import *
213 __all__ += spack.util.executable.__all__
214
215
216 # Set up the user's editor
217 # $EDITOR environment variable has the highest precedence
218 editor = os.environ.get('EDITOR')
219
220 # if editor is not set, use some sensible defaults
221 if editor is not None:
222 editor = Executable(editor)
223 else:
224 editor = which('vim', 'vi', 'emacs', 'nano')
225
226 if not editor:
227 default = default_editors[0]
228 msg = 'Default text editor, {0}, not found.\n'.format(default)
229 msg += 'Please set the EDITOR environment variable to your preferred '
230 msg += 'text editor, or install {0}.'.format(default)
231 raise EnvironmentError(msg)
232
233 from spack.package import \
234 install_dependency_symlinks, flatten_dependencies, \
235 DependencyConflictError, InstallError, ExternalPackageError
236 __all__ += [
237 'install_dependency_symlinks', 'flatten_dependencies',
238 'DependencyConflictError', 'InstallError', 'ExternalPackageError']
239
240 # Add default values for attributes that would otherwise be modified from
241 # Spack main script
242 debug = False
243 spack_working_dir = None
244
[end of lib/spack/spack/__init__.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py
--- a/lib/spack/spack/__init__.py
+++ b/lib/spack/spack/__init__.py
@@ -223,12 +223,13 @@
else:
editor = which('vim', 'vi', 'emacs', 'nano')
+# If there is no editor, only raise an error if we actually try to use it.
if not editor:
- default = default_editors[0]
- msg = 'Default text editor, {0}, not found.\n'.format(default)
- msg += 'Please set the EDITOR environment variable to your preferred '
- msg += 'text editor, or install {0}.'.format(default)
- raise EnvironmentError(msg)
+ def editor_not_found(*args, **kwargs):
+ raise EnvironmentError(
+ 'No text editor found! Please set the EDITOR environment variable '
+ 'to your preferred text editor.')
+ editor = editor_not_found
from spack.package import \
install_dependency_symlinks, flatten_dependencies, \
|
{"golden_diff": "diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py\n--- a/lib/spack/spack/__init__.py\n+++ b/lib/spack/spack/__init__.py\n@@ -223,12 +223,13 @@\n else:\n editor = which('vim', 'vi', 'emacs', 'nano')\n \n+# If there is no editor, only raise an error if we actually try to use it.\n if not editor:\n- default = default_editors[0]\n- msg = 'Default text editor, {0}, not found.\\n'.format(default)\n- msg += 'Please set the EDITOR environment variable to your preferred '\n- msg += 'text editor, or install {0}.'.format(default)\n- raise EnvironmentError(msg)\n+ def editor_not_found(*args, **kwargs):\n+ raise EnvironmentError(\n+ 'No text editor found! Please set the EDITOR environment variable '\n+ 'to your preferred text editor.')\n+ editor = editor_not_found\n \n from spack.package import \\\n install_dependency_symlinks, flatten_dependencies, \\\n", "issue": "Default Editor in Non-Interactive Mode\nHi,\r\n\r\nwith the latest updates in `develop` (tested: 790b06e0c363ce1598deb3bde217c4685701b61d) spack seems to require to know my `default editor` when installing software, even in non-interactive mode.\r\n\r\nOn the first call to `spack install` it now fails if *no editor is installed* on a system (which is quite often the case in docker images #4480):\r\n```\r\nTraceback (most recent call last):\r\n File \"/home/src/spack/bin/spack\", line 80, in <module>\r\n import spack.main # noqa\r\n File \"/home/src/spack/lib/spack/spack/__init__.py\", line 227, in <module>\r\n default = default_editors[0]\r\nNameError: name 'default_editors' is not defined\r\n```\r\n\r\nThis was not required earlier this week, so it might have been introduced quite recently. IMHO, spack should not need to know my editor for such a task :) (only for `spack create`-like commands)\nDon't immediately raise an error when an editor is not found.\nFixes #4526.\r\n\r\n@ax3l \n", "before_files": [{"content": "# flake8: noqa\n##############################################################################\n# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.\n# Produced at the Lawrence Livermore National Laboratory.\n#\n# This file is part of Spack.\n# Created by Todd Gamblin, [email protected], All rights reserved.\n# LLNL-CODE-647188\n#\n# For details, see https://github.com/llnl/spack\n# Please also see the NOTICE and LICENSE files for our notice and the LGPL.\n#\n# This program is free software; you can redistribute it and/or modify\n# it under the terms of the GNU Lesser General Public License (as\n# published by the Free Software Foundation) version 2.1, February 1999.\n#\n# This program is distributed in the hope that it will be useful, but\n# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and\n# conditions of the GNU Lesser General Public License for more details.\n#\n# You should have received a copy of the GNU Lesser General Public\n# License along with this program; if not, write to the Free Software\n# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n##############################################################################\nimport multiprocessing\nimport os\nimport sys\nimport tempfile\nimport getpass\nfrom llnl.util.filesystem import *\nimport llnl.util.tty as tty\n\n#-----------------------------------------------------------------------------\n# Variables describing how Spack is laid out in its prefix.\n#-----------------------------------------------------------------------------\n# This file lives in $prefix/lib/spack/spack/__file__\nspack_root = ancestor(__file__, 4)\n\n# The spack script itself\nspack_file = join_path(spack_root, \"bin\", \"spack\")\n\n# spack directory hierarchy\nlib_path = join_path(spack_root, \"lib\", \"spack\")\nexternal_path = join_path(lib_path, \"external\")\nbuild_env_path = join_path(lib_path, \"env\")\nmodule_path = join_path(lib_path, \"spack\")\nplatform_path = join_path(module_path, 'platforms')\ncompilers_path = join_path(module_path, \"compilers\")\nbuild_systems_path = join_path(module_path, 'build_systems')\noperating_system_path = join_path(module_path, 'operating_systems')\ntest_path = join_path(module_path, \"test\")\nhooks_path = join_path(module_path, \"hooks\")\nvar_path = join_path(spack_root, \"var\", \"spack\")\nstage_path = join_path(var_path, \"stage\")\nrepos_path = join_path(var_path, \"repos\")\nshare_path = join_path(spack_root, \"share\", \"spack\")\n\n# Paths to built-in Spack repositories.\npackages_path = join_path(repos_path, \"builtin\")\nmock_packages_path = join_path(repos_path, \"builtin.mock\")\n\n# User configuration location\nuser_config_path = os.path.expanduser('~/.spack')\n\nprefix = spack_root\nopt_path = join_path(prefix, \"opt\")\netc_path = join_path(prefix, \"etc\")\nsystem_etc_path = '/etc'\n\n# GPG paths.\ngpg_keys_path = join_path(var_path, \"gpg\")\nmock_gpg_data_path = join_path(var_path, \"gpg.mock\", \"data\")\nmock_gpg_keys_path = join_path(var_path, \"gpg.mock\", \"keys\")\ngpg_path = join_path(opt_path, \"spack\", \"gpg\")\n\n\n#-----------------------------------------------------------------------------\n# Initial imports (only for use in this file -- see __all__ below.)\n#-----------------------------------------------------------------------------\n# These imports depend on the paths above, or on each other\n# Group them here so it's easy to understand the order.\n# TODO: refactor this stuff to be more init order agnostic.\nimport spack.repository\nimport spack.error\nimport spack.config\nimport spack.fetch_strategy\nfrom spack.file_cache import FileCache\nfrom spack.abi import ABI\nfrom spack.concretize import DefaultConcretizer\nfrom spack.version import Version\nfrom spack.util.path import canonicalize_path\n\n\n#-----------------------------------------------------------------------------\n# Initialize various data structures & objects at the core of Spack.\n#-----------------------------------------------------------------------------\n# Version information\nspack_version = Version(\"0.10.0\")\n\n\n# Set up the default packages database.\ntry:\n repo = spack.repository.RepoPath()\n sys.meta_path.append(repo)\nexcept spack.error.SpackError as e:\n tty.die('while initializing Spack RepoPath:', e.message)\n\n\n# Tests ABI compatibility between packages\nabi = ABI()\n\n\n# This controls how things are concretized in spack.\n# Replace it with a subclass if you want different\n# policies.\nconcretizer = DefaultConcretizer()\n\n#-----------------------------------------------------------------------------\n# config.yaml options\n#-----------------------------------------------------------------------------\n_config = spack.config.get_config('config')\n\n\n# Path where downloaded source code is cached\ncache_path = canonicalize_path(\n _config.get('source_cache', join_path(var_path, \"cache\")))\nfetch_cache = spack.fetch_strategy.FsCache(cache_path)\n\n\n# cache for miscellaneous stuff.\nmisc_cache_path = canonicalize_path(\n _config.get('misc_cache', join_path(user_config_path, 'cache')))\nmisc_cache = FileCache(misc_cache_path)\n\n\n# If this is enabled, tools that use SSL should not verify\n# certifiates. e.g., curl should use the -k option.\ninsecure = not _config.get('verify_ssl', True)\n\n\n# Whether spack should allow installation of unsafe versions of software.\n# \"Unsafe\" versions are ones it doesn't have a checksum for.\ndo_checksum = _config.get('checksum', True)\n\n\n# If this is True, spack will not clean the environment to remove\n# potentially harmful variables before builds.\ndirty = _config.get('dirty', False)\n\n\n# The number of jobs to use when building in parallel.\n# By default, use all cores on the machine.\nbuild_jobs = _config.get('build_jobs', multiprocessing.cpu_count())\n\n\n#-----------------------------------------------------------------------------\n# When packages call 'from spack import *', this extra stuff is brought in.\n#\n# Spack internal code should call 'import spack' and accesses other\n# variables (spack.repo, paths, etc.) directly.\n#\n# TODO: maybe this should be separated out to build_environment.py?\n# TODO: it's not clear where all the stuff that needs to be included in\n# packages should live. This file is overloaded for spack core vs.\n# for packages.\n#\n#-----------------------------------------------------------------------------\n__all__ = []\n\nfrom spack.package import Package, run_before, run_after, on_package_attributes\nfrom spack.build_systems.makefile import MakefilePackage\nfrom spack.build_systems.autotools import AutotoolsPackage\nfrom spack.build_systems.cmake import CMakePackage\nfrom spack.build_systems.waf import WafPackage\nfrom spack.build_systems.python import PythonPackage\nfrom spack.build_systems.r import RPackage\nfrom spack.build_systems.perl import PerlPackage\n\n__all__ += [\n 'run_before',\n 'run_after',\n 'on_package_attributes',\n 'Package',\n 'MakefilePackage',\n 'AutotoolsPackage',\n 'CMakePackage',\n 'WafPackage',\n 'PythonPackage',\n 'RPackage',\n 'PerlPackage',\n]\n\nfrom spack.version import Version, ver\n__all__ += ['Version', 'ver']\n\nfrom spack.spec import Spec, alldeps\n__all__ += ['Spec', 'alldeps']\n\nfrom spack.multimethod import when\n__all__ += ['when']\n\nimport llnl.util.filesystem\nfrom llnl.util.filesystem import *\n__all__ += llnl.util.filesystem.__all__\n\nimport spack.directives\nfrom spack.directives import *\n__all__ += spack.directives.__all__\n\nimport spack.util.executable\nfrom spack.util.executable import *\n__all__ += spack.util.executable.__all__\n\n\n# Set up the user's editor\n# $EDITOR environment variable has the highest precedence\neditor = os.environ.get('EDITOR')\n\n# if editor is not set, use some sensible defaults\nif editor is not None:\n editor = Executable(editor)\nelse:\n editor = which('vim', 'vi', 'emacs', 'nano')\n\nif not editor:\n default = default_editors[0]\n msg = 'Default text editor, {0}, not found.\\n'.format(default)\n msg += 'Please set the EDITOR environment variable to your preferred '\n msg += 'text editor, or install {0}.'.format(default)\n raise EnvironmentError(msg)\n\nfrom spack.package import \\\n install_dependency_symlinks, flatten_dependencies, \\\n DependencyConflictError, InstallError, ExternalPackageError\n__all__ += [\n 'install_dependency_symlinks', 'flatten_dependencies',\n 'DependencyConflictError', 'InstallError', 'ExternalPackageError']\n\n# Add default values for attributes that would otherwise be modified from\n# Spack main script\ndebug = False\nspack_working_dir = None\n", "path": "lib/spack/spack/__init__.py"}]}
| 3,435 | 245 |
gh_patches_debug_818
|
rasdani/github-patches
|
git_diff
|
doccano__doccano-363
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
New user signup page question
Hi i'm trying to understand the user structure. I see a few posts about only being able to assign users to specific projects through the django admin screen, but my question is about the 'sign up' page you get offered when you click login, is this totally non functional? That is, is the *only* way to make new users of any kind through the django admin page?
Thanks,
Z
</issue>
<code>
[start of app/authentification/views.py]
1 from django.shortcuts import render
2 from .forms import SignupForm
3 from django.contrib.sites.shortcuts import get_current_site
4 from django.utils.encoding import force_bytes
5 from django.utils.http import urlsafe_base64_encode
6 from django.template.loader import render_to_string
7 from .tokens import account_activation_token
8 from django.core.mail import EmailMessage
9 from django.views.generic import TemplateView
10 from django.shortcuts import redirect
11
12 from app import settings
13
14
15 class SignupView(TemplateView):
16 template_name = 'signup.html'
17 form_class = SignupForm
18
19 def get(self, request, *args, **kwargs):
20 form = self.form_class()
21 return render(request, self.template_name, {'form': form, 'allow_signup': bool(settings.ALLOW_SIGNUP)})
22
23 def post(self, request, *args, **kwargs):
24 form = self.form_class(request.POST)
25
26 # here we make sure that a post request won't trigger a subscription in case allow_signup is False
27 if not bool(settings.ALLOW_SIGNUP):
28 return redirect('signup')
29
30 if not hasattr(settings, "EMAIL_BACKEND") and not hasattr(settings, "EMAIL_HOST"):
31 return render(request, 'email_not_set.html')
32
33 if form.is_valid():
34 user = form.save(commit=False)
35 user.is_active = False
36 user.save()
37 current_site = get_current_site(request)
38 mail_subject = 'Activate your account.'
39 message = render_to_string('acc_active_email.html', {
40 'user': user,
41 'domain': current_site.domain,
42 'uid': urlsafe_base64_encode(force_bytes(user.pk)).decode(),
43 'token': account_activation_token.make_token(user),
44 })
45 to_email = form.cleaned_data.get('email')
46 email = EmailMessage(
47 mail_subject, message, to=[to_email]
48 )
49 email.send()
50 return render(request, 'validate_mail_address_complete.html')
51 else:
52 return render(request, self.template_name, {'form': form, 'allow_signup': bool(settings.ALLOW_SIGNUP)})
53
[end of app/authentification/views.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/app/authentification/views.py b/app/authentification/views.py
--- a/app/authentification/views.py
+++ b/app/authentification/views.py
@@ -9,7 +9,7 @@
from django.views.generic import TemplateView
from django.shortcuts import redirect
-from app import settings
+from django.conf import settings
class SignupView(TemplateView):
|
{"golden_diff": "diff --git a/app/authentification/views.py b/app/authentification/views.py\n--- a/app/authentification/views.py\n+++ b/app/authentification/views.py\n@@ -9,7 +9,7 @@\n from django.views.generic import TemplateView\n from django.shortcuts import redirect\n \n-from app import settings\n+from django.conf import settings\n \n \n class SignupView(TemplateView):\n", "issue": "New user signup page question\nHi i'm trying to understand the user structure. I see a few posts about only being able to assign users to specific projects through the django admin screen, but my question is about the 'sign up' page you get offered when you click login, is this totally non functional? That is, is the *only* way to make new users of any kind through the django admin page?\r\n\r\nThanks,\r\nZ\n", "before_files": [{"content": "from django.shortcuts import render\nfrom .forms import SignupForm\nfrom django.contrib.sites.shortcuts import get_current_site\nfrom django.utils.encoding import force_bytes\nfrom django.utils.http import urlsafe_base64_encode\nfrom django.template.loader import render_to_string\nfrom .tokens import account_activation_token\nfrom django.core.mail import EmailMessage\nfrom django.views.generic import TemplateView\nfrom django.shortcuts import redirect\n\nfrom app import settings\n\n\nclass SignupView(TemplateView):\n template_name = 'signup.html'\n form_class = SignupForm\n\n def get(self, request, *args, **kwargs):\n form = self.form_class()\n return render(request, self.template_name, {'form': form, 'allow_signup': bool(settings.ALLOW_SIGNUP)})\n\n def post(self, request, *args, **kwargs):\n form = self.form_class(request.POST)\n\n # here we make sure that a post request won't trigger a subscription in case allow_signup is False\n if not bool(settings.ALLOW_SIGNUP):\n return redirect('signup')\n\n if not hasattr(settings, \"EMAIL_BACKEND\") and not hasattr(settings, \"EMAIL_HOST\"):\n return render(request, 'email_not_set.html')\n\n if form.is_valid():\n user = form.save(commit=False)\n user.is_active = False\n user.save()\n current_site = get_current_site(request)\n mail_subject = 'Activate your account.'\n message = render_to_string('acc_active_email.html', {\n 'user': user,\n 'domain': current_site.domain,\n 'uid': urlsafe_base64_encode(force_bytes(user.pk)).decode(),\n 'token': account_activation_token.make_token(user),\n })\n to_email = form.cleaned_data.get('email')\n email = EmailMessage(\n mail_subject, message, to=[to_email]\n )\n email.send()\n return render(request, 'validate_mail_address_complete.html')\n else:\n return render(request, self.template_name, {'form': form, 'allow_signup': bool(settings.ALLOW_SIGNUP)})\n", "path": "app/authentification/views.py"}]}
| 1,150 | 80 |
gh_patches_debug_16657
|
rasdani/github-patches
|
git_diff
|
deepchecks__deepchecks-575
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[FEAT] Visualization of Regression Systematic Error box plot unclear
**Is your feature request related to a problem? Please describe.**
Visualization of Regression Systematic Error box plot unclear
**Describe the solution you'd like**
Labels to be shorter and not sideways. Also labels are unclear.
</issue>
<code>
[start of deepchecks/checks/performance/regression_systematic_error.py]
1 # ----------------------------------------------------------------------------
2 # Copyright (C) 2021 Deepchecks (https://www.deepchecks.com)
3 #
4 # This file is part of Deepchecks.
5 # Deepchecks is distributed under the terms of the GNU Affero General
6 # Public License (version 3 or later).
7 # You should have received a copy of the GNU Affero General Public License
8 # along with Deepchecks. If not, see <http://www.gnu.org/licenses/>.
9 # ----------------------------------------------------------------------------
10 #
11 """The RegressionSystematicError check module."""
12 import plotly.graph_objects as go
13 from sklearn.base import BaseEstimator
14 from sklearn.metrics import mean_squared_error
15
16 from deepchecks import CheckResult, Dataset, SingleDatasetBaseCheck, ConditionResult
17 from deepchecks.utils.metrics import ModelType, task_type_validation
18 from deepchecks.utils.strings import format_number
19
20
21 __all__ = ['RegressionSystematicError']
22
23
24 class RegressionSystematicError(SingleDatasetBaseCheck):
25 """Check the regression systematic error."""
26
27 def run(self, dataset: Dataset, model: BaseEstimator) -> CheckResult:
28 """Run check.
29
30 Arguments:
31 dataset (Dataset): A dataset object.
32 model (BaseEstimator): A scikit-learn-compatible fitted estimator instance
33 Returns:
34 CheckResult:
35 - value is a dict with rmse and mean prediction error.
36 - display is box plot of the prediction errorד.
37 Raises:
38 DeepchecksValueError: If the object is not a Dataset instance with a label
39 """
40 return self._regression_error_distribution(dataset, model)
41
42 def _regression_error_distribution(self, dataset: Dataset, model: BaseEstimator):
43 Dataset.validate_dataset(dataset)
44 dataset.validate_label()
45 task_type_validation(model, dataset, [ModelType.REGRESSION])
46
47 y_test = dataset.label_col
48 y_pred = model.predict(dataset.features_columns)
49
50 rmse = mean_squared_error(dataset.label_col, y_pred, squared=False)
51 diff = y_test - y_pred
52 diff_mean = diff.mean()
53
54 fig = go.Figure()
55 fig.add_trace(go.Box(
56 x=diff,
57 name='Model prediction error',
58 boxmean=True # represent mean
59 )).update_layout(
60 title_text='Box plot of the model prediction error',
61 width=800, height=500)
62
63 display = [
64 'Non-zero mean of the error distribution indicated the presents '
65 'of systematic error in model predictions',
66 fig
67 ]
68
69 return CheckResult(value={'rmse': rmse, 'mean_error': diff_mean}, display=display)
70
71 def add_condition_systematic_error_ratio_to_rmse_not_greater_than(self, max_ratio: float = 0.01):
72 """Add condition - require the absolute mean systematic error to be not greater than (max_ratio * RMSE).
73
74 Args:
75 max_ratio (float): Maximum ratio
76 """
77 def max_bias_condition(result: float) -> ConditionResult:
78 rmse = result['rmse']
79 mean_error = result['mean_error']
80 if abs(mean_error) > max_ratio * rmse:
81 return ConditionResult(False,
82 f'mean error: {format_number(mean_error, 5)}, RMSE: {format_number(rmse)}')
83 else:
84 return ConditionResult(True)
85
86 return self.add_condition(f'Bias ratio is not greater than {format_number(max_ratio)}',
87 max_bias_condition)
88
[end of deepchecks/checks/performance/regression_systematic_error.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/deepchecks/checks/performance/regression_systematic_error.py b/deepchecks/checks/performance/regression_systematic_error.py
--- a/deepchecks/checks/performance/regression_systematic_error.py
+++ b/deepchecks/checks/performance/regression_systematic_error.py
@@ -51,14 +51,19 @@
diff = y_test - y_pred
diff_mean = diff.mean()
- fig = go.Figure()
- fig.add_trace(go.Box(
- x=diff,
- name='Model prediction error',
- boxmean=True # represent mean
- )).update_layout(
+ fig = (
+ go.Figure()
+ .add_trace(go.Box(
+ x=diff,
+ orientation='h',
+ name='Model prediction error',
+ hoverinfo='x',
+ boxmean=True))
+ .update_layout(
title_text='Box plot of the model prediction error',
- width=800, height=500)
+ width=800,
+ height=500)
+ )
display = [
'Non-zero mean of the error distribution indicated the presents '
|
{"golden_diff": "diff --git a/deepchecks/checks/performance/regression_systematic_error.py b/deepchecks/checks/performance/regression_systematic_error.py\n--- a/deepchecks/checks/performance/regression_systematic_error.py\n+++ b/deepchecks/checks/performance/regression_systematic_error.py\n@@ -51,14 +51,19 @@\n diff = y_test - y_pred\n diff_mean = diff.mean()\n \n- fig = go.Figure()\n- fig.add_trace(go.Box(\n- x=diff,\n- name='Model prediction error',\n- boxmean=True # represent mean\n- )).update_layout(\n+ fig = (\n+ go.Figure()\n+ .add_trace(go.Box(\n+ x=diff,\n+ orientation='h',\n+ name='Model prediction error',\n+ hoverinfo='x',\n+ boxmean=True))\n+ .update_layout(\n title_text='Box plot of the model prediction error',\n- width=800, height=500)\n+ width=800,\n+ height=500)\n+ )\n \n display = [\n 'Non-zero mean of the error distribution indicated the presents '\n", "issue": "[FEAT] Visualization of Regression Systematic Error box plot unclear\n**Is your feature request related to a problem? Please describe.**\r\nVisualization of Regression Systematic Error box plot unclear\r\n\r\n\r\n\r\n**Describe the solution you'd like**\r\nLabels to be shorter and not sideways. Also labels are unclear.\r\n\n", "before_files": [{"content": "# ----------------------------------------------------------------------------\n# Copyright (C) 2021 Deepchecks (https://www.deepchecks.com)\n#\n# This file is part of Deepchecks.\n# Deepchecks is distributed under the terms of the GNU Affero General\n# Public License (version 3 or later).\n# You should have received a copy of the GNU Affero General Public License\n# along with Deepchecks. If not, see <http://www.gnu.org/licenses/>.\n# ----------------------------------------------------------------------------\n#\n\"\"\"The RegressionSystematicError check module.\"\"\"\nimport plotly.graph_objects as go\nfrom sklearn.base import BaseEstimator\nfrom sklearn.metrics import mean_squared_error\n\nfrom deepchecks import CheckResult, Dataset, SingleDatasetBaseCheck, ConditionResult\nfrom deepchecks.utils.metrics import ModelType, task_type_validation\nfrom deepchecks.utils.strings import format_number\n\n\n__all__ = ['RegressionSystematicError']\n\n\nclass RegressionSystematicError(SingleDatasetBaseCheck):\n \"\"\"Check the regression systematic error.\"\"\"\n\n def run(self, dataset: Dataset, model: BaseEstimator) -> CheckResult:\n \"\"\"Run check.\n\n Arguments:\n dataset (Dataset): A dataset object.\n model (BaseEstimator): A scikit-learn-compatible fitted estimator instance\n Returns:\n CheckResult:\n - value is a dict with rmse and mean prediction error.\n - display is box plot of the prediction error\u05d3.\n Raises:\n DeepchecksValueError: If the object is not a Dataset instance with a label\n \"\"\"\n return self._regression_error_distribution(dataset, model)\n\n def _regression_error_distribution(self, dataset: Dataset, model: BaseEstimator):\n Dataset.validate_dataset(dataset)\n dataset.validate_label()\n task_type_validation(model, dataset, [ModelType.REGRESSION])\n\n y_test = dataset.label_col\n y_pred = model.predict(dataset.features_columns)\n\n rmse = mean_squared_error(dataset.label_col, y_pred, squared=False)\n diff = y_test - y_pred\n diff_mean = diff.mean()\n\n fig = go.Figure()\n fig.add_trace(go.Box(\n x=diff,\n name='Model prediction error',\n boxmean=True # represent mean\n )).update_layout(\n title_text='Box plot of the model prediction error',\n width=800, height=500)\n\n display = [\n 'Non-zero mean of the error distribution indicated the presents '\n 'of systematic error in model predictions',\n fig\n ]\n\n return CheckResult(value={'rmse': rmse, 'mean_error': diff_mean}, display=display)\n\n def add_condition_systematic_error_ratio_to_rmse_not_greater_than(self, max_ratio: float = 0.01):\n \"\"\"Add condition - require the absolute mean systematic error to be not greater than (max_ratio * RMSE).\n\n Args:\n max_ratio (float): Maximum ratio\n \"\"\"\n def max_bias_condition(result: float) -> ConditionResult:\n rmse = result['rmse']\n mean_error = result['mean_error']\n if abs(mean_error) > max_ratio * rmse:\n return ConditionResult(False,\n f'mean error: {format_number(mean_error, 5)}, RMSE: {format_number(rmse)}')\n else:\n return ConditionResult(True)\n\n return self.add_condition(f'Bias ratio is not greater than {format_number(max_ratio)}',\n max_bias_condition)\n", "path": "deepchecks/checks/performance/regression_systematic_error.py"}]}
| 1,582 | 263 |
gh_patches_debug_22661
|
rasdani/github-patches
|
git_diff
|
freqtrade__freqtrade-1955
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Hyperopt Resamples
Python Version: 3.6.7
CCXT version: 1.18.507
Branch: Develop
Last Commit ID: 4ae743e
## Step 3: Describe the problem:
self.ticker_interval is not implemented in the hyperopt interface, so you cannot resample data to higher timeframes.
</issue>
<code>
[start of freqtrade/optimize/hyperopt_interface.py]
1 """
2 IHyperOpt interface
3 This module defines the interface to apply for hyperopts
4 """
5
6 from abc import ABC, abstractmethod
7 from typing import Dict, Any, Callable, List
8
9 from pandas import DataFrame
10 from skopt.space import Dimension
11
12
13 class IHyperOpt(ABC):
14 """
15 Interface for freqtrade hyperopts
16 Defines the mandatory structure must follow any custom strategies
17
18 Attributes you can use:
19 minimal_roi -> Dict: Minimal ROI designed for the strategy
20 stoploss -> float: optimal stoploss designed for the strategy
21 ticker_interval -> int: value of the ticker interval to use for the strategy
22 """
23
24 @staticmethod
25 @abstractmethod
26 def populate_indicators(dataframe: DataFrame, metadata: dict) -> DataFrame:
27 """
28 Populate indicators that will be used in the Buy and Sell strategy
29 :param dataframe: Raw data from the exchange and parsed by parse_ticker_dataframe()
30 :return: a Dataframe with all mandatory indicators for the strategies
31 """
32
33 @staticmethod
34 @abstractmethod
35 def buy_strategy_generator(params: Dict[str, Any]) -> Callable:
36 """
37 Create a buy strategy generator
38 """
39
40 @staticmethod
41 @abstractmethod
42 def sell_strategy_generator(params: Dict[str, Any]) -> Callable:
43 """
44 Create a sell strategy generator
45 """
46
47 @staticmethod
48 @abstractmethod
49 def indicator_space() -> List[Dimension]:
50 """
51 Create an indicator space
52 """
53
54 @staticmethod
55 @abstractmethod
56 def sell_indicator_space() -> List[Dimension]:
57 """
58 Create a sell indicator space
59 """
60
61 @staticmethod
62 @abstractmethod
63 def generate_roi_table(params: Dict) -> Dict[int, float]:
64 """
65 Create an roi table
66 """
67
68 @staticmethod
69 @abstractmethod
70 def stoploss_space() -> List[Dimension]:
71 """
72 Create a stoploss space
73 """
74
75 @staticmethod
76 @abstractmethod
77 def roi_space() -> List[Dimension]:
78 """
79 Create a roi space
80 """
81
[end of freqtrade/optimize/hyperopt_interface.py]
[start of freqtrade/resolvers/hyperopt_resolver.py]
1 # pragma pylint: disable=attribute-defined-outside-init
2
3 """
4 This module load custom hyperopts
5 """
6 import logging
7 from pathlib import Path
8 from typing import Optional, Dict
9
10 from freqtrade.constants import DEFAULT_HYPEROPT
11 from freqtrade.optimize.hyperopt_interface import IHyperOpt
12 from freqtrade.resolvers import IResolver
13
14 logger = logging.getLogger(__name__)
15
16
17 class HyperOptResolver(IResolver):
18 """
19 This class contains all the logic to load custom hyperopt class
20 """
21
22 __slots__ = ['hyperopt']
23
24 def __init__(self, config: Optional[Dict] = None) -> None:
25 """
26 Load the custom class from config parameter
27 :param config: configuration dictionary or None
28 """
29 config = config or {}
30
31 # Verify the hyperopt is in the configuration, otherwise fallback to the default hyperopt
32 hyperopt_name = config.get('hyperopt') or DEFAULT_HYPEROPT
33 self.hyperopt = self._load_hyperopt(hyperopt_name, extra_dir=config.get('hyperopt_path'))
34
35 if not hasattr(self.hyperopt, 'populate_buy_trend'):
36 logger.warning("Custom Hyperopt does not provide populate_buy_trend. "
37 "Using populate_buy_trend from DefaultStrategy.")
38 if not hasattr(self.hyperopt, 'populate_sell_trend'):
39 logger.warning("Custom Hyperopt does not provide populate_sell_trend. "
40 "Using populate_sell_trend from DefaultStrategy.")
41
42 def _load_hyperopt(
43 self, hyperopt_name: str, extra_dir: Optional[str] = None) -> IHyperOpt:
44 """
45 Search and loads the specified hyperopt.
46 :param hyperopt_name: name of the module to import
47 :param extra_dir: additional directory to search for the given hyperopt
48 :return: HyperOpt instance or None
49 """
50 current_path = Path(__file__).parent.parent.joinpath('optimize').resolve()
51
52 abs_paths = [
53 current_path.parent.parent.joinpath('user_data/hyperopts'),
54 current_path,
55 ]
56
57 if extra_dir:
58 # Add extra hyperopt directory on top of search paths
59 abs_paths.insert(0, Path(extra_dir))
60
61 for _path in abs_paths:
62 try:
63 hyperopt = self._search_object(directory=_path, object_type=IHyperOpt,
64 object_name=hyperopt_name)
65 if hyperopt:
66 logger.info("Using resolved hyperopt %s from '%s'", hyperopt_name, _path)
67 return hyperopt
68 except FileNotFoundError:
69 logger.warning('Path "%s" does not exist', _path.relative_to(Path.cwd()))
70
71 raise ImportError(
72 "Impossible to load Hyperopt '{}'. This class does not exist"
73 " or contains Python code errors".format(hyperopt_name)
74 )
75
[end of freqtrade/resolvers/hyperopt_resolver.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/freqtrade/optimize/hyperopt_interface.py b/freqtrade/optimize/hyperopt_interface.py
--- a/freqtrade/optimize/hyperopt_interface.py
+++ b/freqtrade/optimize/hyperopt_interface.py
@@ -20,6 +20,7 @@
stoploss -> float: optimal stoploss designed for the strategy
ticker_interval -> int: value of the ticker interval to use for the strategy
"""
+ ticker_interval: str
@staticmethod
@abstractmethod
diff --git a/freqtrade/resolvers/hyperopt_resolver.py b/freqtrade/resolvers/hyperopt_resolver.py
--- a/freqtrade/resolvers/hyperopt_resolver.py
+++ b/freqtrade/resolvers/hyperopt_resolver.py
@@ -32,6 +32,9 @@
hyperopt_name = config.get('hyperopt') or DEFAULT_HYPEROPT
self.hyperopt = self._load_hyperopt(hyperopt_name, extra_dir=config.get('hyperopt_path'))
+ # Assign ticker_interval to be used in hyperopt
+ self.hyperopt.__class__.ticker_interval = str(config['ticker_interval'])
+
if not hasattr(self.hyperopt, 'populate_buy_trend'):
logger.warning("Custom Hyperopt does not provide populate_buy_trend. "
"Using populate_buy_trend from DefaultStrategy.")
|
{"golden_diff": "diff --git a/freqtrade/optimize/hyperopt_interface.py b/freqtrade/optimize/hyperopt_interface.py\n--- a/freqtrade/optimize/hyperopt_interface.py\n+++ b/freqtrade/optimize/hyperopt_interface.py\n@@ -20,6 +20,7 @@\n stoploss -> float: optimal stoploss designed for the strategy\n ticker_interval -> int: value of the ticker interval to use for the strategy\n \"\"\"\n+ ticker_interval: str\n \n @staticmethod\n @abstractmethod\ndiff --git a/freqtrade/resolvers/hyperopt_resolver.py b/freqtrade/resolvers/hyperopt_resolver.py\n--- a/freqtrade/resolvers/hyperopt_resolver.py\n+++ b/freqtrade/resolvers/hyperopt_resolver.py\n@@ -32,6 +32,9 @@\n hyperopt_name = config.get('hyperopt') or DEFAULT_HYPEROPT\n self.hyperopt = self._load_hyperopt(hyperopt_name, extra_dir=config.get('hyperopt_path'))\n \n+ # Assign ticker_interval to be used in hyperopt\n+ self.hyperopt.__class__.ticker_interval = str(config['ticker_interval'])\n+\n if not hasattr(self.hyperopt, 'populate_buy_trend'):\n logger.warning(\"Custom Hyperopt does not provide populate_buy_trend. \"\n \"Using populate_buy_trend from DefaultStrategy.\")\n", "issue": "Hyperopt Resamples\n Python Version: 3.6.7\r\n CCXT version: 1.18.507\r\n Branch: Develop\r\n Last Commit ID: 4ae743e\r\n\r\n \r\n## Step 3: Describe the problem:\r\n\r\nself.ticker_interval is not implemented in the hyperopt interface, so you cannot resample data to higher timeframes.\r\n\r\n\n", "before_files": [{"content": "\"\"\"\nIHyperOpt interface\nThis module defines the interface to apply for hyperopts\n\"\"\"\n\nfrom abc import ABC, abstractmethod\nfrom typing import Dict, Any, Callable, List\n\nfrom pandas import DataFrame\nfrom skopt.space import Dimension\n\n\nclass IHyperOpt(ABC):\n \"\"\"\n Interface for freqtrade hyperopts\n Defines the mandatory structure must follow any custom strategies\n\n Attributes you can use:\n minimal_roi -> Dict: Minimal ROI designed for the strategy\n stoploss -> float: optimal stoploss designed for the strategy\n ticker_interval -> int: value of the ticker interval to use for the strategy\n \"\"\"\n\n @staticmethod\n @abstractmethod\n def populate_indicators(dataframe: DataFrame, metadata: dict) -> DataFrame:\n \"\"\"\n Populate indicators that will be used in the Buy and Sell strategy\n :param dataframe: Raw data from the exchange and parsed by parse_ticker_dataframe()\n :return: a Dataframe with all mandatory indicators for the strategies\n \"\"\"\n\n @staticmethod\n @abstractmethod\n def buy_strategy_generator(params: Dict[str, Any]) -> Callable:\n \"\"\"\n Create a buy strategy generator\n \"\"\"\n\n @staticmethod\n @abstractmethod\n def sell_strategy_generator(params: Dict[str, Any]) -> Callable:\n \"\"\"\n Create a sell strategy generator\n \"\"\"\n\n @staticmethod\n @abstractmethod\n def indicator_space() -> List[Dimension]:\n \"\"\"\n Create an indicator space\n \"\"\"\n\n @staticmethod\n @abstractmethod\n def sell_indicator_space() -> List[Dimension]:\n \"\"\"\n Create a sell indicator space\n \"\"\"\n\n @staticmethod\n @abstractmethod\n def generate_roi_table(params: Dict) -> Dict[int, float]:\n \"\"\"\n Create an roi table\n \"\"\"\n\n @staticmethod\n @abstractmethod\n def stoploss_space() -> List[Dimension]:\n \"\"\"\n Create a stoploss space\n \"\"\"\n\n @staticmethod\n @abstractmethod\n def roi_space() -> List[Dimension]:\n \"\"\"\n Create a roi space\n \"\"\"\n", "path": "freqtrade/optimize/hyperopt_interface.py"}, {"content": "# pragma pylint: disable=attribute-defined-outside-init\n\n\"\"\"\nThis module load custom hyperopts\n\"\"\"\nimport logging\nfrom pathlib import Path\nfrom typing import Optional, Dict\n\nfrom freqtrade.constants import DEFAULT_HYPEROPT\nfrom freqtrade.optimize.hyperopt_interface import IHyperOpt\nfrom freqtrade.resolvers import IResolver\n\nlogger = logging.getLogger(__name__)\n\n\nclass HyperOptResolver(IResolver):\n \"\"\"\n This class contains all the logic to load custom hyperopt class\n \"\"\"\n\n __slots__ = ['hyperopt']\n\n def __init__(self, config: Optional[Dict] = None) -> None:\n \"\"\"\n Load the custom class from config parameter\n :param config: configuration dictionary or None\n \"\"\"\n config = config or {}\n\n # Verify the hyperopt is in the configuration, otherwise fallback to the default hyperopt\n hyperopt_name = config.get('hyperopt') or DEFAULT_HYPEROPT\n self.hyperopt = self._load_hyperopt(hyperopt_name, extra_dir=config.get('hyperopt_path'))\n\n if not hasattr(self.hyperopt, 'populate_buy_trend'):\n logger.warning(\"Custom Hyperopt does not provide populate_buy_trend. \"\n \"Using populate_buy_trend from DefaultStrategy.\")\n if not hasattr(self.hyperopt, 'populate_sell_trend'):\n logger.warning(\"Custom Hyperopt does not provide populate_sell_trend. \"\n \"Using populate_sell_trend from DefaultStrategy.\")\n\n def _load_hyperopt(\n self, hyperopt_name: str, extra_dir: Optional[str] = None) -> IHyperOpt:\n \"\"\"\n Search and loads the specified hyperopt.\n :param hyperopt_name: name of the module to import\n :param extra_dir: additional directory to search for the given hyperopt\n :return: HyperOpt instance or None\n \"\"\"\n current_path = Path(__file__).parent.parent.joinpath('optimize').resolve()\n\n abs_paths = [\n current_path.parent.parent.joinpath('user_data/hyperopts'),\n current_path,\n ]\n\n if extra_dir:\n # Add extra hyperopt directory on top of search paths\n abs_paths.insert(0, Path(extra_dir))\n\n for _path in abs_paths:\n try:\n hyperopt = self._search_object(directory=_path, object_type=IHyperOpt,\n object_name=hyperopt_name)\n if hyperopt:\n logger.info(\"Using resolved hyperopt %s from '%s'\", hyperopt_name, _path)\n return hyperopt\n except FileNotFoundError:\n logger.warning('Path \"%s\" does not exist', _path.relative_to(Path.cwd()))\n\n raise ImportError(\n \"Impossible to load Hyperopt '{}'. This class does not exist\"\n \" or contains Python code errors\".format(hyperopt_name)\n )\n", "path": "freqtrade/resolvers/hyperopt_resolver.py"}]}
| 1,981 | 294 |
gh_patches_debug_18144
|
rasdani/github-patches
|
git_diff
|
SeldonIO__MLServer-190
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Infer model's name from folder's name
Currently, particularly in the case of MMS, MLServer requires models to specify their name in a `model-settings.json` file. This forces all models to ship that file alongside their model artifacts.
It would be good to, instead, infer the model's name from the folder name (if not present in env). This would reduce friction on adopting MLServer, the V2 protocol and MMS.
</issue>
<code>
[start of mlserver/repository.py]
1 import os
2 import glob
3
4 from typing import List
5
6 from .settings import ModelParameters, ModelSettings
7 from .errors import ModelNotFound
8
9 DEFAULT_MODEL_SETTINGS_FILENAME = "model-settings.json"
10
11
12 class ModelRepository:
13 """
14 Model repository, responsible of the discovery of models which can be
15 loaded onto the model registry.
16 """
17
18 def __init__(self, root: str = None):
19 self._root = root
20
21 async def list(self) -> List[ModelSettings]:
22 all_model_settings = []
23
24 # TODO: Use an async alternative for filesys ops
25 if self._root:
26 pattern = os.path.join(self._root, "**", DEFAULT_MODEL_SETTINGS_FILENAME)
27 matches = glob.glob(pattern, recursive=True)
28
29 for model_settings_path in matches:
30 model_settings = self._load_model_settings(model_settings_path)
31 all_model_settings.append(model_settings)
32
33 # If there were no matches, try to load model from environment
34 if not all_model_settings:
35 # return default
36 model_settings = ModelSettings()
37 model_settings.parameters = ModelParameters()
38 all_model_settings.append(model_settings)
39
40 return all_model_settings
41
42 def _load_model_settings(self, model_settings_path: str) -> ModelSettings:
43 model_settings = ModelSettings.parse_file(model_settings_path)
44
45 if not model_settings.parameters:
46 model_settings.parameters = ModelParameters()
47
48 if not model_settings.parameters.uri:
49 # If not specified, default to its own folder
50 default_model_uri = os.path.dirname(model_settings_path)
51 model_settings.parameters.uri = default_model_uri
52
53 return model_settings
54
55 async def find(self, name: str) -> ModelSettings:
56 all_settings = await self.list()
57 for model_settings in all_settings:
58 if model_settings.name == name:
59 # TODO: Implement version policy
60 return model_settings
61
62 raise ModelNotFound(name)
63
[end of mlserver/repository.py]
[start of mlserver/settings.py]
1 from typing import List, Optional
2 from pydantic import BaseSettings, PyObject
3
4 from .version import __version__
5 from .types import MetadataTensor
6
7 ENV_PREFIX_SETTINGS = "MLSERVER_"
8 ENV_PREFIX_MODEL_SETTINGS = "MLSERVER_MODEL_"
9
10
11 class Settings(BaseSettings):
12 class Config:
13 env_prefix = ENV_PREFIX_SETTINGS
14
15 debug: bool = True
16
17 # Model repository folder
18 model_repository_root: str = "."
19 load_models_at_startup: bool = True
20
21 # Server metadata
22 server_name: str = "mlserver"
23 server_version: str = __version__
24 extensions: List[str] = []
25
26 # Server settings
27 host: str = "0.0.0.0"
28 http_port: int = 8080
29 grpc_port: int = 8081
30 grpc_workers: int = 10
31
32
33 class ModelParameters(BaseSettings):
34 """
35 Parameters that apply only to a particular instance of a model.
36 This can include things like model weights.
37 The main difference with respect to ModelSettings is that parameters can
38 change on each instance (e.g. each version) of the model.
39 """
40
41 class Config:
42 env_prefix = ENV_PREFIX_MODEL_SETTINGS
43
44 uri: Optional[str] = None
45 version: Optional[str] = None
46 format: Optional[str] = None
47
48
49 class ModelSettings(BaseSettings):
50 class Config:
51 env_prefix = ENV_PREFIX_MODEL_SETTINGS
52
53 name: str
54
55 # Model metadata
56 platform: str = ""
57 versions: Optional[List[str]] = []
58 inputs: Optional[List[MetadataTensor]] = []
59 outputs: Optional[List[MetadataTensor]] = []
60
61 # Custom model class implementation
62 implementation: PyObject = "mlserver.model.MLModel" # type: ignore
63
64 # Model parameters are meant to be set directly by the MLServer runtime.
65 # However, it's also possible to override them manually.
66 parameters: Optional[ModelParameters] = None
67
[end of mlserver/settings.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/mlserver/repository.py b/mlserver/repository.py
--- a/mlserver/repository.py
+++ b/mlserver/repository.py
@@ -42,6 +42,12 @@
def _load_model_settings(self, model_settings_path: str) -> ModelSettings:
model_settings = ModelSettings.parse_file(model_settings_path)
+ # TODO: Raise warning if name is different than folder's name
+ if not model_settings.name:
+ # If name not present, default to folder name
+ default_model_name = os.path.basename(os.path.dirname(model_settings_path))
+ model_settings.name = default_model_name
+
if not model_settings.parameters:
model_settings.parameters = ModelParameters()
diff --git a/mlserver/settings.py b/mlserver/settings.py
--- a/mlserver/settings.py
+++ b/mlserver/settings.py
@@ -50,7 +50,7 @@
class Config:
env_prefix = ENV_PREFIX_MODEL_SETTINGS
- name: str
+ name: str = ""
# Model metadata
platform: str = ""
|
{"golden_diff": "diff --git a/mlserver/repository.py b/mlserver/repository.py\n--- a/mlserver/repository.py\n+++ b/mlserver/repository.py\n@@ -42,6 +42,12 @@\n def _load_model_settings(self, model_settings_path: str) -> ModelSettings:\n model_settings = ModelSettings.parse_file(model_settings_path)\n \n+ # TODO: Raise warning if name is different than folder's name\n+ if not model_settings.name:\n+ # If name not present, default to folder name\n+ default_model_name = os.path.basename(os.path.dirname(model_settings_path))\n+ model_settings.name = default_model_name\n+\n if not model_settings.parameters:\n model_settings.parameters = ModelParameters()\n \ndiff --git a/mlserver/settings.py b/mlserver/settings.py\n--- a/mlserver/settings.py\n+++ b/mlserver/settings.py\n@@ -50,7 +50,7 @@\n class Config:\n env_prefix = ENV_PREFIX_MODEL_SETTINGS\n \n- name: str\n+ name: str = \"\"\n \n # Model metadata\n platform: str = \"\"\n", "issue": "Infer model's name from folder's name\nCurrently, particularly in the case of MMS, MLServer requires models to specify their name in a `model-settings.json` file. This forces all models to ship that file alongside their model artifacts.\r\n\r\nIt would be good to, instead, infer the model's name from the folder name (if not present in env). This would reduce friction on adopting MLServer, the V2 protocol and MMS.\n", "before_files": [{"content": "import os\nimport glob\n\nfrom typing import List\n\nfrom .settings import ModelParameters, ModelSettings\nfrom .errors import ModelNotFound\n\nDEFAULT_MODEL_SETTINGS_FILENAME = \"model-settings.json\"\n\n\nclass ModelRepository:\n \"\"\"\n Model repository, responsible of the discovery of models which can be\n loaded onto the model registry.\n \"\"\"\n\n def __init__(self, root: str = None):\n self._root = root\n\n async def list(self) -> List[ModelSettings]:\n all_model_settings = []\n\n # TODO: Use an async alternative for filesys ops\n if self._root:\n pattern = os.path.join(self._root, \"**\", DEFAULT_MODEL_SETTINGS_FILENAME)\n matches = glob.glob(pattern, recursive=True)\n\n for model_settings_path in matches:\n model_settings = self._load_model_settings(model_settings_path)\n all_model_settings.append(model_settings)\n\n # If there were no matches, try to load model from environment\n if not all_model_settings:\n # return default\n model_settings = ModelSettings()\n model_settings.parameters = ModelParameters()\n all_model_settings.append(model_settings)\n\n return all_model_settings\n\n def _load_model_settings(self, model_settings_path: str) -> ModelSettings:\n model_settings = ModelSettings.parse_file(model_settings_path)\n\n if not model_settings.parameters:\n model_settings.parameters = ModelParameters()\n\n if not model_settings.parameters.uri:\n # If not specified, default to its own folder\n default_model_uri = os.path.dirname(model_settings_path)\n model_settings.parameters.uri = default_model_uri\n\n return model_settings\n\n async def find(self, name: str) -> ModelSettings:\n all_settings = await self.list()\n for model_settings in all_settings:\n if model_settings.name == name:\n # TODO: Implement version policy\n return model_settings\n\n raise ModelNotFound(name)\n", "path": "mlserver/repository.py"}, {"content": "from typing import List, Optional\nfrom pydantic import BaseSettings, PyObject\n\nfrom .version import __version__\nfrom .types import MetadataTensor\n\nENV_PREFIX_SETTINGS = \"MLSERVER_\"\nENV_PREFIX_MODEL_SETTINGS = \"MLSERVER_MODEL_\"\n\n\nclass Settings(BaseSettings):\n class Config:\n env_prefix = ENV_PREFIX_SETTINGS\n\n debug: bool = True\n\n # Model repository folder\n model_repository_root: str = \".\"\n load_models_at_startup: bool = True\n\n # Server metadata\n server_name: str = \"mlserver\"\n server_version: str = __version__\n extensions: List[str] = []\n\n # Server settings\n host: str = \"0.0.0.0\"\n http_port: int = 8080\n grpc_port: int = 8081\n grpc_workers: int = 10\n\n\nclass ModelParameters(BaseSettings):\n \"\"\"\n Parameters that apply only to a particular instance of a model.\n This can include things like model weights.\n The main difference with respect to ModelSettings is that parameters can\n change on each instance (e.g. each version) of the model.\n \"\"\"\n\n class Config:\n env_prefix = ENV_PREFIX_MODEL_SETTINGS\n\n uri: Optional[str] = None\n version: Optional[str] = None\n format: Optional[str] = None\n\n\nclass ModelSettings(BaseSettings):\n class Config:\n env_prefix = ENV_PREFIX_MODEL_SETTINGS\n\n name: str\n\n # Model metadata\n platform: str = \"\"\n versions: Optional[List[str]] = []\n inputs: Optional[List[MetadataTensor]] = []\n outputs: Optional[List[MetadataTensor]] = []\n\n # Custom model class implementation\n implementation: PyObject = \"mlserver.model.MLModel\" # type: ignore\n\n # Model parameters are meant to be set directly by the MLServer runtime.\n # However, it's also possible to override them manually.\n parameters: Optional[ModelParameters] = None\n", "path": "mlserver/settings.py"}]}
| 1,720 | 230 |
gh_patches_debug_1819
|
rasdani/github-patches
|
git_diff
|
mkdocs__mkdocs-1998
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Fix simple typo: seperate -> separate
# Issue Type
[x] Bug (Typo)
# Steps to Replicate
1. Examine mkdocs/commands/serve.py.
2. Search for `seperate`.
# Expected Behaviour
1. Should read `separate`.
</issue>
<code>
[start of mkdocs/commands/serve.py]
1 import logging
2 import shutil
3 import tempfile
4 import sys
5
6 from os.path import isfile, join
7 from mkdocs.commands.build import build
8 from mkdocs.config import load_config
9
10 log = logging.getLogger(__name__)
11
12
13 def _init_asyncio_patch():
14 """
15 Select compatible event loop for Tornado 5+.
16
17 As of Python 3.8, the default event loop on Windows is `proactor`,
18 however Tornado requires the old default "selector" event loop.
19 As Tornado has decided to leave this to users to set, MkDocs needs
20 to set it. See https://github.com/tornadoweb/tornado/issues/2608.
21 """
22 if sys.platform.startswith("win") and sys.version_info >= (3, 8):
23 import asyncio
24 try:
25 from asyncio import WindowsSelectorEventLoopPolicy
26 except ImportError:
27 pass # Can't assign a policy which doesn't exist.
28 else:
29 if not isinstance(asyncio.get_event_loop_policy(), WindowsSelectorEventLoopPolicy):
30 asyncio.set_event_loop_policy(WindowsSelectorEventLoopPolicy())
31
32
33 def _get_handler(site_dir, StaticFileHandler):
34
35 from tornado.template import Loader
36
37 class WebHandler(StaticFileHandler):
38
39 def write_error(self, status_code, **kwargs):
40
41 if status_code in (404, 500):
42 error_page = '{}.html'.format(status_code)
43 if isfile(join(site_dir, error_page)):
44 self.write(Loader(site_dir).load(error_page).generate())
45 else:
46 super().write_error(status_code, **kwargs)
47
48 return WebHandler
49
50
51 def _livereload(host, port, config, builder, site_dir):
52
53 # We are importing here for anyone that has issues with livereload. Even if
54 # this fails, the --no-livereload alternative should still work.
55 _init_asyncio_patch()
56 from livereload import Server
57 import livereload.handlers
58
59 class LiveReloadServer(Server):
60
61 def get_web_handlers(self, script):
62 handlers = super().get_web_handlers(script)
63 # replace livereload handler
64 return [(handlers[0][0], _get_handler(site_dir, livereload.handlers.StaticFileHandler), handlers[0][2],)]
65
66 server = LiveReloadServer()
67
68 # Watch the documentation files, the config file and the theme files.
69 server.watch(config['docs_dir'], builder)
70 server.watch(config['config_file_path'], builder)
71
72 for d in config['theme'].dirs:
73 server.watch(d, builder)
74
75 # Run `serve` plugin events.
76 server = config['plugins'].run_event('serve', server, config=config)
77
78 server.serve(root=site_dir, host=host, port=port, restart_delay=0)
79
80
81 def _static_server(host, port, site_dir):
82
83 # Importing here to seperate the code paths from the --livereload
84 # alternative.
85 _init_asyncio_patch()
86 from tornado import ioloop
87 from tornado import web
88
89 application = web.Application([
90 (r"/(.*)", _get_handler(site_dir, web.StaticFileHandler), {
91 "path": site_dir,
92 "default_filename": "index.html"
93 }),
94 ])
95 application.listen(port=port, address=host)
96
97 log.info('Running at: http://%s:%s/', host, port)
98 log.info('Hold ctrl+c to quit.')
99 try:
100 ioloop.IOLoop.instance().start()
101 except KeyboardInterrupt:
102 log.info('Stopping server...')
103
104
105 def serve(config_file=None, dev_addr=None, strict=None, theme=None,
106 theme_dir=None, livereload='livereload', **kwargs):
107 """
108 Start the MkDocs development server
109
110 By default it will serve the documentation on http://localhost:8000/ and
111 it will rebuild the documentation and refresh the page automatically
112 whenever a file is edited.
113 """
114
115 # Create a temporary build directory, and set some options to serve it
116 # PY2 returns a byte string by default. The Unicode prefix ensures a Unicode
117 # string is returned. And it makes MkDocs temp dirs easier to identify.
118 site_dir = tempfile.mkdtemp(prefix='mkdocs_')
119
120 def builder():
121 log.info("Building documentation...")
122 config = load_config(
123 config_file=config_file,
124 dev_addr=dev_addr,
125 strict=strict,
126 theme=theme,
127 theme_dir=theme_dir,
128 site_dir=site_dir,
129 **kwargs
130 )
131 # Override a few config settings after validation
132 config['site_url'] = 'http://{}/'.format(config['dev_addr'])
133
134 live_server = livereload in ['dirty', 'livereload']
135 dirty = livereload == 'dirty'
136 build(config, live_server=live_server, dirty=dirty)
137 return config
138
139 try:
140 # Perform the initial build
141 config = builder()
142
143 host, port = config['dev_addr']
144
145 if livereload in ['livereload', 'dirty']:
146 _livereload(host, port, config, builder, site_dir)
147 else:
148 _static_server(host, port, site_dir)
149 finally:
150 shutil.rmtree(site_dir)
151
[end of mkdocs/commands/serve.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/mkdocs/commands/serve.py b/mkdocs/commands/serve.py
--- a/mkdocs/commands/serve.py
+++ b/mkdocs/commands/serve.py
@@ -80,7 +80,7 @@
def _static_server(host, port, site_dir):
- # Importing here to seperate the code paths from the --livereload
+ # Importing here to separate the code paths from the --livereload
# alternative.
_init_asyncio_patch()
from tornado import ioloop
|
{"golden_diff": "diff --git a/mkdocs/commands/serve.py b/mkdocs/commands/serve.py\n--- a/mkdocs/commands/serve.py\n+++ b/mkdocs/commands/serve.py\n@@ -80,7 +80,7 @@\n \n def _static_server(host, port, site_dir):\n \n- # Importing here to seperate the code paths from the --livereload\n+ # Importing here to separate the code paths from the --livereload\n # alternative.\n _init_asyncio_patch()\n from tornado import ioloop\n", "issue": "Fix simple typo: seperate -> separate\n# Issue Type\n\n[x] Bug (Typo)\n\n# Steps to Replicate\n\n1. Examine mkdocs/commands/serve.py.\n2. Search for `seperate`.\n\n# Expected Behaviour\n\n1. Should read `separate`.\n\n\n", "before_files": [{"content": "import logging\nimport shutil\nimport tempfile\nimport sys\n\nfrom os.path import isfile, join\nfrom mkdocs.commands.build import build\nfrom mkdocs.config import load_config\n\nlog = logging.getLogger(__name__)\n\n\ndef _init_asyncio_patch():\n \"\"\"\n Select compatible event loop for Tornado 5+.\n\n As of Python 3.8, the default event loop on Windows is `proactor`,\n however Tornado requires the old default \"selector\" event loop.\n As Tornado has decided to leave this to users to set, MkDocs needs\n to set it. See https://github.com/tornadoweb/tornado/issues/2608.\n \"\"\"\n if sys.platform.startswith(\"win\") and sys.version_info >= (3, 8):\n import asyncio\n try:\n from asyncio import WindowsSelectorEventLoopPolicy\n except ImportError:\n pass # Can't assign a policy which doesn't exist.\n else:\n if not isinstance(asyncio.get_event_loop_policy(), WindowsSelectorEventLoopPolicy):\n asyncio.set_event_loop_policy(WindowsSelectorEventLoopPolicy())\n\n\ndef _get_handler(site_dir, StaticFileHandler):\n\n from tornado.template import Loader\n\n class WebHandler(StaticFileHandler):\n\n def write_error(self, status_code, **kwargs):\n\n if status_code in (404, 500):\n error_page = '{}.html'.format(status_code)\n if isfile(join(site_dir, error_page)):\n self.write(Loader(site_dir).load(error_page).generate())\n else:\n super().write_error(status_code, **kwargs)\n\n return WebHandler\n\n\ndef _livereload(host, port, config, builder, site_dir):\n\n # We are importing here for anyone that has issues with livereload. Even if\n # this fails, the --no-livereload alternative should still work.\n _init_asyncio_patch()\n from livereload import Server\n import livereload.handlers\n\n class LiveReloadServer(Server):\n\n def get_web_handlers(self, script):\n handlers = super().get_web_handlers(script)\n # replace livereload handler\n return [(handlers[0][0], _get_handler(site_dir, livereload.handlers.StaticFileHandler), handlers[0][2],)]\n\n server = LiveReloadServer()\n\n # Watch the documentation files, the config file and the theme files.\n server.watch(config['docs_dir'], builder)\n server.watch(config['config_file_path'], builder)\n\n for d in config['theme'].dirs:\n server.watch(d, builder)\n\n # Run `serve` plugin events.\n server = config['plugins'].run_event('serve', server, config=config)\n\n server.serve(root=site_dir, host=host, port=port, restart_delay=0)\n\n\ndef _static_server(host, port, site_dir):\n\n # Importing here to seperate the code paths from the --livereload\n # alternative.\n _init_asyncio_patch()\n from tornado import ioloop\n from tornado import web\n\n application = web.Application([\n (r\"/(.*)\", _get_handler(site_dir, web.StaticFileHandler), {\n \"path\": site_dir,\n \"default_filename\": \"index.html\"\n }),\n ])\n application.listen(port=port, address=host)\n\n log.info('Running at: http://%s:%s/', host, port)\n log.info('Hold ctrl+c to quit.')\n try:\n ioloop.IOLoop.instance().start()\n except KeyboardInterrupt:\n log.info('Stopping server...')\n\n\ndef serve(config_file=None, dev_addr=None, strict=None, theme=None,\n theme_dir=None, livereload='livereload', **kwargs):\n \"\"\"\n Start the MkDocs development server\n\n By default it will serve the documentation on http://localhost:8000/ and\n it will rebuild the documentation and refresh the page automatically\n whenever a file is edited.\n \"\"\"\n\n # Create a temporary build directory, and set some options to serve it\n # PY2 returns a byte string by default. The Unicode prefix ensures a Unicode\n # string is returned. And it makes MkDocs temp dirs easier to identify.\n site_dir = tempfile.mkdtemp(prefix='mkdocs_')\n\n def builder():\n log.info(\"Building documentation...\")\n config = load_config(\n config_file=config_file,\n dev_addr=dev_addr,\n strict=strict,\n theme=theme,\n theme_dir=theme_dir,\n site_dir=site_dir,\n **kwargs\n )\n # Override a few config settings after validation\n config['site_url'] = 'http://{}/'.format(config['dev_addr'])\n\n live_server = livereload in ['dirty', 'livereload']\n dirty = livereload == 'dirty'\n build(config, live_server=live_server, dirty=dirty)\n return config\n\n try:\n # Perform the initial build\n config = builder()\n\n host, port = config['dev_addr']\n\n if livereload in ['livereload', 'dirty']:\n _livereload(host, port, config, builder, site_dir)\n else:\n _static_server(host, port, site_dir)\n finally:\n shutil.rmtree(site_dir)\n", "path": "mkdocs/commands/serve.py"}]}
| 2,072 | 124 |
gh_patches_debug_33247
|
rasdani/github-patches
|
git_diff
|
comic__grand-challenge.org-2238
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Subscription count does not correspond with displayed subscriptions
**Problem**
We do not show all subscriptions to a user - only those that we allow them to unsubscribe from. Subscriptions that are not shown to the user include permission request follows and upload-session follows, as well as "inactive" algorithm job follows (a necessary work around to allow unsubscribing from failed job notifications). The paginator on the listview, however, counts all subscriptions of the user, which leads to empty pages and a discrepancy in the shown vs. indicated number of subscriptions.
**Solution**
We need to make sure that the paginator counts only the subscriptions that are actually shown to the user.
Simply showing all subscriptions sounds like a good alternative, but is not possible, because the inactive algorithm job follows should not be exposed to the user.
</issue>
<code>
[start of app/grandchallenge/notifications/views.py]
1 from actstream.models import Follow
2 from django.contrib import messages
3 from django.contrib.messages.views import SuccessMessageMixin
4 from django.views.generic import CreateView, DeleteView, ListView
5 from guardian.mixins import (
6 LoginRequiredMixin,
7 PermissionListMixin,
8 PermissionRequiredMixin as ObjectPermissionRequiredMixin,
9 )
10 from rest_framework import mixins, viewsets
11 from rest_framework.permissions import DjangoObjectPermissions
12 from rest_framework_guardian.filters import ObjectPermissionsFilter
13
14 from grandchallenge.core.filters import FilterMixin
15 from grandchallenge.notifications.filters import (
16 FollowFilter,
17 NotificationFilter,
18 )
19 from grandchallenge.notifications.forms import FollowForm
20 from grandchallenge.notifications.models import Notification
21 from grandchallenge.notifications.serializers import (
22 FollowSerializer,
23 NotificationSerializer,
24 )
25 from grandchallenge.notifications.utils import (
26 prefetch_generic_foreign_key_objects,
27 )
28 from grandchallenge.subdomains.utils import reverse
29
30
31 class NotificationViewSet(
32 mixins.UpdateModelMixin,
33 mixins.DestroyModelMixin,
34 viewsets.ReadOnlyModelViewSet,
35 ):
36 queryset = Notification.objects.all()
37 serializer_class = NotificationSerializer
38 permission_classes = (DjangoObjectPermissions,)
39 filter_backends = [ObjectPermissionsFilter]
40
41 def destroy(self, request, *args, **kwargs):
42 response = super().destroy(request, *args, **kwargs)
43 messages.add_message(
44 request, messages.SUCCESS, "Notifications successfully deleted.",
45 )
46 return response
47
48 def update(self, request, *args, **kwargs):
49 response = super().update(request, *args, **kwargs)
50 messages.add_message(
51 request, messages.SUCCESS, "Notifications successfully updated.",
52 )
53 return response
54
55
56 class FollowViewSet(
57 mixins.DestroyModelMixin,
58 mixins.UpdateModelMixin,
59 viewsets.ReadOnlyModelViewSet,
60 ):
61 queryset = Follow.objects.all()
62 serializer_class = FollowSerializer
63 permission_classes = (DjangoObjectPermissions,)
64 filter_backends = [ObjectPermissionsFilter]
65
66 def destroy(self, request, *args, **kwargs):
67 response = super().destroy(request, *args, **kwargs)
68 messages.add_message(
69 request, messages.SUCCESS, "Subscription successfully deleted.",
70 )
71 return response
72
73 def perform_update(self, serializer):
74 messages.add_message(
75 self.request,
76 messages.SUCCESS,
77 "Subscription successfully updated.",
78 )
79 return serializer.save()
80
81
82 class NotificationList(
83 LoginRequiredMixin, FilterMixin, PermissionListMixin, ListView
84 ):
85 model = Notification
86 permission_required = "view_notification"
87 filter_class = NotificationFilter
88 paginate_by = 50
89
90 def get_queryset(self):
91 return (
92 super()
93 .get_queryset()
94 .select_related(
95 "actor_content_type",
96 "target_content_type",
97 "action_object_content_type",
98 "user__verification",
99 )
100 .order_by("-created")
101 )
102
103 def get_context_data(self, **kwargs):
104 context = super().get_context_data(**kwargs)
105
106 # Prefetch the object list here as at this point it has been paginated
107 # which saves prefetching the related objects for all notifications
108 context["object_list"] = prefetch_generic_foreign_key_objects(
109 context["object_list"]
110 )
111
112 return context
113
114
115 class FollowList(
116 LoginRequiredMixin, FilterMixin, PermissionListMixin, ListView
117 ):
118 model = Follow
119 permission_required = "view_follow"
120 filter_class = FollowFilter
121 paginate_by = 50
122
123 def get_queryset(self, *args, **kwargs):
124 return (
125 super()
126 .get_queryset()
127 .select_related("user", "content_type")
128 .order_by("content_type")
129 )
130
131 def get_context_data(self, **kwargs):
132 context = super().get_context_data(**kwargs)
133
134 # Prefetch the object list here as at this point it has been paginated
135 # which saves prefetching the related objects for all notifications
136 context["object_list"] = prefetch_generic_foreign_key_objects(
137 context["object_list"]
138 )
139 return context
140
141
142 class FollowDelete(
143 LoginRequiredMixin,
144 ObjectPermissionRequiredMixin,
145 SuccessMessageMixin,
146 DeleteView,
147 ):
148 model = Follow
149 success_message = "Subscription successfully deleted"
150 permission_required = "delete_follow"
151 raise_exception = True
152
153 def get_permission_object(self):
154 return self.get_object()
155
156 def get_success_url(self):
157 return reverse("notifications:follow-list")
158
159
160 class FollowCreate(
161 LoginRequiredMixin, SuccessMessageMixin, CreateView,
162 ):
163 model = Follow
164 form_class = FollowForm
165 success_message = "Subscription successfully added"
166
167 def get_form_kwargs(self):
168 kwargs = super().get_form_kwargs()
169 kwargs.update({"user": self.request.user})
170 return kwargs
171
172 def get_success_url(self):
173 return reverse("notifications:follow-list")
174
[end of app/grandchallenge/notifications/views.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/app/grandchallenge/notifications/views.py b/app/grandchallenge/notifications/views.py
--- a/app/grandchallenge/notifications/views.py
+++ b/app/grandchallenge/notifications/views.py
@@ -1,6 +1,7 @@
from actstream.models import Follow
from django.contrib import messages
from django.contrib.messages.views import SuccessMessageMixin
+from django.db.models import Q
from django.views.generic import CreateView, DeleteView, ListView
from guardian.mixins import (
LoginRequiredMixin,
@@ -119,14 +120,33 @@
permission_required = "view_follow"
filter_class = FollowFilter
paginate_by = 50
-
- def get_queryset(self, *args, **kwargs):
- return (
- super()
- .get_queryset()
- .select_related("user", "content_type")
- .order_by("content_type")
+ queryset = (
+ Follow.objects.exclude(
+ Q(
+ content_type__app_label="archives",
+ content_type__model="archivepermissionrequest",
+ )
+ | Q(
+ content_type__app_label="algorithms",
+ content_type__model="algorithmpermissionrequest",
+ )
+ | Q(
+ content_type__app_label="reader_studies",
+ content_type__model="readerstudypermissionrequest",
+ )
+ | Q(
+ content_type__app_label="participants",
+ content_type__model="registrationrequest",
+ )
+ | Q(
+ content_type__app_label="cases",
+ content_type__model="rawimageuploadsessions",
+ )
)
+ .exclude(flag="job-inactive")
+ .select_related("user", "content_type")
+ .order_by("content_type")
+ )
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
@@ -136,6 +156,7 @@
context["object_list"] = prefetch_generic_foreign_key_objects(
context["object_list"]
)
+
return context
|
{"golden_diff": "diff --git a/app/grandchallenge/notifications/views.py b/app/grandchallenge/notifications/views.py\n--- a/app/grandchallenge/notifications/views.py\n+++ b/app/grandchallenge/notifications/views.py\n@@ -1,6 +1,7 @@\n from actstream.models import Follow\n from django.contrib import messages\n from django.contrib.messages.views import SuccessMessageMixin\n+from django.db.models import Q\n from django.views.generic import CreateView, DeleteView, ListView\n from guardian.mixins import (\n LoginRequiredMixin,\n@@ -119,14 +120,33 @@\n permission_required = \"view_follow\"\n filter_class = FollowFilter\n paginate_by = 50\n-\n- def get_queryset(self, *args, **kwargs):\n- return (\n- super()\n- .get_queryset()\n- .select_related(\"user\", \"content_type\")\n- .order_by(\"content_type\")\n+ queryset = (\n+ Follow.objects.exclude(\n+ Q(\n+ content_type__app_label=\"archives\",\n+ content_type__model=\"archivepermissionrequest\",\n+ )\n+ | Q(\n+ content_type__app_label=\"algorithms\",\n+ content_type__model=\"algorithmpermissionrequest\",\n+ )\n+ | Q(\n+ content_type__app_label=\"reader_studies\",\n+ content_type__model=\"readerstudypermissionrequest\",\n+ )\n+ | Q(\n+ content_type__app_label=\"participants\",\n+ content_type__model=\"registrationrequest\",\n+ )\n+ | Q(\n+ content_type__app_label=\"cases\",\n+ content_type__model=\"rawimageuploadsessions\",\n+ )\n )\n+ .exclude(flag=\"job-inactive\")\n+ .select_related(\"user\", \"content_type\")\n+ .order_by(\"content_type\")\n+ )\n \n def get_context_data(self, **kwargs):\n context = super().get_context_data(**kwargs)\n@@ -136,6 +156,7 @@\n context[\"object_list\"] = prefetch_generic_foreign_key_objects(\n context[\"object_list\"]\n )\n+\n return context\n", "issue": "Subscription count does not correspond with displayed subscriptions\n**Problem**\r\nWe do not show all subscriptions to a user - only those that we allow them to unsubscribe from. Subscriptions that are not shown to the user include permission request follows and upload-session follows, as well as \"inactive\" algorithm job follows (a necessary work around to allow unsubscribing from failed job notifications). The paginator on the listview, however, counts all subscriptions of the user, which leads to empty pages and a discrepancy in the shown vs. indicated number of subscriptions. \r\n\r\n**Solution**\r\nWe need to make sure that the paginator counts only the subscriptions that are actually shown to the user. \r\nSimply showing all subscriptions sounds like a good alternative, but is not possible, because the inactive algorithm job follows should not be exposed to the user. \n", "before_files": [{"content": "from actstream.models import Follow\nfrom django.contrib import messages\nfrom django.contrib.messages.views import SuccessMessageMixin\nfrom django.views.generic import CreateView, DeleteView, ListView\nfrom guardian.mixins import (\n LoginRequiredMixin,\n PermissionListMixin,\n PermissionRequiredMixin as ObjectPermissionRequiredMixin,\n)\nfrom rest_framework import mixins, viewsets\nfrom rest_framework.permissions import DjangoObjectPermissions\nfrom rest_framework_guardian.filters import ObjectPermissionsFilter\n\nfrom grandchallenge.core.filters import FilterMixin\nfrom grandchallenge.notifications.filters import (\n FollowFilter,\n NotificationFilter,\n)\nfrom grandchallenge.notifications.forms import FollowForm\nfrom grandchallenge.notifications.models import Notification\nfrom grandchallenge.notifications.serializers import (\n FollowSerializer,\n NotificationSerializer,\n)\nfrom grandchallenge.notifications.utils import (\n prefetch_generic_foreign_key_objects,\n)\nfrom grandchallenge.subdomains.utils import reverse\n\n\nclass NotificationViewSet(\n mixins.UpdateModelMixin,\n mixins.DestroyModelMixin,\n viewsets.ReadOnlyModelViewSet,\n):\n queryset = Notification.objects.all()\n serializer_class = NotificationSerializer\n permission_classes = (DjangoObjectPermissions,)\n filter_backends = [ObjectPermissionsFilter]\n\n def destroy(self, request, *args, **kwargs):\n response = super().destroy(request, *args, **kwargs)\n messages.add_message(\n request, messages.SUCCESS, \"Notifications successfully deleted.\",\n )\n return response\n\n def update(self, request, *args, **kwargs):\n response = super().update(request, *args, **kwargs)\n messages.add_message(\n request, messages.SUCCESS, \"Notifications successfully updated.\",\n )\n return response\n\n\nclass FollowViewSet(\n mixins.DestroyModelMixin,\n mixins.UpdateModelMixin,\n viewsets.ReadOnlyModelViewSet,\n):\n queryset = Follow.objects.all()\n serializer_class = FollowSerializer\n permission_classes = (DjangoObjectPermissions,)\n filter_backends = [ObjectPermissionsFilter]\n\n def destroy(self, request, *args, **kwargs):\n response = super().destroy(request, *args, **kwargs)\n messages.add_message(\n request, messages.SUCCESS, \"Subscription successfully deleted.\",\n )\n return response\n\n def perform_update(self, serializer):\n messages.add_message(\n self.request,\n messages.SUCCESS,\n \"Subscription successfully updated.\",\n )\n return serializer.save()\n\n\nclass NotificationList(\n LoginRequiredMixin, FilterMixin, PermissionListMixin, ListView\n):\n model = Notification\n permission_required = \"view_notification\"\n filter_class = NotificationFilter\n paginate_by = 50\n\n def get_queryset(self):\n return (\n super()\n .get_queryset()\n .select_related(\n \"actor_content_type\",\n \"target_content_type\",\n \"action_object_content_type\",\n \"user__verification\",\n )\n .order_by(\"-created\")\n )\n\n def get_context_data(self, **kwargs):\n context = super().get_context_data(**kwargs)\n\n # Prefetch the object list here as at this point it has been paginated\n # which saves prefetching the related objects for all notifications\n context[\"object_list\"] = prefetch_generic_foreign_key_objects(\n context[\"object_list\"]\n )\n\n return context\n\n\nclass FollowList(\n LoginRequiredMixin, FilterMixin, PermissionListMixin, ListView\n):\n model = Follow\n permission_required = \"view_follow\"\n filter_class = FollowFilter\n paginate_by = 50\n\n def get_queryset(self, *args, **kwargs):\n return (\n super()\n .get_queryset()\n .select_related(\"user\", \"content_type\")\n .order_by(\"content_type\")\n )\n\n def get_context_data(self, **kwargs):\n context = super().get_context_data(**kwargs)\n\n # Prefetch the object list here as at this point it has been paginated\n # which saves prefetching the related objects for all notifications\n context[\"object_list\"] = prefetch_generic_foreign_key_objects(\n context[\"object_list\"]\n )\n return context\n\n\nclass FollowDelete(\n LoginRequiredMixin,\n ObjectPermissionRequiredMixin,\n SuccessMessageMixin,\n DeleteView,\n):\n model = Follow\n success_message = \"Subscription successfully deleted\"\n permission_required = \"delete_follow\"\n raise_exception = True\n\n def get_permission_object(self):\n return self.get_object()\n\n def get_success_url(self):\n return reverse(\"notifications:follow-list\")\n\n\nclass FollowCreate(\n LoginRequiredMixin, SuccessMessageMixin, CreateView,\n):\n model = Follow\n form_class = FollowForm\n success_message = \"Subscription successfully added\"\n\n def get_form_kwargs(self):\n kwargs = super().get_form_kwargs()\n kwargs.update({\"user\": self.request.user})\n return kwargs\n\n def get_success_url(self):\n return reverse(\"notifications:follow-list\")\n", "path": "app/grandchallenge/notifications/views.py"}]}
| 2,126 | 453 |
gh_patches_debug_3290
|
rasdani/github-patches
|
git_diff
|
ansible__ansible-modules-extras-1729
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
lvg: undocumented support of physical volume creation
##### Issue Type:
Documentation Report
##### Plugin Name:
lvg
##### Ansible Version:
```
# ansible --version
ansible 1.9.4
configured module search path = None
```
##### Summary:
lvg module seems to take care of physical volume creation, on top of volume group creation. However, it doesn't appear to be documented.
I noticed I could just use
```
- name: Create LVM volume group
lvg:
pvs: /dev/vdc
state: present
vg: direct-lvm
```
instead of:
```
- name: Create LVM physical volume
command: pvcreate -y /dev/vdc
- name: Create LVM volume group
lvg:
pvs: /dev/vdc
state: present
vg: direct-lvm
```
which isn't idempotent since executing pvcreate a second time will fail.
</issue>
<code>
[start of system/lvg.py]
1 #!/usr/bin/python
2 # -*- coding: utf-8 -*-
3
4 # (c) 2013, Alexander Bulimov <[email protected]>
5 # based on lvol module by Jeroen Hoekx <[email protected]>
6 #
7 # This file is part of Ansible
8 #
9 # Ansible is free software: you can redistribute it and/or modify
10 # it under the terms of the GNU General Public License as published by
11 # the Free Software Foundation, either version 3 of the License, or
12 # (at your option) any later version.
13 #
14 # Ansible is distributed in the hope that it will be useful,
15 # but WITHOUT ANY WARRANTY; without even the implied warranty of
16 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 # GNU General Public License for more details.
18 #
19 # You should have received a copy of the GNU General Public License
20 # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
21
22 DOCUMENTATION = '''
23 ---
24 author: "Alexander Bulimov (@abulimov)"
25 module: lvg
26 short_description: Configure LVM volume groups
27 description:
28 - This module creates, removes or resizes volume groups.
29 version_added: "1.1"
30 options:
31 vg:
32 description:
33 - The name of the volume group.
34 required: true
35 pvs:
36 description:
37 - List of comma-separated devices to use as physical devices in this volume group. Required when creating or resizing volume group.
38 required: false
39 pesize:
40 description:
41 - The size of the physical extent in megabytes. Must be a power of 2.
42 default: 4
43 required: false
44 vg_options:
45 description:
46 - Additional options to pass to C(vgcreate) when creating the volume group.
47 default: null
48 required: false
49 version_added: "1.6"
50 state:
51 choices: [ "present", "absent" ]
52 default: present
53 description:
54 - Control if the volume group exists.
55 required: false
56 force:
57 choices: [ "yes", "no" ]
58 default: "no"
59 description:
60 - If yes, allows to remove volume group with logical volumes.
61 required: false
62 notes:
63 - module does not modify PE size for already present volume group
64 '''
65
66 EXAMPLES = '''
67 # Create a volume group on top of /dev/sda1 with physical extent size = 32MB.
68 - lvg: vg=vg.services pvs=/dev/sda1 pesize=32
69
70 # Create or resize a volume group on top of /dev/sdb1 and /dev/sdc5.
71 # If, for example, we already have VG vg.services on top of /dev/sdb1,
72 # this VG will be extended by /dev/sdc5. Or if vg.services was created on
73 # top of /dev/sda5, we first extend it with /dev/sdb1 and /dev/sdc5,
74 # and then reduce by /dev/sda5.
75 - lvg: vg=vg.services pvs=/dev/sdb1,/dev/sdc5
76
77 # Remove a volume group with name vg.services.
78 - lvg: vg=vg.services state=absent
79 '''
80
81 def parse_vgs(data):
82 vgs = []
83 for line in data.splitlines():
84 parts = line.strip().split(';')
85 vgs.append({
86 'name': parts[0],
87 'pv_count': int(parts[1]),
88 'lv_count': int(parts[2]),
89 })
90 return vgs
91
92 def find_mapper_device_name(module, dm_device):
93 dmsetup_cmd = module.get_bin_path('dmsetup', True)
94 mapper_prefix = '/dev/mapper/'
95 rc, dm_name, err = module.run_command("%s info -C --noheadings -o name %s" % (dmsetup_cmd, dm_device))
96 if rc != 0:
97 module.fail_json(msg="Failed executing dmsetup command.", rc=rc, err=err)
98 mapper_device = mapper_prefix + dm_name.rstrip()
99 return mapper_device
100
101 def parse_pvs(module, data):
102 pvs = []
103 dm_prefix = '/dev/dm-'
104 for line in data.splitlines():
105 parts = line.strip().split(';')
106 if parts[0].startswith(dm_prefix):
107 parts[0] = find_mapper_device_name(module, parts[0])
108 pvs.append({
109 'name': parts[0],
110 'vg_name': parts[1],
111 })
112 return pvs
113
114 def main():
115 module = AnsibleModule(
116 argument_spec = dict(
117 vg=dict(required=True),
118 pvs=dict(type='list'),
119 pesize=dict(type='int', default=4),
120 vg_options=dict(default=''),
121 state=dict(choices=["absent", "present"], default='present'),
122 force=dict(type='bool', default='no'),
123 ),
124 supports_check_mode=True,
125 )
126
127 vg = module.params['vg']
128 state = module.params['state']
129 force = module.boolean(module.params['force'])
130 pesize = module.params['pesize']
131 vgoptions = module.params['vg_options'].split()
132
133 if module.params['pvs']:
134 dev_list = module.params['pvs']
135 elif state == 'present':
136 module.fail_json(msg="No physical volumes given.")
137
138 # LVM always uses real paths not symlinks so replace symlinks with actual path
139 for idx, dev in enumerate(dev_list):
140 dev_list[idx] = os.path.realpath(dev)
141
142 if state=='present':
143 ### check given devices
144 for test_dev in dev_list:
145 if not os.path.exists(test_dev):
146 module.fail_json(msg="Device %s not found."%test_dev)
147
148 ### get pv list
149 pvs_cmd = module.get_bin_path('pvs', True)
150 rc,current_pvs,err = module.run_command("%s --noheadings -o pv_name,vg_name --separator ';'" % pvs_cmd)
151 if rc != 0:
152 module.fail_json(msg="Failed executing pvs command.",rc=rc, err=err)
153
154 ### check pv for devices
155 pvs = parse_pvs(module, current_pvs)
156 used_pvs = [ pv for pv in pvs if pv['name'] in dev_list and pv['vg_name'] and pv['vg_name'] != vg ]
157 if used_pvs:
158 module.fail_json(msg="Device %s is already in %s volume group."%(used_pvs[0]['name'],used_pvs[0]['vg_name']))
159
160 vgs_cmd = module.get_bin_path('vgs', True)
161 rc,current_vgs,err = module.run_command("%s --noheadings -o vg_name,pv_count,lv_count --separator ';'" % vgs_cmd)
162
163 if rc != 0:
164 module.fail_json(msg="Failed executing vgs command.",rc=rc, err=err)
165
166 changed = False
167
168 vgs = parse_vgs(current_vgs)
169
170 for test_vg in vgs:
171 if test_vg['name'] == vg:
172 this_vg = test_vg
173 break
174 else:
175 this_vg = None
176
177 if this_vg is None:
178 if state == 'present':
179 ### create VG
180 if module.check_mode:
181 changed = True
182 else:
183 ### create PV
184 pvcreate_cmd = module.get_bin_path('pvcreate', True)
185 for current_dev in dev_list:
186 rc,_,err = module.run_command("%s -f %s" % (pvcreate_cmd,current_dev))
187 if rc == 0:
188 changed = True
189 else:
190 module.fail_json(msg="Creating physical volume '%s' failed" % current_dev, rc=rc, err=err)
191 vgcreate_cmd = module.get_bin_path('vgcreate')
192 rc,_,err = module.run_command([vgcreate_cmd] + vgoptions + ['-s', str(pesize), vg] + dev_list)
193 if rc == 0:
194 changed = True
195 else:
196 module.fail_json(msg="Creating volume group '%s' failed"%vg, rc=rc, err=err)
197 else:
198 if state == 'absent':
199 if module.check_mode:
200 module.exit_json(changed=True)
201 else:
202 if this_vg['lv_count'] == 0 or force:
203 ### remove VG
204 vgremove_cmd = module.get_bin_path('vgremove', True)
205 rc,_,err = module.run_command("%s --force %s" % (vgremove_cmd, vg))
206 if rc == 0:
207 module.exit_json(changed=True)
208 else:
209 module.fail_json(msg="Failed to remove volume group %s"%(vg),rc=rc, err=err)
210 else:
211 module.fail_json(msg="Refuse to remove non-empty volume group %s without force=yes"%(vg))
212
213 ### resize VG
214 current_devs = [ os.path.realpath(pv['name']) for pv in pvs if pv['vg_name'] == vg ]
215 devs_to_remove = list(set(current_devs) - set(dev_list))
216 devs_to_add = list(set(dev_list) - set(current_devs))
217
218 if devs_to_add or devs_to_remove:
219 if module.check_mode:
220 changed = True
221 else:
222 if devs_to_add:
223 devs_to_add_string = ' '.join(devs_to_add)
224 ### create PV
225 pvcreate_cmd = module.get_bin_path('pvcreate', True)
226 for current_dev in devs_to_add:
227 rc,_,err = module.run_command("%s -f %s" % (pvcreate_cmd, current_dev))
228 if rc == 0:
229 changed = True
230 else:
231 module.fail_json(msg="Creating physical volume '%s' failed"%current_dev, rc=rc, err=err)
232 ### add PV to our VG
233 vgextend_cmd = module.get_bin_path('vgextend', True)
234 rc,_,err = module.run_command("%s %s %s" % (vgextend_cmd, vg, devs_to_add_string))
235 if rc == 0:
236 changed = True
237 else:
238 module.fail_json(msg="Unable to extend %s by %s."%(vg, devs_to_add_string),rc=rc,err=err)
239
240 ### remove some PV from our VG
241 if devs_to_remove:
242 devs_to_remove_string = ' '.join(devs_to_remove)
243 vgreduce_cmd = module.get_bin_path('vgreduce', True)
244 rc,_,err = module.run_command("%s --force %s %s" % (vgreduce_cmd, vg, devs_to_remove_string))
245 if rc == 0:
246 changed = True
247 else:
248 module.fail_json(msg="Unable to reduce %s by %s."%(vg, devs_to_remove_string),rc=rc,err=err)
249
250 module.exit_json(changed=changed)
251
252 # import module snippets
253 from ansible.module_utils.basic import *
254 main()
255
[end of system/lvg.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/system/lvg.py b/system/lvg.py
--- a/system/lvg.py
+++ b/system/lvg.py
@@ -35,6 +35,7 @@
pvs:
description:
- List of comma-separated devices to use as physical devices in this volume group. Required when creating or resizing volume group.
+ - The module will take care of running pvcreate if needed.
required: false
pesize:
description:
|
{"golden_diff": "diff --git a/system/lvg.py b/system/lvg.py\n--- a/system/lvg.py\n+++ b/system/lvg.py\n@@ -35,6 +35,7 @@\n pvs:\n description:\n - List of comma-separated devices to use as physical devices in this volume group. Required when creating or resizing volume group.\n+ - The module will take care of running pvcreate if needed. \n required: false\n pesize:\n description:\n", "issue": "lvg: undocumented support of physical volume creation\n##### Issue Type:\n\nDocumentation Report\n##### Plugin Name:\n\nlvg\n##### Ansible Version:\n\n```\n# ansible --version\nansible 1.9.4\n configured module search path = None\n```\n##### Summary:\n\nlvg module seems to take care of physical volume creation, on top of volume group creation. However, it doesn't appear to be documented.\n\nI noticed I could just use\n\n```\n- name: Create LVM volume group\n lvg:\n pvs: /dev/vdc\n state: present\n vg: direct-lvm\n```\n\ninstead of:\n\n```\n- name: Create LVM physical volume\n command: pvcreate -y /dev/vdc\n\n- name: Create LVM volume group\n lvg:\n pvs: /dev/vdc\n state: present\n vg: direct-lvm\n```\n\nwhich isn't idempotent since executing pvcreate a second time will fail.\n\n", "before_files": [{"content": "#!/usr/bin/python\n# -*- coding: utf-8 -*-\n\n# (c) 2013, Alexander Bulimov <[email protected]>\n# based on lvol module by Jeroen Hoekx <[email protected]>\n#\n# This file is part of Ansible\n#\n# Ansible is free software: you can redistribute it and/or modify\n# it under the terms of the GNU General Public License as published by\n# the Free Software Foundation, either version 3 of the License, or\n# (at your option) any later version.\n#\n# Ansible is distributed in the hope that it will be useful,\n# but WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n# GNU General Public License for more details.\n#\n# You should have received a copy of the GNU General Public License\n# along with Ansible. If not, see <http://www.gnu.org/licenses/>.\n\nDOCUMENTATION = '''\n---\nauthor: \"Alexander Bulimov (@abulimov)\"\nmodule: lvg\nshort_description: Configure LVM volume groups\ndescription:\n - This module creates, removes or resizes volume groups.\nversion_added: \"1.1\"\noptions:\n vg:\n description:\n - The name of the volume group.\n required: true\n pvs:\n description:\n - List of comma-separated devices to use as physical devices in this volume group. Required when creating or resizing volume group.\n required: false\n pesize:\n description:\n - The size of the physical extent in megabytes. Must be a power of 2.\n default: 4\n required: false\n vg_options:\n description:\n - Additional options to pass to C(vgcreate) when creating the volume group.\n default: null\n required: false\n version_added: \"1.6\"\n state:\n choices: [ \"present\", \"absent\" ]\n default: present\n description:\n - Control if the volume group exists.\n required: false\n force:\n choices: [ \"yes\", \"no\" ]\n default: \"no\"\n description:\n - If yes, allows to remove volume group with logical volumes.\n required: false\nnotes:\n - module does not modify PE size for already present volume group\n'''\n\nEXAMPLES = '''\n# Create a volume group on top of /dev/sda1 with physical extent size = 32MB.\n- lvg: vg=vg.services pvs=/dev/sda1 pesize=32\n\n# Create or resize a volume group on top of /dev/sdb1 and /dev/sdc5.\n# If, for example, we already have VG vg.services on top of /dev/sdb1,\n# this VG will be extended by /dev/sdc5. Or if vg.services was created on\n# top of /dev/sda5, we first extend it with /dev/sdb1 and /dev/sdc5,\n# and then reduce by /dev/sda5.\n- lvg: vg=vg.services pvs=/dev/sdb1,/dev/sdc5\n\n# Remove a volume group with name vg.services.\n- lvg: vg=vg.services state=absent\n'''\n\ndef parse_vgs(data):\n vgs = []\n for line in data.splitlines():\n parts = line.strip().split(';')\n vgs.append({\n 'name': parts[0],\n 'pv_count': int(parts[1]),\n 'lv_count': int(parts[2]),\n })\n return vgs\n\ndef find_mapper_device_name(module, dm_device):\n dmsetup_cmd = module.get_bin_path('dmsetup', True)\n mapper_prefix = '/dev/mapper/'\n rc, dm_name, err = module.run_command(\"%s info -C --noheadings -o name %s\" % (dmsetup_cmd, dm_device))\n if rc != 0:\n module.fail_json(msg=\"Failed executing dmsetup command.\", rc=rc, err=err)\n mapper_device = mapper_prefix + dm_name.rstrip()\n return mapper_device\n\ndef parse_pvs(module, data):\n pvs = []\n dm_prefix = '/dev/dm-'\n for line in data.splitlines():\n parts = line.strip().split(';')\n if parts[0].startswith(dm_prefix):\n parts[0] = find_mapper_device_name(module, parts[0])\n pvs.append({\n 'name': parts[0],\n 'vg_name': parts[1],\n })\n return pvs\n\ndef main():\n module = AnsibleModule(\n argument_spec = dict(\n vg=dict(required=True),\n pvs=dict(type='list'),\n pesize=dict(type='int', default=4),\n vg_options=dict(default=''),\n state=dict(choices=[\"absent\", \"present\"], default='present'),\n force=dict(type='bool', default='no'),\n ),\n supports_check_mode=True,\n )\n\n vg = module.params['vg']\n state = module.params['state']\n force = module.boolean(module.params['force'])\n pesize = module.params['pesize']\n vgoptions = module.params['vg_options'].split()\n\n if module.params['pvs']:\n dev_list = module.params['pvs']\n elif state == 'present':\n module.fail_json(msg=\"No physical volumes given.\")\n\n # LVM always uses real paths not symlinks so replace symlinks with actual path\n for idx, dev in enumerate(dev_list):\n dev_list[idx] = os.path.realpath(dev)\n\n if state=='present':\n ### check given devices\n for test_dev in dev_list:\n if not os.path.exists(test_dev):\n module.fail_json(msg=\"Device %s not found.\"%test_dev)\n\n ### get pv list\n pvs_cmd = module.get_bin_path('pvs', True)\n rc,current_pvs,err = module.run_command(\"%s --noheadings -o pv_name,vg_name --separator ';'\" % pvs_cmd)\n if rc != 0:\n module.fail_json(msg=\"Failed executing pvs command.\",rc=rc, err=err)\n\n ### check pv for devices\n pvs = parse_pvs(module, current_pvs)\n used_pvs = [ pv for pv in pvs if pv['name'] in dev_list and pv['vg_name'] and pv['vg_name'] != vg ]\n if used_pvs:\n module.fail_json(msg=\"Device %s is already in %s volume group.\"%(used_pvs[0]['name'],used_pvs[0]['vg_name']))\n\n vgs_cmd = module.get_bin_path('vgs', True)\n rc,current_vgs,err = module.run_command(\"%s --noheadings -o vg_name,pv_count,lv_count --separator ';'\" % vgs_cmd)\n\n if rc != 0:\n module.fail_json(msg=\"Failed executing vgs command.\",rc=rc, err=err)\n\n changed = False\n\n vgs = parse_vgs(current_vgs)\n\n for test_vg in vgs:\n if test_vg['name'] == vg:\n this_vg = test_vg\n break\n else:\n this_vg = None\n\n if this_vg is None:\n if state == 'present':\n ### create VG\n if module.check_mode:\n changed = True\n else:\n ### create PV\n pvcreate_cmd = module.get_bin_path('pvcreate', True)\n for current_dev in dev_list:\n rc,_,err = module.run_command(\"%s -f %s\" % (pvcreate_cmd,current_dev))\n if rc == 0:\n changed = True\n else:\n module.fail_json(msg=\"Creating physical volume '%s' failed\" % current_dev, rc=rc, err=err)\n vgcreate_cmd = module.get_bin_path('vgcreate')\n rc,_,err = module.run_command([vgcreate_cmd] + vgoptions + ['-s', str(pesize), vg] + dev_list)\n if rc == 0:\n changed = True\n else:\n module.fail_json(msg=\"Creating volume group '%s' failed\"%vg, rc=rc, err=err)\n else:\n if state == 'absent':\n if module.check_mode:\n module.exit_json(changed=True)\n else:\n if this_vg['lv_count'] == 0 or force:\n ### remove VG\n vgremove_cmd = module.get_bin_path('vgremove', True)\n rc,_,err = module.run_command(\"%s --force %s\" % (vgremove_cmd, vg))\n if rc == 0:\n module.exit_json(changed=True)\n else:\n module.fail_json(msg=\"Failed to remove volume group %s\"%(vg),rc=rc, err=err)\n else:\n module.fail_json(msg=\"Refuse to remove non-empty volume group %s without force=yes\"%(vg))\n\n ### resize VG\n current_devs = [ os.path.realpath(pv['name']) for pv in pvs if pv['vg_name'] == vg ]\n devs_to_remove = list(set(current_devs) - set(dev_list))\n devs_to_add = list(set(dev_list) - set(current_devs))\n\n if devs_to_add or devs_to_remove:\n if module.check_mode:\n changed = True\n else:\n if devs_to_add:\n devs_to_add_string = ' '.join(devs_to_add)\n ### create PV\n pvcreate_cmd = module.get_bin_path('pvcreate', True)\n for current_dev in devs_to_add:\n rc,_,err = module.run_command(\"%s -f %s\" % (pvcreate_cmd, current_dev))\n if rc == 0:\n changed = True\n else:\n module.fail_json(msg=\"Creating physical volume '%s' failed\"%current_dev, rc=rc, err=err)\n ### add PV to our VG\n vgextend_cmd = module.get_bin_path('vgextend', True)\n rc,_,err = module.run_command(\"%s %s %s\" % (vgextend_cmd, vg, devs_to_add_string))\n if rc == 0:\n changed = True\n else:\n module.fail_json(msg=\"Unable to extend %s by %s.\"%(vg, devs_to_add_string),rc=rc,err=err)\n\n ### remove some PV from our VG\n if devs_to_remove:\n devs_to_remove_string = ' '.join(devs_to_remove)\n vgreduce_cmd = module.get_bin_path('vgreduce', True)\n rc,_,err = module.run_command(\"%s --force %s %s\" % (vgreduce_cmd, vg, devs_to_remove_string))\n if rc == 0:\n changed = True\n else:\n module.fail_json(msg=\"Unable to reduce %s by %s.\"%(vg, devs_to_remove_string),rc=rc,err=err)\n\n module.exit_json(changed=changed)\n\n# import module snippets\nfrom ansible.module_utils.basic import *\nmain()\n", "path": "system/lvg.py"}]}
| 3,776 | 100 |
gh_patches_debug_27375
|
rasdani/github-patches
|
git_diff
|
WordPress__openverse-api-1047
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
/healthcheck endpoint should check for Elasticsearch availability (original #487)
This issue has been migrated from the [CC Search API repository](https://github.com/creativecommons/cccatalog-api/issues/487)
```
Author: aldenstpage
Date: Wed May 06 2020
Labels: ✨ goal: improvement,🏷 status: label work required,🙅 status: discontinued
```
During deployments, our load balancer repeatedly polls the `/healthcheck` endpoint to check that the server is reachable. If this check succeeds, the newly deployed instance starts receiving production traffic. Right now, if Elasticsearch is not responsive, `/healthcheck` will still return `200 OK`.
The healthcheck endpoint should check the health of the `image` index in Elasticsearch using the [cluster health API](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html). If it is unavailable, return error 500. Log an informative message explaining why the healthcheck failed.
Because the healthcheck endpoint may be called many times, and Elasticsearch calls are not free, we should cache the response of Elasticsearch for up to 10 seconds per call.
--------
### Original Comments:
*madewithkode* commented on Fri May 08 2020:
>Hi Alden, this looks interesting, I'd love to work on it.
[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-625824482)
*madewithkode* commented on Fri May 08 2020:
>Hi Alden in order to check the health of the `image` index in the /healthcheck view, I'm trying to use the urllib's `urlopen()` method to make a request to Elasticsearch's cluster API this way:
`cluster_response = urlopen('http://0.0.0.0:8000/_cluster/health/image')`
However, I keep getting a 404. Is there something I'm doing wrong?
[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-625854788)
*madewithkode* commented on Fri May 08 2020:
>> Hi Alden in order to check the health of the `image` index in the /healthcheck view, I'm trying to use the urllib's `urlopen()` method to make a request to Elasticsearch's cluster API this way:
>
> `cluster_response = urlopen('http://0.0.0.0:8000/_cluster/health/image')`
>
> However, I keep getting a 404. Is there something I'm doing wrong?
Figured this, didn't know elastic search was running on a seperate host/port :)
[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-625905259)
*aldenstpage* commented on Fri May 08 2020:
>That's great!
It would be best to use the equivalent `elasticsearch-py` or `elasticsearch-dsl` query instead of making direct calls to the REST API (you can get an instance of the connection to Elasticsearch from `search_controller.py`). [Here's](https://discuss.elastic.co/t/how-to-get-cluster-health-using-python-api/25431) an example for getting the cluster health; there ought to also be a way to narrow the query to the `image` index.
[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-625995563)
*madewithkode* commented on Sat May 09 2020:
>Alright...would look at the suggestion.
On Fri, May 8, 2020, 21:06 Alden S Page <[email protected]> wrote:
> It would be best to use the equivalent elasticsearch-py query instead of
> making direct calls to the REST API. Here's
> <https://discuss.elastic.co/t/how-to-get-cluster-health-using-python-api/25431>
> an example for getting the cluster health; there ought to also be a way to
> narrow the query to the image index.
>
> —
> You are receiving this because you commented.
> Reply to this email directly, view it on GitHub
> <https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-625995563>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AGFLMYA5WLAQPO5GYZNX5BTRQRQ5RANCNFSM4M2V5EKA>
> .
>
[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626130991)
*madewithkode* commented on Sat May 09 2020:
>Hi Alden, I'm here again :)
I'd love to ask, what status specifically signifies the availability of the `image` index.
`red`, `yellow` or `green` ? or should i leave out this detail in the query since I'm using an already established connection instance from `search_controller.py` which waits for a `yellow` status by default.
[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626164842)
*madewithkode* commented on Sat May 09 2020:
>### Update:
I've successfully managed to query the health of the entire cluster, using the Elasticsearch connection instance gotten from `search_controller.py`. However when i try to limit the health check to just the `image` index, the request never resolves and continues to run forever with no response. And when i try to specify a timeout for the request, i get an "Illegal argument exception" even though `timeout` is a valid kwarg referenced in the [API docs](https://elasticsearch-py.readthedocs.io/en/master/api.html?highlight=health#elasticsearch.client.ClusterClient.health).
It'd be nice to point out that as at the time of writing, I'm yet to successfully run `./load_sample_data.sh` so i don't know if this could be linked to the above problem.
[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626223763)
*madewithkode* commented on Mon May 11 2020:
>Hi Alden, Progress Report :)
Successfully got the `load_sample_data.sh` to run, and so far every other thing is working fine.
I've also set up the 10s response caching on the `/healthcheck` view using redis and also the error logging.
However, I figured out the reason for the unresponsiveness when querying the elastic search `image` index was that it was non-existent and that the whole cluster index was empty too.
Do I need to do a manual population or something?
[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626749591)
*aldenstpage* commented on Mon May 11 2020:
>Hi again Onyenanu – if the index doesn't exist, the healthcheck should fail. This could happen in situations where we are switching Elasticsearch clusters in production and forgot to index data into the new one (or something went wrong while we were loading data into the new cluster).
In my experience, the ES Python libs can behave in unexpected ways that you sometimes have to work around. Since it seems like querying specifically for the `image` index health hangs when the index doesn't exist, perhaps you could query for healthchecks of every index in the cluster, and fail the healthcheck if `image` is not among them and green?
It sounds like it's coming along nicely!
[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626920424)
*madewithkode* commented on Tue May 12 2020:
>> Hi again Onyenanu – if the index doesn't exist, the healthcheck should fail. This could happen in situations where we are switching Elasticsearch clusters in production and forgot to index data into the new one (or something went wrong while we were loading data into the new cluster).
>
> In my experience, the ES Python libs can behave in unexpected ways that you sometimes have to work around. Since it seems like querying specifically for the `image` index health hangs when the index doesn't exist, perhaps you could query for healthchecks of every index in the cluster, and fail the healthcheck if `image` is not among them and green?
>
> It sounds like it's coming along nicely!
Hey Alden...Many thanks again for coming through with better insights. Suggestion sounds nice, would proceed with it.
And yes, the whole stuff is getting more interesting, learnt a handful in the few days :)
[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626973607)
</issue>
<code>
[start of api/catalog/api/views/health_views.py]
1 from rest_framework.response import Response
2 from rest_framework.views import APIView
3
4
5 class HealthCheck(APIView):
6 """
7 Returns a "200 OK" response if the server is running normally.
8
9 This endpoint is used in production to ensure that the server should receive
10 traffic. If no response is provided, the server is deregistered from the
11 load balancer and destroyed.
12 """
13
14 swagger_schema = None
15
16 def get(self, request, format=None):
17 return Response({"status": "200 OK"}, status=200)
18
[end of api/catalog/api/views/health_views.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/api/catalog/api/views/health_views.py b/api/catalog/api/views/health_views.py
--- a/api/catalog/api/views/health_views.py
+++ b/api/catalog/api/views/health_views.py
@@ -1,10 +1,19 @@
+from django.conf import settings
+from rest_framework import status
+from rest_framework.exceptions import APIException
+from rest_framework.request import Request
from rest_framework.response import Response
from rest_framework.views import APIView
+class ElasticsearchHealthcheckException(APIException):
+ status_code = status.HTTP_503_SERVICE_UNAVAILABLE
+
+
class HealthCheck(APIView):
"""
- Returns a "200 OK" response if the server is running normally.
+ Returns a "200 OK" response if the server is running normally. Returns 503
+ otherwise.
This endpoint is used in production to ensure that the server should receive
traffic. If no response is provided, the server is deregistered from the
@@ -13,5 +22,20 @@
swagger_schema = None
- def get(self, request, format=None):
+ def _check_es(self) -> Response | None:
+ """
+ Checks Elasticsearch cluster health. Raises an exception if ES is not healthy.
+ """
+ es_health = settings.ES.cluster.health(timeout="5s")
+
+ if es_health["timed_out"]:
+ raise ElasticsearchHealthcheckException("es_timed_out")
+
+ if (status := es_health["status"]) != "green":
+ raise ElasticsearchHealthcheckException(f"es_status_{status}")
+
+ def get(self, request: Request):
+ if "check_es" in request.query_params:
+ self._check_es()
+
return Response({"status": "200 OK"}, status=200)
|
{"golden_diff": "diff --git a/api/catalog/api/views/health_views.py b/api/catalog/api/views/health_views.py\n--- a/api/catalog/api/views/health_views.py\n+++ b/api/catalog/api/views/health_views.py\n@@ -1,10 +1,19 @@\n+from django.conf import settings\n+from rest_framework import status\n+from rest_framework.exceptions import APIException\n+from rest_framework.request import Request\n from rest_framework.response import Response\n from rest_framework.views import APIView\n \n \n+class ElasticsearchHealthcheckException(APIException):\n+ status_code = status.HTTP_503_SERVICE_UNAVAILABLE\n+\n+\n class HealthCheck(APIView):\n \"\"\"\n- Returns a \"200 OK\" response if the server is running normally.\n+ Returns a \"200 OK\" response if the server is running normally. Returns 503\n+ otherwise.\n \n This endpoint is used in production to ensure that the server should receive\n traffic. If no response is provided, the server is deregistered from the\n@@ -13,5 +22,20 @@\n \n swagger_schema = None\n \n- def get(self, request, format=None):\n+ def _check_es(self) -> Response | None:\n+ \"\"\"\n+ Checks Elasticsearch cluster health. Raises an exception if ES is not healthy.\n+ \"\"\"\n+ es_health = settings.ES.cluster.health(timeout=\"5s\")\n+\n+ if es_health[\"timed_out\"]:\n+ raise ElasticsearchHealthcheckException(\"es_timed_out\")\n+\n+ if (status := es_health[\"status\"]) != \"green\":\n+ raise ElasticsearchHealthcheckException(f\"es_status_{status}\")\n+\n+ def get(self, request: Request):\n+ if \"check_es\" in request.query_params:\n+ self._check_es()\n+\n return Response({\"status\": \"200 OK\"}, status=200)\n", "issue": "/healthcheck endpoint should check for Elasticsearch availability (original #487)\nThis issue has been migrated from the [CC Search API repository](https://github.com/creativecommons/cccatalog-api/issues/487)\r\n\r\n```\r\nAuthor: aldenstpage\r\nDate: Wed May 06 2020\r\nLabels: \u2728 goal: improvement,\ud83c\udff7 status: label work required,\ud83d\ude45 status: discontinued\r\n```\r\nDuring deployments, our load balancer repeatedly polls the `/healthcheck` endpoint to check that the server is reachable. If this check succeeds, the newly deployed instance starts receiving production traffic. Right now, if Elasticsearch is not responsive, `/healthcheck` will still return `200 OK`.\r\n\r\nThe healthcheck endpoint should check the health of the `image` index in Elasticsearch using the [cluster health API](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html). If it is unavailable, return error 500. Log an informative message explaining why the healthcheck failed.\r\n\r\nBecause the healthcheck endpoint may be called many times, and Elasticsearch calls are not free, we should cache the response of Elasticsearch for up to 10 seconds per call.\r\n--------\r\n### Original Comments: \r\n\r\n*madewithkode* commented on Fri May 08 2020:\r\n\r\n>Hi Alden, this looks interesting, I'd love to work on it.\r\n \r\n[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-625824482)\r\n\r\n\r\n*madewithkode* commented on Fri May 08 2020:\r\n\r\n>Hi Alden in order to check the health of the `image` index in the /healthcheck view, I'm trying to use the urllib's `urlopen()` method to make a request to Elasticsearch's cluster API this way:\r\n\r\n`cluster_response = urlopen('http://0.0.0.0:8000/_cluster/health/image')`\r\n\r\nHowever, I keep getting a 404. Is there something I'm doing wrong?\r\n[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-625854788)\r\n\r\n\r\n*madewithkode* commented on Fri May 08 2020:\r\n\r\n>> Hi Alden in order to check the health of the `image` index in the /healthcheck view, I'm trying to use the urllib's `urlopen()` method to make a request to Elasticsearch's cluster API this way:\r\n> \r\n> `cluster_response = urlopen('http://0.0.0.0:8000/_cluster/health/image')`\r\n> \r\n> However, I keep getting a 404. Is there something I'm doing wrong?\r\n\r\nFigured this, didn't know elastic search was running on a seperate host/port :)\r\n[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-625905259)\r\n\r\n\r\n*aldenstpage* commented on Fri May 08 2020:\r\n\r\n>That's great! \r\n\r\nIt would be best to use the equivalent `elasticsearch-py` or `elasticsearch-dsl` query instead of making direct calls to the REST API (you can get an instance of the connection to Elasticsearch from `search_controller.py`). [Here's](https://discuss.elastic.co/t/how-to-get-cluster-health-using-python-api/25431) an example for getting the cluster health; there ought to also be a way to narrow the query to the `image` index.\r\n[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-625995563)\r\n\r\n\r\n*madewithkode* commented on Sat May 09 2020:\r\n\r\n>Alright...would look at the suggestion.\r\n\r\nOn Fri, May 8, 2020, 21:06 Alden S Page <[email protected]> wrote:\r\n\r\n> It would be best to use the equivalent elasticsearch-py query instead of\r\n> making direct calls to the REST API. Here's\r\n> <https://discuss.elastic.co/t/how-to-get-cluster-health-using-python-api/25431>\r\n> an example for getting the cluster health; there ought to also be a way to\r\n> narrow the query to the image index.\r\n>\r\n> \u2014\r\n> You are receiving this because you commented.\r\n> Reply to this email directly, view it on GitHub\r\n> <https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-625995563>,\r\n> or unsubscribe\r\n> <https://github.com/notifications/unsubscribe-auth/AGFLMYA5WLAQPO5GYZNX5BTRQRQ5RANCNFSM4M2V5EKA>\r\n> .\r\n>\r\n\r\n[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626130991)\r\n\r\n\r\n*madewithkode* commented on Sat May 09 2020:\r\n\r\n>Hi Alden, I'm here again :)\r\nI'd love to ask, what status specifically signifies the availability of the `image` index. \r\n`red`, `yellow` or `green` ? or should i leave out this detail in the query since I'm using an already established connection instance from `search_controller.py` which waits for a `yellow` status by default.\r\n[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626164842)\r\n\r\n\r\n*madewithkode* commented on Sat May 09 2020:\r\n\r\n>### Update: \r\nI've successfully managed to query the health of the entire cluster, using the Elasticsearch connection instance gotten from `search_controller.py`. However when i try to limit the health check to just the `image` index, the request never resolves and continues to run forever with no response. And when i try to specify a timeout for the request, i get an \"Illegal argument exception\" even though `timeout` is a valid kwarg referenced in the [API docs](https://elasticsearch-py.readthedocs.io/en/master/api.html?highlight=health#elasticsearch.client.ClusterClient.health).\r\n\r\nIt'd be nice to point out that as at the time of writing, I'm yet to successfully run `./load_sample_data.sh` so i don't know if this could be linked to the above problem.\r\n\r\n\r\n\r\n[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626223763)\r\n\r\n\r\n*madewithkode* commented on Mon May 11 2020:\r\n\r\n>Hi Alden, Progress Report :)\r\n\r\nSuccessfully got the `load_sample_data.sh` to run, and so far every other thing is working fine. \r\nI've also set up the 10s response caching on the `/healthcheck` view using redis and also the error logging.\r\n\r\nHowever, I figured out the reason for the unresponsiveness when querying the elastic search `image` index was that it was non-existent and that the whole cluster index was empty too.\r\n\r\nDo I need to do a manual population or something?\r\n\r\n\r\n\r\n\r\n[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626749591)\r\n\r\n\r\n*aldenstpage* commented on Mon May 11 2020:\r\n\r\n>Hi again Onyenanu \u2013 if the index doesn't exist, the healthcheck should fail. This could happen in situations where we are switching Elasticsearch clusters in production and forgot to index data into the new one (or something went wrong while we were loading data into the new cluster).\r\n\r\nIn my experience, the ES Python libs can behave in unexpected ways that you sometimes have to work around. Since it seems like querying specifically for the `image` index health hangs when the index doesn't exist, perhaps you could query for healthchecks of every index in the cluster, and fail the healthcheck if `image` is not among them and green?\r\n\r\nIt sounds like it's coming along nicely!\r\n[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626920424)\r\n\r\n\r\n*madewithkode* commented on Tue May 12 2020:\r\n\r\n>> Hi again Onyenanu \u2013 if the index doesn't exist, the healthcheck should fail. This could happen in situations where we are switching Elasticsearch clusters in production and forgot to index data into the new one (or something went wrong while we were loading data into the new cluster).\r\n> \r\n> In my experience, the ES Python libs can behave in unexpected ways that you sometimes have to work around. Since it seems like querying specifically for the `image` index health hangs when the index doesn't exist, perhaps you could query for healthchecks of every index in the cluster, and fail the healthcheck if `image` is not among them and green?\r\n> \r\n> It sounds like it's coming along nicely!\r\n\r\nHey Alden...Many thanks again for coming through with better insights. Suggestion sounds nice, would proceed with it.\r\n\r\nAnd yes, the whole stuff is getting more interesting, learnt a handful in the few days :)\r\n[source](https://github.com/creativecommons/cccatalog-api/issues/487#issuecomment-626973607)\r\n\n", "before_files": [{"content": "from rest_framework.response import Response\nfrom rest_framework.views import APIView\n\n\nclass HealthCheck(APIView):\n \"\"\"\n Returns a \"200 OK\" response if the server is running normally.\n\n This endpoint is used in production to ensure that the server should receive\n traffic. If no response is provided, the server is deregistered from the\n load balancer and destroyed.\n \"\"\"\n\n swagger_schema = None\n\n def get(self, request, format=None):\n return Response({\"status\": \"200 OK\"}, status=200)\n", "path": "api/catalog/api/views/health_views.py"}]}
| 2,685 | 401 |
gh_patches_debug_3929
|
rasdani/github-patches
|
git_diff
|
pyload__pyload-1340
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
DepositfilesCom Parse error
Hi,
debuglog http://pastebin.com/v0SGFL9R
handleFree_line44.dump.html http://pastebin.com/2V3Rjn7M
handleFree_line60.dump.html http://pastebin.com/mxPsFQgk
preload_line455.dump.html http://pastebin.com/F9vBdCct
TIA
</issue>
<code>
[start of module/plugins/hoster/DepositfilesCom.py]
1 # -*- coding: utf-8 -*-
2
3 import re
4
5 from urllib import unquote
6
7 from module.plugins.internal.CaptchaService import ReCaptcha
8 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
9
10
11 class DepositfilesCom(SimpleHoster):
12 __name__ = "DepositfilesCom"
13 __type__ = "hoster"
14 __version__ = "0.54"
15
16 __pattern__ = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)'
17 __config__ = [("use_premium", "bool", "Use premium account if available", True)]
18
19 __description__ = """Depositfiles.com hoster plugin"""
20 __license__ = "GPLv3"
21 __authors__ = [("spoob", "[email protected]"),
22 ("zoidberg", "[email protected]"),
23 ("Walter Purcaro", "[email protected]")]
24
25
26 NAME_PATTERN = r'<script type="text/javascript">eval\( unescape\(\'(?P<N>.*?)\''
27 SIZE_PATTERN = r': <b>(?P<S>[\d.,]+) (?P<U>[\w^_]+)</b>'
28 OFFLINE_PATTERN = r'<span class="html_download_api-not_exists"></span>'
29
30 NAME_REPLACEMENTS = [(r'\%u([0-9A-Fa-f]{4})', lambda m: unichr(int(m.group(1), 16))),
31 (r'.*<b title="(?P<N>.+?)".*', "\g<N>")]
32 URL_REPLACEMENTS = [(__pattern__ + ".*", "https://dfiles.eu/files/\g<ID>")]
33
34 COOKIES = [("dfiles.eu", "lang_current", "en")]
35
36 WAIT_PATTERN = r'(?:download_waiter_remain">|html_download_api-limit_interval">|>Please wait|>Try in).+'
37 ERROR_PATTER = r'File is checked, please try again in a minute'
38
39 LINK_FREE_PATTERN = r'<form id="downloader_file_form" action="(http://.+?\.(dfiles\.eu|depositfiles\.com)/.+?)" method="post"'
40 LINK_PREMIUM_PATTERN = r'class="repeat"><a href="(.+?)"'
41 LINK_MIRROR_PATTERN = r'class="repeat_mirror"><a href="(.+?)"'
42
43
44 def handleFree(self, pyfile):
45 self.html = self.load(pyfile.url, post={'gateway_result': "1"})
46
47 self.checkErrors()
48
49 m = re.search(r"var fid = '(\w+)';", self.html)
50 if m is None:
51 self.retry(wait_time=5)
52 params = {'fid': m.group(1)}
53 self.logDebug("FID: %s" % params['fid'])
54
55 self.wait()
56 recaptcha = ReCaptcha(self)
57 captcha_key = recaptcha.detect_key()
58 if captcha_key is None:
59 return
60
61 self.html = self.load("https://dfiles.eu/get_file.php", get=params)
62
63 if '<input type=button value="Continue" onclick="check_recaptcha' in self.html:
64 params['response'], params['challenge'] = recaptcha.challenge(captcha_key)
65 self.html = self.load("https://dfiles.eu/get_file.php", get=params)
66
67 m = re.search(self.LINK_FREE_PATTERN, self.html)
68 if m:
69 if 'response' in params:
70 self.correctCaptcha()
71
72 self.link = unquote(m.group(1))
73
74
75 def handlePremium(self, pyfile):
76 if '<span class="html_download_api-gold_traffic_limit">' in self.html:
77 self.logWarning(_("Download limit reached"))
78 self.retry(25, 60 * 60, "Download limit reached")
79
80 elif 'onClick="show_gold_offer' in self.html:
81 self.account.relogin(self.user)
82 self.retry()
83
84 else:
85 link = re.search(self.LINK_PREMIUM_PATTERN, self.html)
86 mirror = re.search(self.LINK_MIRROR_PATTERN, self.html)
87
88 if link:
89 self.link = link.group(1)
90
91 elif mirror:
92 self.link = mirror.group(1)
93
94
95 getInfo = create_getInfo(DepositfilesCom)
96
[end of module/plugins/hoster/DepositfilesCom.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -52,7 +52,9 @@
params = {'fid': m.group(1)}
self.logDebug("FID: %s" % params['fid'])
+ self.setWait(60)
self.wait()
+
recaptcha = ReCaptcha(self)
captcha_key = recaptcha.detect_key()
if captcha_key is None:
|
{"golden_diff": "diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py\n--- a/module/plugins/hoster/DepositfilesCom.py\n+++ b/module/plugins/hoster/DepositfilesCom.py\n@@ -52,7 +52,9 @@\n params = {'fid': m.group(1)}\n self.logDebug(\"FID: %s\" % params['fid'])\n \n+ self.setWait(60)\n self.wait()\n+\n recaptcha = ReCaptcha(self)\n captcha_key = recaptcha.detect_key()\n if captcha_key is None:\n", "issue": "DepositfilesCom Parse error\nHi,\n\ndebuglog http://pastebin.com/v0SGFL9R\n\nhandleFree_line44.dump.html http://pastebin.com/2V3Rjn7M\nhandleFree_line60.dump.html http://pastebin.com/mxPsFQgk\npreload_line455.dump.html http://pastebin.com/F9vBdCct\n\nTIA\n\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n\nimport re\n\nfrom urllib import unquote\n\nfrom module.plugins.internal.CaptchaService import ReCaptcha\nfrom module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo\n\n\nclass DepositfilesCom(SimpleHoster):\n __name__ = \"DepositfilesCom\"\n __type__ = \"hoster\"\n __version__ = \"0.54\"\n\n __pattern__ = r'https?://(?:www\\.)?(depositfiles\\.com|dfiles\\.(eu|ru))(/\\w{1,3})?/files/(?P<ID>\\w+)'\n __config__ = [(\"use_premium\", \"bool\", \"Use premium account if available\", True)]\n\n __description__ = \"\"\"Depositfiles.com hoster plugin\"\"\"\n __license__ = \"GPLv3\"\n __authors__ = [(\"spoob\", \"[email protected]\"),\n (\"zoidberg\", \"[email protected]\"),\n (\"Walter Purcaro\", \"[email protected]\")]\n\n\n NAME_PATTERN = r'<script type=\"text/javascript\">eval\\( unescape\\(\\'(?P<N>.*?)\\''\n SIZE_PATTERN = r': <b>(?P<S>[\\d.,]+) (?P<U>[\\w^_]+)</b>'\n OFFLINE_PATTERN = r'<span class=\"html_download_api-not_exists\"></span>'\n\n NAME_REPLACEMENTS = [(r'\\%u([0-9A-Fa-f]{4})', lambda m: unichr(int(m.group(1), 16))),\n (r'.*<b title=\"(?P<N>.+?)\".*', \"\\g<N>\")]\n URL_REPLACEMENTS = [(__pattern__ + \".*\", \"https://dfiles.eu/files/\\g<ID>\")]\n\n COOKIES = [(\"dfiles.eu\", \"lang_current\", \"en\")]\n\n WAIT_PATTERN = r'(?:download_waiter_remain\">|html_download_api-limit_interval\">|>Please wait|>Try in).+'\n ERROR_PATTER = r'File is checked, please try again in a minute'\n\n LINK_FREE_PATTERN = r'<form id=\"downloader_file_form\" action=\"(http://.+?\\.(dfiles\\.eu|depositfiles\\.com)/.+?)\" method=\"post\"'\n LINK_PREMIUM_PATTERN = r'class=\"repeat\"><a href=\"(.+?)\"'\n LINK_MIRROR_PATTERN = r'class=\"repeat_mirror\"><a href=\"(.+?)\"'\n\n\n def handleFree(self, pyfile):\n self.html = self.load(pyfile.url, post={'gateway_result': \"1\"})\n\n self.checkErrors()\n\n m = re.search(r\"var fid = '(\\w+)';\", self.html)\n if m is None:\n self.retry(wait_time=5)\n params = {'fid': m.group(1)}\n self.logDebug(\"FID: %s\" % params['fid'])\n\n self.wait()\n recaptcha = ReCaptcha(self)\n captcha_key = recaptcha.detect_key()\n if captcha_key is None:\n return\n\n self.html = self.load(\"https://dfiles.eu/get_file.php\", get=params)\n\n if '<input type=button value=\"Continue\" onclick=\"check_recaptcha' in self.html:\n params['response'], params['challenge'] = recaptcha.challenge(captcha_key)\n self.html = self.load(\"https://dfiles.eu/get_file.php\", get=params)\n\n m = re.search(self.LINK_FREE_PATTERN, self.html)\n if m:\n if 'response' in params:\n self.correctCaptcha()\n\n self.link = unquote(m.group(1))\n\n\n def handlePremium(self, pyfile):\n if '<span class=\"html_download_api-gold_traffic_limit\">' in self.html:\n self.logWarning(_(\"Download limit reached\"))\n self.retry(25, 60 * 60, \"Download limit reached\")\n\n elif 'onClick=\"show_gold_offer' in self.html:\n self.account.relogin(self.user)\n self.retry()\n\n else:\n link = re.search(self.LINK_PREMIUM_PATTERN, self.html)\n mirror = re.search(self.LINK_MIRROR_PATTERN, self.html)\n\n if link:\n self.link = link.group(1)\n\n elif mirror:\n self.link = mirror.group(1)\n\n\ngetInfo = create_getInfo(DepositfilesCom)\n", "path": "module/plugins/hoster/DepositfilesCom.py"}]}
| 1,780 | 127 |
gh_patches_debug_11494
|
rasdani/github-patches
|
git_diff
|
litestar-org__litestar-610
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Bug: Picologging not behaving correctly
**Describe the bug**
i reported an earlier issue to @peterschutt about logging configuration not visible in the console output.
that was fixed in https://github.com/starlite-api/starlite/pull/594
i now wanted to test this out with picologging but it seems to override the LoggingConfig settings.
**To Reproduce**
checkout https://github.com/starlite-api/starlite-pg-redis-docker and add picologging to the application.
then you see the behaviour i describe here.
nothing else changes so only add picologging.
**Additional context**
you can see the behaviour already at starting the project with docker-compose up.
without picologging in project:
app_1 | Starting Starlite App...
app_1 | INFO: Will watch for changes in these directories: ['/app']
app_1 | INFO: Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit)
app_1 | INFO: Started reloader process [10] using WatchFiles
app_1 | INFO: Started server process [12]
app_1 | INFO: Waiting for application startup.
app_1 | 2022-10-16 18:38:14,888 loglevel=INFO logger=uvicorn.error serve() L75 Started server process [12]
app_1 | 2022-10-16 18:38:14,888 loglevel=INFO logger=uvicorn.error startup() L47 Waiting for application startup.
app_1 | INFO: Application startup complete.
app_1 | 2022-10-16 18:38:14,908 loglevel=INFO logger=uvicorn.error startup() L61 Application startup complete.
with picologging in project:
app_1 | Starting Starlite App...
app_1 | INFO: Will watch for changes in these directories: ['/app']
app_1 | INFO: Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit)
app_1 | INFO: Started reloader process [10] using WatchFiles
app_1 | INFO: Started server process [12]
app_1 | INFO: Waiting for application startup.
app_1 | INFO: Application startup complete.
i tried looking at the documentation of picologging https://microsoft.github.io/picologging/handlers.html section Queue Listener but it seems to be correct. at this point im lacking knowledge in the logging department to troubleshoot this deeper.
Kind regards,
Niels
</issue>
<code>
[start of starlite/logging/picologging.py]
1 import atexit
2 from logging import StreamHandler
3 from queue import Queue
4 from typing import Any, List, Optional
5
6 from starlite.exceptions import MissingDependencyException
7 from starlite.logging.utils import resolve_handlers
8
9 try:
10 from picologging.handlers import QueueHandler, QueueListener
11 except ImportError as e:
12 raise MissingDependencyException("picologging is not installed") from e
13
14
15 class QueueListenerHandler(QueueHandler): # type: ignore[misc]
16 def __init__(self, handlers: Optional[List[Any]] = None) -> None:
17 """Configures queue listener and handler to support non-blocking
18 logging configuration.
19
20 Args:
21 handlers: Optional 'ConvertingList'
22
23 Notes:
24 - Requires `picologging` to be installed.
25 """
26 super().__init__(Queue(-1))
27 if handlers:
28 handlers = resolve_handlers(handlers)
29 else:
30 handlers = [StreamHandler()]
31 self.listener = QueueListener(self.queue, *handlers)
32 self.listener.start()
33
34 atexit.register(self.listener.stop)
35
[end of starlite/logging/picologging.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/starlite/logging/picologging.py b/starlite/logging/picologging.py
--- a/starlite/logging/picologging.py
+++ b/starlite/logging/picologging.py
@@ -1,5 +1,4 @@
import atexit
-from logging import StreamHandler
from queue import Queue
from typing import Any, List, Optional
@@ -7,6 +6,7 @@
from starlite.logging.utils import resolve_handlers
try:
+ from picologging import StreamHandler
from picologging.handlers import QueueHandler, QueueListener
except ImportError as e:
raise MissingDependencyException("picologging is not installed") from e
|
{"golden_diff": "diff --git a/starlite/logging/picologging.py b/starlite/logging/picologging.py\n--- a/starlite/logging/picologging.py\n+++ b/starlite/logging/picologging.py\n@@ -1,5 +1,4 @@\n import atexit\n-from logging import StreamHandler\n from queue import Queue\n from typing import Any, List, Optional\n \n@@ -7,6 +6,7 @@\n from starlite.logging.utils import resolve_handlers\n \n try:\n+ from picologging import StreamHandler\n from picologging.handlers import QueueHandler, QueueListener\n except ImportError as e:\n raise MissingDependencyException(\"picologging is not installed\") from e\n", "issue": "Bug: Picologging not behaving correctly \n**Describe the bug**\r\ni reported an earlier issue to @peterschutt about logging configuration not visible in the console output.\r\nthat was fixed in https://github.com/starlite-api/starlite/pull/594\r\n\r\ni now wanted to test this out with picologging but it seems to override the LoggingConfig settings.\r\n\r\n**To Reproduce**\r\ncheckout https://github.com/starlite-api/starlite-pg-redis-docker and add picologging to the application.\r\nthen you see the behaviour i describe here.\r\n\r\nnothing else changes so only add picologging.\r\n\r\n**Additional context**\r\nyou can see the behaviour already at starting the project with docker-compose up.\r\n\r\nwithout picologging in project:\r\n\r\napp_1 | Starting Starlite App...\r\napp_1 | INFO: Will watch for changes in these directories: ['/app']\r\napp_1 | INFO: Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit)\r\napp_1 | INFO: Started reloader process [10] using WatchFiles\r\napp_1 | INFO: Started server process [12]\r\napp_1 | INFO: Waiting for application startup.\r\napp_1 | 2022-10-16 18:38:14,888 loglevel=INFO logger=uvicorn.error serve() L75 Started server process [12]\r\napp_1 | 2022-10-16 18:38:14,888 loglevel=INFO logger=uvicorn.error startup() L47 Waiting for application startup.\r\napp_1 | INFO: Application startup complete.\r\napp_1 | 2022-10-16 18:38:14,908 loglevel=INFO logger=uvicorn.error startup() L61 Application startup complete.\r\n\r\nwith picologging in project:\r\n\r\napp_1 | Starting Starlite App...\r\napp_1 | INFO: Will watch for changes in these directories: ['/app']\r\napp_1 | INFO: Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit)\r\napp_1 | INFO: Started reloader process [10] using WatchFiles\r\napp_1 | INFO: Started server process [12]\r\napp_1 | INFO: Waiting for application startup.\r\napp_1 | INFO: Application startup complete.\r\n\r\n\r\ni tried looking at the documentation of picologging https://microsoft.github.io/picologging/handlers.html section Queue Listener but it seems to be correct. at this point im lacking knowledge in the logging department to troubleshoot this deeper.\r\n\r\nKind regards,\r\nNiels\r\n\n", "before_files": [{"content": "import atexit\nfrom logging import StreamHandler\nfrom queue import Queue\nfrom typing import Any, List, Optional\n\nfrom starlite.exceptions import MissingDependencyException\nfrom starlite.logging.utils import resolve_handlers\n\ntry:\n from picologging.handlers import QueueHandler, QueueListener\nexcept ImportError as e:\n raise MissingDependencyException(\"picologging is not installed\") from e\n\n\nclass QueueListenerHandler(QueueHandler): # type: ignore[misc]\n def __init__(self, handlers: Optional[List[Any]] = None) -> None:\n \"\"\"Configures queue listener and handler to support non-blocking\n logging configuration.\n\n Args:\n handlers: Optional 'ConvertingList'\n\n Notes:\n - Requires `picologging` to be installed.\n \"\"\"\n super().__init__(Queue(-1))\n if handlers:\n handlers = resolve_handlers(handlers)\n else:\n handlers = [StreamHandler()]\n self.listener = QueueListener(self.queue, *handlers)\n self.listener.start()\n\n atexit.register(self.listener.stop)\n", "path": "starlite/logging/picologging.py"}]}
| 1,439 | 143 |
gh_patches_debug_16834
|
rasdani/github-patches
|
git_diff
|
pypi__warehouse-1242
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
non-integer page params should result in a 4xx not a 500
https://github.com/pypa/warehouse/blob/master/warehouse/views.py#L195
Right now if you pass anything that's not an int, you get a 500.
</issue>
<code>
[start of warehouse/views.py]
1 # Licensed under the Apache License, Version 2.0 (the "License");
2 # you may not use this file except in compliance with the License.
3 # You may obtain a copy of the License at
4 #
5 # http://www.apache.org/licenses/LICENSE-2.0
6 #
7 # Unless required by applicable law or agreed to in writing, software
8 # distributed under the License is distributed on an "AS IS" BASIS,
9 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10 # See the License for the specific language governing permissions and
11 # limitations under the License.
12
13 import collections
14
15 from pyramid.httpexceptions import (
16 HTTPException, HTTPSeeOther, HTTPMovedPermanently, HTTPNotFound,
17 )
18 from pyramid.view import (
19 notfound_view_config, forbidden_view_config, view_config,
20 )
21 from elasticsearch_dsl import Q
22 from sqlalchemy import func
23 from sqlalchemy.orm import aliased, joinedload
24
25 from warehouse.accounts import REDIRECT_FIELD_NAME
26 from warehouse.accounts.models import User
27 from warehouse.cache.origin import origin_cache
28 from warehouse.cache.http import cache_control
29 from warehouse.classifiers.models import Classifier
30 from warehouse.packaging.models import Project, Release, File
31 from warehouse.utils.row_counter import RowCount
32 from warehouse.utils.paginate import ElasticsearchPage, paginate_url_factory
33
34
35 SEARCH_FIELDS = [
36 "author", "author_email", "description", "download_url", "home_page",
37 "keywords", "license", "maintainer", "maintainer_email", "normalized_name",
38 "platform", "summary",
39 ]
40 SEARCH_BOOSTS = {
41 "normalized_name": 10,
42 "description": 5,
43 "keywords": 5,
44 "summary": 5,
45 }
46
47
48 @view_config(context=HTTPException)
49 @notfound_view_config(append_slash=HTTPMovedPermanently)
50 def httpexception_view(exc, request):
51 return exc
52
53
54 @forbidden_view_config()
55 def forbidden(exc, request):
56 # If the forbidden error is because the user isn't logged in, then we'll
57 # redirect them to the log in page.
58 if request.authenticated_userid is None:
59 url = request.route_url(
60 "accounts.login",
61 _query={REDIRECT_FIELD_NAME: request.path_qs},
62 )
63 return HTTPSeeOther(url)
64
65 # If we've reached here, then the user is logged in and they are genuinely
66 # not allowed to access this page.
67 # TODO: Style the forbidden page.
68 return exc
69
70
71 @view_config(
72 route_name="robots.txt",
73 renderer="robots.txt",
74 decorator=[
75 cache_control(1 * 24 * 60 * 60), # 1 day
76 origin_cache(
77 1 * 24 * 60 * 60, # 1 day
78 stale_while_revalidate=6 * 60 * 60, # 6 hours
79 stale_if_error=1 * 24 * 60 * 60, # 1 day
80 ),
81 ],
82 )
83 def robotstxt(request):
84 request.response.content_type = "text/plain"
85 return {}
86
87
88 @view_config(
89 route_name="index",
90 renderer="index.html",
91 decorator=[
92 origin_cache(
93 1 * 60 * 60, # 1 hour
94 stale_while_revalidate=10 * 60, # 10 minutes
95 stale_if_error=1 * 24 * 60 * 60, # 1 day
96 keys=["all-projects"],
97 ),
98 ]
99 )
100 def index(request):
101 project_names = [
102 r[0] for r in (
103 request.db.query(File.name)
104 .group_by(File.name)
105 .order_by(func.sum(File.downloads).desc())
106 .limit(5)
107 .all())
108 ]
109 release_a = aliased(
110 Release,
111 request.db.query(Release)
112 .distinct(Release.name)
113 .filter(Release.name.in_(project_names))
114 .order_by(Release.name, Release._pypi_ordering.desc())
115 .subquery(),
116 )
117 top_projects = (
118 request.db.query(release_a)
119 .options(joinedload(release_a.project),
120 joinedload(release_a.uploader))
121 .order_by(func.array_idx(project_names, release_a.name))
122 .all()
123 )
124
125 latest_releases = (
126 request.db.query(Release)
127 .options(joinedload(Release.project),
128 joinedload(Release.uploader))
129 .order_by(Release.created.desc())
130 .limit(5)
131 .all()
132 )
133
134 counts = dict(
135 request.db.query(RowCount.table_name, RowCount.count)
136 .filter(
137 RowCount.table_name.in_([
138 Project.__tablename__,
139 Release.__tablename__,
140 File.__tablename__,
141 User.__tablename__,
142 ]))
143 .all()
144 )
145
146 return {
147 "latest_releases": latest_releases,
148 "top_projects": top_projects,
149 "num_projects": counts.get(Project.__tablename__, 0),
150 "num_releases": counts.get(Release.__tablename__, 0),
151 "num_files": counts.get(File.__tablename__, 0),
152 "num_users": counts.get(User.__tablename__, 0),
153 }
154
155
156 @view_config(
157 route_name="search",
158 renderer="search/results.html",
159 decorator=[
160 origin_cache(
161 1 * 60 * 60, # 1 hour
162 stale_while_revalidate=10 * 60, # 10 minutes
163 stale_if_error=1 * 24 * 60 * 60, # 1 day
164 keys=["all-projects"],
165 )
166 ],
167 )
168 def search(request):
169
170 q = request.params.get("q", '')
171
172 if q:
173 should = []
174 for field in SEARCH_FIELDS:
175 kw = {"query": q}
176 if field in SEARCH_BOOSTS:
177 kw["boost"] = SEARCH_BOOSTS[field]
178 should.append(Q("match", **{field: kw}))
179
180 # Add a prefix query if ``q`` is longer than one character.
181 if len(q) > 1:
182 should.append(Q('prefix', normalized_name=q))
183
184 query = request.es.query("dis_max", queries=should)
185 query = query.suggest("name_suggestion", q, term={"field": "name"})
186 else:
187 query = request.es.query()
188
189 if request.params.get("o"):
190 query = query.sort(request.params["o"])
191
192 if request.params.getall("c"):
193 query = query.filter("terms", classifiers=request.params.getall("c"))
194
195 page_num = int(request.params.get("page", 1))
196 page = ElasticsearchPage(
197 query,
198 page=page_num,
199 url_maker=paginate_url_factory(request),
200 )
201
202 if page.page_count and page_num > page.page_count:
203 raise HTTPNotFound
204
205 available_filters = collections.defaultdict(list)
206
207 for cls in request.db.query(Classifier).order_by(Classifier.classifier):
208 first, *_ = cls.classifier.split(' :: ')
209 available_filters[first].append(cls.classifier)
210
211 return {
212 "page": page,
213 "term": q,
214 "order": request.params.get("o", ''),
215 "available_filters": sorted(available_filters.items()),
216 "applied_filters": request.params.getall("c"),
217 }
218
219
220 @view_config(
221 route_name="includes.current-user-indicator",
222 renderer="includes/current-user-indicator.html",
223 uses_session=True,
224 )
225 def current_user_indicator(request):
226 return {}
227
228
229 @view_config(route_name="health", renderer="string")
230 def health(request):
231 # This will ensure that we can access the database and run queries against
232 # it without doing anything that will take a lock or block other queries.
233 request.db.execute("SELECT 1")
234
235 # Nothing will actually check this, but it's a little nicer to have
236 # something to return besides an empty body.
237 return "OK"
238
[end of warehouse/views.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/warehouse/views.py b/warehouse/views.py
--- a/warehouse/views.py
+++ b/warehouse/views.py
@@ -14,6 +14,7 @@
from pyramid.httpexceptions import (
HTTPException, HTTPSeeOther, HTTPMovedPermanently, HTTPNotFound,
+ HTTPBadRequest,
)
from pyramid.view import (
notfound_view_config, forbidden_view_config, view_config,
@@ -192,7 +193,11 @@
if request.params.getall("c"):
query = query.filter("terms", classifiers=request.params.getall("c"))
- page_num = int(request.params.get("page", 1))
+ try:
+ page_num = int(request.params.get("page", 1))
+ except ValueError:
+ raise HTTPBadRequest("'page' must be an integer.")
+
page = ElasticsearchPage(
query,
page=page_num,
|
{"golden_diff": "diff --git a/warehouse/views.py b/warehouse/views.py\n--- a/warehouse/views.py\n+++ b/warehouse/views.py\n@@ -14,6 +14,7 @@\n \n from pyramid.httpexceptions import (\n HTTPException, HTTPSeeOther, HTTPMovedPermanently, HTTPNotFound,\n+ HTTPBadRequest,\n )\n from pyramid.view import (\n notfound_view_config, forbidden_view_config, view_config,\n@@ -192,7 +193,11 @@\n if request.params.getall(\"c\"):\n query = query.filter(\"terms\", classifiers=request.params.getall(\"c\"))\n \n- page_num = int(request.params.get(\"page\", 1))\n+ try:\n+ page_num = int(request.params.get(\"page\", 1))\n+ except ValueError:\n+ raise HTTPBadRequest(\"'page' must be an integer.\")\n+\n page = ElasticsearchPage(\n query,\n page=page_num,\n", "issue": "non-integer page params should result in a 4xx not a 500\nhttps://github.com/pypa/warehouse/blob/master/warehouse/views.py#L195\n\nRight now if you pass anything that's not an int, you get a 500.\n\n", "before_files": [{"content": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport collections\n\nfrom pyramid.httpexceptions import (\n HTTPException, HTTPSeeOther, HTTPMovedPermanently, HTTPNotFound,\n)\nfrom pyramid.view import (\n notfound_view_config, forbidden_view_config, view_config,\n)\nfrom elasticsearch_dsl import Q\nfrom sqlalchemy import func\nfrom sqlalchemy.orm import aliased, joinedload\n\nfrom warehouse.accounts import REDIRECT_FIELD_NAME\nfrom warehouse.accounts.models import User\nfrom warehouse.cache.origin import origin_cache\nfrom warehouse.cache.http import cache_control\nfrom warehouse.classifiers.models import Classifier\nfrom warehouse.packaging.models import Project, Release, File\nfrom warehouse.utils.row_counter import RowCount\nfrom warehouse.utils.paginate import ElasticsearchPage, paginate_url_factory\n\n\nSEARCH_FIELDS = [\n \"author\", \"author_email\", \"description\", \"download_url\", \"home_page\",\n \"keywords\", \"license\", \"maintainer\", \"maintainer_email\", \"normalized_name\",\n \"platform\", \"summary\",\n]\nSEARCH_BOOSTS = {\n \"normalized_name\": 10,\n \"description\": 5,\n \"keywords\": 5,\n \"summary\": 5,\n}\n\n\n@view_config(context=HTTPException)\n@notfound_view_config(append_slash=HTTPMovedPermanently)\ndef httpexception_view(exc, request):\n return exc\n\n\n@forbidden_view_config()\ndef forbidden(exc, request):\n # If the forbidden error is because the user isn't logged in, then we'll\n # redirect them to the log in page.\n if request.authenticated_userid is None:\n url = request.route_url(\n \"accounts.login\",\n _query={REDIRECT_FIELD_NAME: request.path_qs},\n )\n return HTTPSeeOther(url)\n\n # If we've reached here, then the user is logged in and they are genuinely\n # not allowed to access this page.\n # TODO: Style the forbidden page.\n return exc\n\n\n@view_config(\n route_name=\"robots.txt\",\n renderer=\"robots.txt\",\n decorator=[\n cache_control(1 * 24 * 60 * 60), # 1 day\n origin_cache(\n 1 * 24 * 60 * 60, # 1 day\n stale_while_revalidate=6 * 60 * 60, # 6 hours\n stale_if_error=1 * 24 * 60 * 60, # 1 day\n ),\n ],\n)\ndef robotstxt(request):\n request.response.content_type = \"text/plain\"\n return {}\n\n\n@view_config(\n route_name=\"index\",\n renderer=\"index.html\",\n decorator=[\n origin_cache(\n 1 * 60 * 60, # 1 hour\n stale_while_revalidate=10 * 60, # 10 minutes\n stale_if_error=1 * 24 * 60 * 60, # 1 day\n keys=[\"all-projects\"],\n ),\n ]\n)\ndef index(request):\n project_names = [\n r[0] for r in (\n request.db.query(File.name)\n .group_by(File.name)\n .order_by(func.sum(File.downloads).desc())\n .limit(5)\n .all())\n ]\n release_a = aliased(\n Release,\n request.db.query(Release)\n .distinct(Release.name)\n .filter(Release.name.in_(project_names))\n .order_by(Release.name, Release._pypi_ordering.desc())\n .subquery(),\n )\n top_projects = (\n request.db.query(release_a)\n .options(joinedload(release_a.project),\n joinedload(release_a.uploader))\n .order_by(func.array_idx(project_names, release_a.name))\n .all()\n )\n\n latest_releases = (\n request.db.query(Release)\n .options(joinedload(Release.project),\n joinedload(Release.uploader))\n .order_by(Release.created.desc())\n .limit(5)\n .all()\n )\n\n counts = dict(\n request.db.query(RowCount.table_name, RowCount.count)\n .filter(\n RowCount.table_name.in_([\n Project.__tablename__,\n Release.__tablename__,\n File.__tablename__,\n User.__tablename__,\n ]))\n .all()\n )\n\n return {\n \"latest_releases\": latest_releases,\n \"top_projects\": top_projects,\n \"num_projects\": counts.get(Project.__tablename__, 0),\n \"num_releases\": counts.get(Release.__tablename__, 0),\n \"num_files\": counts.get(File.__tablename__, 0),\n \"num_users\": counts.get(User.__tablename__, 0),\n }\n\n\n@view_config(\n route_name=\"search\",\n renderer=\"search/results.html\",\n decorator=[\n origin_cache(\n 1 * 60 * 60, # 1 hour\n stale_while_revalidate=10 * 60, # 10 minutes\n stale_if_error=1 * 24 * 60 * 60, # 1 day\n keys=[\"all-projects\"],\n )\n ],\n)\ndef search(request):\n\n q = request.params.get(\"q\", '')\n\n if q:\n should = []\n for field in SEARCH_FIELDS:\n kw = {\"query\": q}\n if field in SEARCH_BOOSTS:\n kw[\"boost\"] = SEARCH_BOOSTS[field]\n should.append(Q(\"match\", **{field: kw}))\n\n # Add a prefix query if ``q`` is longer than one character.\n if len(q) > 1:\n should.append(Q('prefix', normalized_name=q))\n\n query = request.es.query(\"dis_max\", queries=should)\n query = query.suggest(\"name_suggestion\", q, term={\"field\": \"name\"})\n else:\n query = request.es.query()\n\n if request.params.get(\"o\"):\n query = query.sort(request.params[\"o\"])\n\n if request.params.getall(\"c\"):\n query = query.filter(\"terms\", classifiers=request.params.getall(\"c\"))\n\n page_num = int(request.params.get(\"page\", 1))\n page = ElasticsearchPage(\n query,\n page=page_num,\n url_maker=paginate_url_factory(request),\n )\n\n if page.page_count and page_num > page.page_count:\n raise HTTPNotFound\n\n available_filters = collections.defaultdict(list)\n\n for cls in request.db.query(Classifier).order_by(Classifier.classifier):\n first, *_ = cls.classifier.split(' :: ')\n available_filters[first].append(cls.classifier)\n\n return {\n \"page\": page,\n \"term\": q,\n \"order\": request.params.get(\"o\", ''),\n \"available_filters\": sorted(available_filters.items()),\n \"applied_filters\": request.params.getall(\"c\"),\n }\n\n\n@view_config(\n route_name=\"includes.current-user-indicator\",\n renderer=\"includes/current-user-indicator.html\",\n uses_session=True,\n)\ndef current_user_indicator(request):\n return {}\n\n\n@view_config(route_name=\"health\", renderer=\"string\")\ndef health(request):\n # This will ensure that we can access the database and run queries against\n # it without doing anything that will take a lock or block other queries.\n request.db.execute(\"SELECT 1\")\n\n # Nothing will actually check this, but it's a little nicer to have\n # something to return besides an empty body.\n return \"OK\"\n", "path": "warehouse/views.py"}]}
| 2,921 | 197 |
gh_patches_debug_22386
|
rasdani/github-patches
|
git_diff
|
Cloud-CV__EvalAI-1577
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Bug in last submission datetime analysis API
**IndexError:** list index out of range
**Culprit:**
/api/analytics/challenge/{challenge_pk}/challenge_phase/{challenge_phase_pk}/last_submission_datetime_analysis/
</issue>
<code>
[start of apps/analytics/views.py]
1 from datetime import timedelta
2
3 from django.utils import timezone
4
5 from rest_framework import permissions, status
6 from rest_framework.decorators import (api_view,
7 authentication_classes,
8 permission_classes,
9 throttle_classes,)
10 from rest_framework.response import Response
11 from rest_framework_expiring_authtoken.authentication import (ExpiringTokenAuthentication,)
12 from rest_framework.throttling import UserRateThrottle
13
14 from accounts.permissions import HasVerifiedEmail
15
16 from challenges.permissions import IsChallengeCreator
17 from challenges.utils import get_challenge_model, get_challenge_phase_model
18 from jobs.models import Submission
19 from jobs.serializers import (LastSubmissionDateTime,
20 LastSubmissionDateTimeSerializer,
21 SubmissionCount,
22 SubmissionCountSerializer,
23 )
24 from participants.models import Participant
25 from participants.serializers import (ParticipantCount,
26 ParticipantCountSerializer,
27 ParticipantTeamCount,
28 ParticipantTeamCountSerializer,
29 )
30 from .serializers import (ChallengePhaseSubmissionCount,
31 ChallengePhaseSubmissionCountSerializer,
32 LastSubmissionTimestamp,
33 LastSubmissionTimestampSerializer,
34 )
35
36
37 @throttle_classes([UserRateThrottle])
38 @api_view(['GET', ])
39 @permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))
40 @authentication_classes((ExpiringTokenAuthentication,))
41 def get_participant_team_count(request, challenge_pk):
42 """
43 Returns the number of participant teams in a challenge
44 """
45 challenge = get_challenge_model(challenge_pk)
46 participant_team_count = challenge.participant_teams.count()
47 participant_team_count = ParticipantTeamCount(participant_team_count)
48 serializer = ParticipantTeamCountSerializer(participant_team_count)
49 return Response(serializer.data, status=status.HTTP_200_OK)
50
51
52 @throttle_classes([UserRateThrottle])
53 @api_view(['GET', ])
54 @permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))
55 @authentication_classes((ExpiringTokenAuthentication,))
56 def get_participant_count(request, challenge_pk):
57 """
58 Returns the number of participants in a challenge
59 """
60 challenge = get_challenge_model(challenge_pk)
61 participant_teams = challenge.participant_teams.all()
62 participant_count = Participant.objects.filter(team__in=participant_teams).count()
63 participant_count = ParticipantCount(participant_count)
64 serializer = ParticipantCountSerializer(participant_count)
65 return Response(serializer.data, status=status.HTTP_200_OK)
66
67
68 @throttle_classes([UserRateThrottle])
69 @api_view(['GET', ])
70 @permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))
71 @authentication_classes((ExpiringTokenAuthentication,))
72 def get_submission_count(request, challenge_pk, duration):
73 """
74 Returns submission count for a challenge according to the duration
75 Valid values for duration are all, daily, weekly and monthly.
76 """
77 # make sure that a valid url is requested.
78 if duration.lower() not in ('all', 'daily', 'weekly', 'monthly'):
79 response_data = {'error': 'Wrong URL pattern!'}
80 return Response(response_data, status=status.HTTP_406_NOT_ACCEPTABLE)
81
82 challenge = get_challenge_model(challenge_pk)
83
84 challenge_phase_ids = challenge.challengephase_set.all().values_list('id', flat=True)
85
86 q_params = {'challenge_phase__id__in': challenge_phase_ids}
87 since_date = None
88 if duration.lower() == 'daily':
89 since_date = timezone.now().date()
90
91 elif duration.lower() == 'weekly':
92 since_date = (timezone.now() - timedelta(days=7)).date()
93
94 elif duration.lower() == 'monthly':
95 since_date = (timezone.now() - timedelta(days=30)).date()
96 # for `all` we dont need any condition in `q_params`
97 if since_date:
98 q_params['submitted_at__gte'] = since_date
99
100 submission_count = Submission.objects.filter(**q_params).count()
101 submission_count = SubmissionCount(submission_count)
102 serializer = SubmissionCountSerializer(submission_count)
103 return Response(serializer.data, status=status.HTTP_200_OK)
104
105
106 @throttle_classes([UserRateThrottle])
107 @api_view(['GET', ])
108 @permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))
109 @authentication_classes((ExpiringTokenAuthentication,))
110 def get_challenge_phase_submission_analysis(request, challenge_pk, challenge_phase_pk):
111 """
112 API to fetch
113 1. The submissions count for challenge phase.
114 2. The participated team count for challenge phase.
115 """
116 challenge = get_challenge_model(challenge_pk)
117
118 challenge_phase = get_challenge_phase_model(challenge_phase_pk)
119
120 submissions = Submission.objects.filter(
121 challenge_phase=challenge_phase, challenge_phase__challenge=challenge)
122 submission_count = submissions.count()
123 participant_team_count = submissions.values_list(
124 'participant_team', flat=True).distinct().count()
125
126 challenge_phase_submission_count = ChallengePhaseSubmissionCount(
127 submission_count, participant_team_count, challenge_phase.pk)
128 try:
129 serializer = ChallengePhaseSubmissionCountSerializer(challenge_phase_submission_count)
130 response_data = serializer.data
131 return Response(response_data, status=status.HTTP_200_OK)
132 except:
133 response_data = {'error': "Bad request. Please try again later!"}
134 return Response(response_data, status=status.HTTP_400_BAD_REQUEST)
135
136
137 @throttle_classes([UserRateThrottle])
138 @api_view(['GET', ])
139 @permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))
140 @authentication_classes((ExpiringTokenAuthentication,))
141 def get_last_submission_time(request, challenge_pk, challenge_phase_pk, submission_by):
142 """
143 Returns the last submission time for a particular challenge phase
144 """
145 challenge = get_challenge_model(challenge_pk)
146
147 challenge_phase = get_challenge_phase_model(challenge_phase_pk)
148
149 # To get the last submission time by a user in a challenge phase.
150 if submission_by == 'user':
151 last_submitted_at = Submission.objects.filter(created_by=request.user.pk,
152 challenge_phase=challenge_phase,
153 challenge_phase__challenge=challenge)
154 last_submitted_at = last_submitted_at.order_by('-submitted_at')[0].created_at
155 last_submitted_at = LastSubmissionDateTime(last_submitted_at)
156 serializer = LastSubmissionDateTimeSerializer(last_submitted_at)
157 return Response(serializer.data, status=status.HTTP_200_OK)
158
159 else:
160 response_data = {'error': 'Page not found!'}
161 return Response(response_data, status=status.HTTP_404_NOT_FOUND)
162
163
164 @throttle_classes([UserRateThrottle])
165 @api_view(['GET', ])
166 @permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))
167 @authentication_classes((ExpiringTokenAuthentication,))
168 def get_last_submission_datetime_analysis(request, challenge_pk, challenge_phase_pk):
169 """
170 API to fetch
171 1. To get the last submission time in a challenge phase.
172 2. To get the last submission time in a challenge.
173 """
174
175 challenge = get_challenge_model(challenge_pk)
176
177 challenge_phase = get_challenge_phase_model(challenge_phase_pk)
178
179 submissions = Submission.objects.filter(
180 challenge_phase__challenge=challenge)
181
182 last_submission_timestamp_in_challenge = submissions.order_by(
183 '-submitted_at')[0].created_at
184
185 last_submission_timestamp_in_challenge_phase = submissions.filter(
186 challenge_phase=challenge_phase).order_by('-submitted_at')[0].created_at
187
188 last_submission_timestamp = LastSubmissionTimestamp(
189 last_submission_timestamp_in_challenge, last_submission_timestamp_in_challenge_phase, challenge_phase.pk)
190
191 try:
192 serializer = LastSubmissionTimestampSerializer(last_submission_timestamp)
193 response_data = serializer.data
194 return Response(response_data, status=status.HTTP_200_OK)
195 except:
196 response_data = {'error': 'Bad request. Please try again later!'}
197 return Response(response_data, status=status.HTTP_400_BAD_REQUEST)
198
[end of apps/analytics/views.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/apps/analytics/views.py b/apps/analytics/views.py
--- a/apps/analytics/views.py
+++ b/apps/analytics/views.py
@@ -179,11 +179,22 @@
submissions = Submission.objects.filter(
challenge_phase__challenge=challenge)
+ if not submissions:
+ response_data = {
+ 'message': 'You dont have any submissions in this challenge!'
+ }
+ return Response(response_data, status.HTTP_200_OK)
+
last_submission_timestamp_in_challenge = submissions.order_by(
'-submitted_at')[0].created_at
- last_submission_timestamp_in_challenge_phase = submissions.filter(
- challenge_phase=challenge_phase).order_by('-submitted_at')[0].created_at
+ submissions_in_a_phase = submissions.filter(
+ challenge_phase=challenge_phase)
+
+ if not submissions_in_a_phase:
+ last_submission_timestamp_in_challenge_phase = 'You dont have any submissions in this challenge phase!'
+ else:
+ last_submission_timestamp_in_challenge_phase = submissions_in_a_phase.order_by('-submitted_at')[0].created_at
last_submission_timestamp = LastSubmissionTimestamp(
last_submission_timestamp_in_challenge, last_submission_timestamp_in_challenge_phase, challenge_phase.pk)
|
{"golden_diff": "diff --git a/apps/analytics/views.py b/apps/analytics/views.py\n--- a/apps/analytics/views.py\n+++ b/apps/analytics/views.py\n@@ -179,11 +179,22 @@\n submissions = Submission.objects.filter(\n challenge_phase__challenge=challenge)\n \n+ if not submissions:\n+ response_data = {\n+ 'message': 'You dont have any submissions in this challenge!'\n+ }\n+ return Response(response_data, status.HTTP_200_OK)\n+\n last_submission_timestamp_in_challenge = submissions.order_by(\n '-submitted_at')[0].created_at\n \n- last_submission_timestamp_in_challenge_phase = submissions.filter(\n- challenge_phase=challenge_phase).order_by('-submitted_at')[0].created_at\n+ submissions_in_a_phase = submissions.filter(\n+ challenge_phase=challenge_phase)\n+\n+ if not submissions_in_a_phase:\n+ last_submission_timestamp_in_challenge_phase = 'You dont have any submissions in this challenge phase!'\n+ else:\n+ last_submission_timestamp_in_challenge_phase = submissions_in_a_phase.order_by('-submitted_at')[0].created_at\n \n last_submission_timestamp = LastSubmissionTimestamp(\n last_submission_timestamp_in_challenge, last_submission_timestamp_in_challenge_phase, challenge_phase.pk)\n", "issue": "Bug in last submission datetime analysis API\n**IndexError:** list index out of range\r\n\r\n**Culprit:**\r\n/api/analytics/challenge/{challenge_pk}/challenge_phase/{challenge_phase_pk}/last_submission_datetime_analysis/\r\n\n", "before_files": [{"content": "from datetime import timedelta\n\nfrom django.utils import timezone\n\nfrom rest_framework import permissions, status\nfrom rest_framework.decorators import (api_view,\n authentication_classes,\n permission_classes,\n throttle_classes,)\nfrom rest_framework.response import Response\nfrom rest_framework_expiring_authtoken.authentication import (ExpiringTokenAuthentication,)\nfrom rest_framework.throttling import UserRateThrottle\n\nfrom accounts.permissions import HasVerifiedEmail\n\nfrom challenges.permissions import IsChallengeCreator\nfrom challenges.utils import get_challenge_model, get_challenge_phase_model\nfrom jobs.models import Submission\nfrom jobs.serializers import (LastSubmissionDateTime,\n LastSubmissionDateTimeSerializer,\n SubmissionCount,\n SubmissionCountSerializer,\n )\nfrom participants.models import Participant\nfrom participants.serializers import (ParticipantCount,\n ParticipantCountSerializer,\n ParticipantTeamCount,\n ParticipantTeamCountSerializer,\n )\nfrom .serializers import (ChallengePhaseSubmissionCount,\n ChallengePhaseSubmissionCountSerializer,\n LastSubmissionTimestamp,\n LastSubmissionTimestampSerializer,\n )\n\n\n@throttle_classes([UserRateThrottle])\n@api_view(['GET', ])\n@permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))\n@authentication_classes((ExpiringTokenAuthentication,))\ndef get_participant_team_count(request, challenge_pk):\n \"\"\"\n Returns the number of participant teams in a challenge\n \"\"\"\n challenge = get_challenge_model(challenge_pk)\n participant_team_count = challenge.participant_teams.count()\n participant_team_count = ParticipantTeamCount(participant_team_count)\n serializer = ParticipantTeamCountSerializer(participant_team_count)\n return Response(serializer.data, status=status.HTTP_200_OK)\n\n\n@throttle_classes([UserRateThrottle])\n@api_view(['GET', ])\n@permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))\n@authentication_classes((ExpiringTokenAuthentication,))\ndef get_participant_count(request, challenge_pk):\n \"\"\"\n Returns the number of participants in a challenge\n \"\"\"\n challenge = get_challenge_model(challenge_pk)\n participant_teams = challenge.participant_teams.all()\n participant_count = Participant.objects.filter(team__in=participant_teams).count()\n participant_count = ParticipantCount(participant_count)\n serializer = ParticipantCountSerializer(participant_count)\n return Response(serializer.data, status=status.HTTP_200_OK)\n\n\n@throttle_classes([UserRateThrottle])\n@api_view(['GET', ])\n@permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))\n@authentication_classes((ExpiringTokenAuthentication,))\ndef get_submission_count(request, challenge_pk, duration):\n \"\"\"\n Returns submission count for a challenge according to the duration\n Valid values for duration are all, daily, weekly and monthly.\n \"\"\"\n # make sure that a valid url is requested.\n if duration.lower() not in ('all', 'daily', 'weekly', 'monthly'):\n response_data = {'error': 'Wrong URL pattern!'}\n return Response(response_data, status=status.HTTP_406_NOT_ACCEPTABLE)\n\n challenge = get_challenge_model(challenge_pk)\n\n challenge_phase_ids = challenge.challengephase_set.all().values_list('id', flat=True)\n\n q_params = {'challenge_phase__id__in': challenge_phase_ids}\n since_date = None\n if duration.lower() == 'daily':\n since_date = timezone.now().date()\n\n elif duration.lower() == 'weekly':\n since_date = (timezone.now() - timedelta(days=7)).date()\n\n elif duration.lower() == 'monthly':\n since_date = (timezone.now() - timedelta(days=30)).date()\n # for `all` we dont need any condition in `q_params`\n if since_date:\n q_params['submitted_at__gte'] = since_date\n\n submission_count = Submission.objects.filter(**q_params).count()\n submission_count = SubmissionCount(submission_count)\n serializer = SubmissionCountSerializer(submission_count)\n return Response(serializer.data, status=status.HTTP_200_OK)\n\n\n@throttle_classes([UserRateThrottle])\n@api_view(['GET', ])\n@permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))\n@authentication_classes((ExpiringTokenAuthentication,))\ndef get_challenge_phase_submission_analysis(request, challenge_pk, challenge_phase_pk):\n \"\"\"\n API to fetch\n 1. The submissions count for challenge phase.\n 2. The participated team count for challenge phase.\n \"\"\"\n challenge = get_challenge_model(challenge_pk)\n\n challenge_phase = get_challenge_phase_model(challenge_phase_pk)\n\n submissions = Submission.objects.filter(\n challenge_phase=challenge_phase, challenge_phase__challenge=challenge)\n submission_count = submissions.count()\n participant_team_count = submissions.values_list(\n 'participant_team', flat=True).distinct().count()\n\n challenge_phase_submission_count = ChallengePhaseSubmissionCount(\n submission_count, participant_team_count, challenge_phase.pk)\n try:\n serializer = ChallengePhaseSubmissionCountSerializer(challenge_phase_submission_count)\n response_data = serializer.data\n return Response(response_data, status=status.HTTP_200_OK)\n except:\n response_data = {'error': \"Bad request. Please try again later!\"}\n return Response(response_data, status=status.HTTP_400_BAD_REQUEST)\n\n\n@throttle_classes([UserRateThrottle])\n@api_view(['GET', ])\n@permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))\n@authentication_classes((ExpiringTokenAuthentication,))\ndef get_last_submission_time(request, challenge_pk, challenge_phase_pk, submission_by):\n \"\"\"\n Returns the last submission time for a particular challenge phase\n \"\"\"\n challenge = get_challenge_model(challenge_pk)\n\n challenge_phase = get_challenge_phase_model(challenge_phase_pk)\n\n # To get the last submission time by a user in a challenge phase.\n if submission_by == 'user':\n last_submitted_at = Submission.objects.filter(created_by=request.user.pk,\n challenge_phase=challenge_phase,\n challenge_phase__challenge=challenge)\n last_submitted_at = last_submitted_at.order_by('-submitted_at')[0].created_at\n last_submitted_at = LastSubmissionDateTime(last_submitted_at)\n serializer = LastSubmissionDateTimeSerializer(last_submitted_at)\n return Response(serializer.data, status=status.HTTP_200_OK)\n\n else:\n response_data = {'error': 'Page not found!'}\n return Response(response_data, status=status.HTTP_404_NOT_FOUND)\n\n\n@throttle_classes([UserRateThrottle])\n@api_view(['GET', ])\n@permission_classes((permissions.IsAuthenticated, HasVerifiedEmail, IsChallengeCreator))\n@authentication_classes((ExpiringTokenAuthentication,))\ndef get_last_submission_datetime_analysis(request, challenge_pk, challenge_phase_pk):\n \"\"\"\n API to fetch\n 1. To get the last submission time in a challenge phase.\n 2. To get the last submission time in a challenge.\n \"\"\"\n\n challenge = get_challenge_model(challenge_pk)\n\n challenge_phase = get_challenge_phase_model(challenge_phase_pk)\n\n submissions = Submission.objects.filter(\n challenge_phase__challenge=challenge)\n\n last_submission_timestamp_in_challenge = submissions.order_by(\n '-submitted_at')[0].created_at\n\n last_submission_timestamp_in_challenge_phase = submissions.filter(\n challenge_phase=challenge_phase).order_by('-submitted_at')[0].created_at\n\n last_submission_timestamp = LastSubmissionTimestamp(\n last_submission_timestamp_in_challenge, last_submission_timestamp_in_challenge_phase, challenge_phase.pk)\n\n try:\n serializer = LastSubmissionTimestampSerializer(last_submission_timestamp)\n response_data = serializer.data\n return Response(response_data, status=status.HTTP_200_OK)\n except:\n response_data = {'error': 'Bad request. Please try again later!'}\n return Response(response_data, status=status.HTTP_400_BAD_REQUEST)\n", "path": "apps/analytics/views.py"}]}
| 2,703 | 265 |
gh_patches_debug_1444
|
rasdani/github-patches
|
git_diff
|
pyca__cryptography-591
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Bind X509_verify_cert_error_string
pyOpenSSL 0.14 needs this. https://github.com/pyca/pyopenssl/issues/30
</issue>
<code>
[start of cryptography/hazmat/bindings/openssl/x509.py]
1 # Licensed under the Apache License, Version 2.0 (the "License");
2 # you may not use this file except in compliance with the License.
3 # You may obtain a copy of the License at
4 #
5 # http://www.apache.org/licenses/LICENSE-2.0
6 #
7 # Unless required by applicable law or agreed to in writing, software
8 # distributed under the License is distributed on an "AS IS" BASIS,
9 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
10 # implied.
11 # See the License for the specific language governing permissions and
12 # limitations under the License.
13
14 INCLUDES = """
15 #include <openssl/ssl.h>
16
17 /*
18 * This is part of a work-around for the difficulty cffi has in dealing with
19 * `STACK_OF(foo)` as the name of a type. We invent a new, simpler name that
20 * will be an alias for this type and use the alias throughout. This works
21 * together with another opaque typedef for the same name in the TYPES section.
22 * Note that the result is an opaque type.
23 */
24 typedef STACK_OF(X509) Cryptography_STACK_OF_X509;
25 typedef STACK_OF(X509_REVOKED) Cryptography_STACK_OF_X509_REVOKED;
26 """
27
28 TYPES = """
29 typedef ... Cryptography_STACK_OF_X509;
30 typedef ... Cryptography_STACK_OF_X509_REVOKED;
31
32 typedef struct {
33 ASN1_OBJECT *algorithm;
34 ...;
35 } X509_ALGOR;
36
37 typedef struct {
38 X509_ALGOR *signature;
39 ...;
40 } X509_CINF;
41
42 typedef struct {
43 ASN1_OBJECT *object;
44 ASN1_BOOLEAN critical;
45 ASN1_OCTET_STRING *value;
46 } X509_EXTENSION;
47
48 typedef ... X509_EXTENSIONS;
49
50 typedef ... X509_REQ;
51
52 typedef struct {
53 ASN1_INTEGER *serialNumber;
54 ASN1_TIME *revocationDate;
55 X509_EXTENSIONS *extensions;
56 int sequence;
57 ...;
58 } X509_REVOKED;
59
60 typedef struct {
61 Cryptography_STACK_OF_X509_REVOKED *revoked;
62 ...;
63 } X509_CRL_INFO;
64
65 typedef struct {
66 X509_CRL_INFO *crl;
67 ...;
68 } X509_CRL;
69
70 typedef struct {
71 X509_CINF *cert_info;
72 ...;
73 } X509;
74
75 typedef ... X509_STORE;
76 typedef ... NETSCAPE_SPKI;
77 """
78
79 FUNCTIONS = """
80 X509 *X509_new(void);
81 void X509_free(X509 *);
82 X509 *X509_dup(X509 *);
83
84 int X509_print_ex(BIO *, X509 *, unsigned long, unsigned long);
85
86 int X509_set_version(X509 *, long);
87
88 EVP_PKEY *X509_get_pubkey(X509 *);
89 int X509_set_pubkey(X509 *, EVP_PKEY *);
90
91 unsigned char *X509_alias_get0(X509 *, int *);
92 int X509_sign(X509 *, EVP_PKEY *, const EVP_MD *);
93
94 int X509_digest(const X509 *, const EVP_MD *, unsigned char *, unsigned int *);
95
96 ASN1_TIME *X509_gmtime_adj(ASN1_TIME *, long);
97
98 unsigned long X509_subject_name_hash(X509 *);
99
100 X509_NAME *X509_get_subject_name(X509 *);
101 int X509_set_subject_name(X509 *, X509_NAME *);
102
103 X509_NAME *X509_get_issuer_name(X509 *);
104 int X509_set_issuer_name(X509 *, X509_NAME *);
105
106 int X509_get_ext_count(X509 *);
107 int X509_add_ext(X509 *, X509_EXTENSION *, int);
108 X509_EXTENSION *X509_EXTENSION_dup(X509_EXTENSION *);
109 X509_EXTENSION *X509_get_ext(X509 *, int);
110 int X509_EXTENSION_get_critical(X509_EXTENSION *);
111 ASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *);
112 void X509_EXTENSION_free(X509_EXTENSION *);
113
114 int X509_REQ_set_version(X509_REQ *, long);
115 X509_REQ *X509_REQ_new(void);
116 void X509_REQ_free(X509_REQ *);
117 int X509_REQ_set_pubkey(X509_REQ *, EVP_PKEY *);
118 int X509_REQ_sign(X509_REQ *, EVP_PKEY *, const EVP_MD *);
119 int X509_REQ_verify(X509_REQ *, EVP_PKEY *);
120 EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *);
121 int X509_REQ_add_extensions(X509_REQ *, X509_EXTENSIONS *);
122 X509_EXTENSIONS *X509_REQ_get_extensions(X509_REQ *);
123 int X509_REQ_print_ex(BIO *, X509_REQ *, unsigned long, unsigned long);
124
125 int X509V3_EXT_print(BIO *, X509_EXTENSION *, unsigned long, int);
126 ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *);
127
128 X509_REVOKED *X509_REVOKED_new(void);
129 void X509_REVOKED_free(X509_REVOKED *);
130
131 int X509_REVOKED_set_serialNumber(X509_REVOKED *, ASN1_INTEGER *);
132
133 int X509_REVOKED_add1_ext_i2d(X509_REVOKED *, int, void *, int, unsigned long);
134
135 X509_CRL *d2i_X509_CRL_bio(BIO *, X509_CRL **);
136 X509_CRL *X509_CRL_new(void);
137 void X509_CRL_free(X509_CRL *);
138 int X509_CRL_add0_revoked(X509_CRL *, X509_REVOKED *);
139 int i2d_X509_CRL_bio(BIO *, X509_CRL *);
140 int X509_CRL_print(BIO *, X509_CRL *);
141 int X509_CRL_set_issuer_name(X509_CRL *, X509_NAME *);
142 int X509_CRL_sign(X509_CRL *, EVP_PKEY *, const EVP_MD *);
143
144 int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *, EVP_PKEY *);
145 int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *, EVP_PKEY *, const EVP_MD *);
146 char *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *);
147 EVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *);
148 int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *, EVP_PKEY *);
149 NETSCAPE_SPKI *NETSCAPE_SPKI_new(void);
150 void NETSCAPE_SPKI_free(NETSCAPE_SPKI *);
151
152 /* ASN1 serialization */
153 int i2d_X509_bio(BIO *, X509 *);
154 X509 *d2i_X509_bio(BIO *, X509 **);
155
156 int i2d_X509_REQ_bio(BIO *, X509_REQ *);
157 X509_REQ *d2i_X509_REQ_bio(BIO *, X509_REQ **);
158
159 int i2d_PrivateKey_bio(BIO *, EVP_PKEY *);
160 EVP_PKEY *d2i_PrivateKey_bio(BIO *, EVP_PKEY **);
161
162 ASN1_INTEGER *X509_get_serialNumber(X509 *);
163 int X509_set_serialNumber(X509 *, ASN1_INTEGER *);
164
165 /* X509_STORE */
166 X509_STORE *X509_STORE_new(void);
167 void X509_STORE_free(X509_STORE *);
168 int X509_STORE_add_cert(X509_STORE *, X509 *);
169 int X509_verify_cert(X509_STORE_CTX *);
170 """
171
172 MACROS = """
173 long X509_get_version(X509 *);
174
175 ASN1_TIME *X509_get_notBefore(X509 *);
176 ASN1_TIME *X509_get_notAfter(X509 *);
177
178 long X509_REQ_get_version(X509_REQ *);
179 X509_NAME *X509_REQ_get_subject_name(X509_REQ *);
180
181 Cryptography_STACK_OF_X509 *sk_X509_new_null(void);
182 void sk_X509_free(Cryptography_STACK_OF_X509 *);
183 int sk_X509_num(Cryptography_STACK_OF_X509 *);
184 int sk_X509_push(Cryptography_STACK_OF_X509 *, X509 *);
185 X509 *sk_X509_value(Cryptography_STACK_OF_X509 *, int);
186
187 X509_EXTENSIONS *sk_X509_EXTENSION_new_null(void);
188 int sk_X509_EXTENSION_num(X509_EXTENSIONS *);
189 X509_EXTENSION *sk_X509_EXTENSION_value(X509_EXTENSIONS *, int);
190 int sk_X509_EXTENSION_push(X509_EXTENSIONS *, X509_EXTENSION *);
191 X509_EXTENSION *sk_X509_EXTENSION_delete(X509_EXTENSIONS *, int);
192 void sk_X509_EXTENSION_free(X509_EXTENSIONS *);
193
194 int sk_X509_REVOKED_num(Cryptography_STACK_OF_X509_REVOKED *);
195 X509_REVOKED *sk_X509_REVOKED_value(Cryptography_STACK_OF_X509_REVOKED *, int);
196
197 /* These aren't macros these arguments are all const X on openssl > 1.0.x */
198 int X509_CRL_set_lastUpdate(X509_CRL *, ASN1_TIME *);
199 int X509_CRL_set_nextUpdate(X509_CRL *, ASN1_TIME *);
200 """
201
202 CUSTOMIZATIONS = """
203 """
204
205 CONDITIONAL_NAMES = {}
206
[end of cryptography/hazmat/bindings/openssl/x509.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/cryptography/hazmat/bindings/openssl/x509.py b/cryptography/hazmat/bindings/openssl/x509.py
--- a/cryptography/hazmat/bindings/openssl/x509.py
+++ b/cryptography/hazmat/bindings/openssl/x509.py
@@ -167,6 +167,8 @@
void X509_STORE_free(X509_STORE *);
int X509_STORE_add_cert(X509_STORE *, X509 *);
int X509_verify_cert(X509_STORE_CTX *);
+
+const char *X509_verify_cert_error_string(long);
"""
MACROS = """
|
{"golden_diff": "diff --git a/cryptography/hazmat/bindings/openssl/x509.py b/cryptography/hazmat/bindings/openssl/x509.py\n--- a/cryptography/hazmat/bindings/openssl/x509.py\n+++ b/cryptography/hazmat/bindings/openssl/x509.py\n@@ -167,6 +167,8 @@\n void X509_STORE_free(X509_STORE *);\n int X509_STORE_add_cert(X509_STORE *, X509 *);\n int X509_verify_cert(X509_STORE_CTX *);\n+\n+const char *X509_verify_cert_error_string(long);\n \"\"\"\n \n MACROS = \"\"\"\n", "issue": "Bind X509_verify_cert_error_string\npyOpenSSL 0.14 needs this. https://github.com/pyca/pyopenssl/issues/30\n\n", "before_files": [{"content": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n# implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nINCLUDES = \"\"\"\n#include <openssl/ssl.h>\n\n/*\n * This is part of a work-around for the difficulty cffi has in dealing with\n * `STACK_OF(foo)` as the name of a type. We invent a new, simpler name that\n * will be an alias for this type and use the alias throughout. This works\n * together with another opaque typedef for the same name in the TYPES section.\n * Note that the result is an opaque type.\n */\ntypedef STACK_OF(X509) Cryptography_STACK_OF_X509;\ntypedef STACK_OF(X509_REVOKED) Cryptography_STACK_OF_X509_REVOKED;\n\"\"\"\n\nTYPES = \"\"\"\ntypedef ... Cryptography_STACK_OF_X509;\ntypedef ... Cryptography_STACK_OF_X509_REVOKED;\n\ntypedef struct {\n ASN1_OBJECT *algorithm;\n ...;\n} X509_ALGOR;\n\ntypedef struct {\n X509_ALGOR *signature;\n ...;\n} X509_CINF;\n\ntypedef struct {\n ASN1_OBJECT *object;\n ASN1_BOOLEAN critical;\n ASN1_OCTET_STRING *value;\n} X509_EXTENSION;\n\ntypedef ... X509_EXTENSIONS;\n\ntypedef ... X509_REQ;\n\ntypedef struct {\n ASN1_INTEGER *serialNumber;\n ASN1_TIME *revocationDate;\n X509_EXTENSIONS *extensions;\n int sequence;\n ...;\n} X509_REVOKED;\n\ntypedef struct {\n Cryptography_STACK_OF_X509_REVOKED *revoked;\n ...;\n} X509_CRL_INFO;\n\ntypedef struct {\n X509_CRL_INFO *crl;\n ...;\n} X509_CRL;\n\ntypedef struct {\n X509_CINF *cert_info;\n ...;\n} X509;\n\ntypedef ... X509_STORE;\ntypedef ... NETSCAPE_SPKI;\n\"\"\"\n\nFUNCTIONS = \"\"\"\nX509 *X509_new(void);\nvoid X509_free(X509 *);\nX509 *X509_dup(X509 *);\n\nint X509_print_ex(BIO *, X509 *, unsigned long, unsigned long);\n\nint X509_set_version(X509 *, long);\n\nEVP_PKEY *X509_get_pubkey(X509 *);\nint X509_set_pubkey(X509 *, EVP_PKEY *);\n\nunsigned char *X509_alias_get0(X509 *, int *);\nint X509_sign(X509 *, EVP_PKEY *, const EVP_MD *);\n\nint X509_digest(const X509 *, const EVP_MD *, unsigned char *, unsigned int *);\n\nASN1_TIME *X509_gmtime_adj(ASN1_TIME *, long);\n\nunsigned long X509_subject_name_hash(X509 *);\n\nX509_NAME *X509_get_subject_name(X509 *);\nint X509_set_subject_name(X509 *, X509_NAME *);\n\nX509_NAME *X509_get_issuer_name(X509 *);\nint X509_set_issuer_name(X509 *, X509_NAME *);\n\nint X509_get_ext_count(X509 *);\nint X509_add_ext(X509 *, X509_EXTENSION *, int);\nX509_EXTENSION *X509_EXTENSION_dup(X509_EXTENSION *);\nX509_EXTENSION *X509_get_ext(X509 *, int);\nint X509_EXTENSION_get_critical(X509_EXTENSION *);\nASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *);\nvoid X509_EXTENSION_free(X509_EXTENSION *);\n\nint X509_REQ_set_version(X509_REQ *, long);\nX509_REQ *X509_REQ_new(void);\nvoid X509_REQ_free(X509_REQ *);\nint X509_REQ_set_pubkey(X509_REQ *, EVP_PKEY *);\nint X509_REQ_sign(X509_REQ *, EVP_PKEY *, const EVP_MD *);\nint X509_REQ_verify(X509_REQ *, EVP_PKEY *);\nEVP_PKEY *X509_REQ_get_pubkey(X509_REQ *);\nint X509_REQ_add_extensions(X509_REQ *, X509_EXTENSIONS *);\nX509_EXTENSIONS *X509_REQ_get_extensions(X509_REQ *);\nint X509_REQ_print_ex(BIO *, X509_REQ *, unsigned long, unsigned long);\n\nint X509V3_EXT_print(BIO *, X509_EXTENSION *, unsigned long, int);\nASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *);\n\nX509_REVOKED *X509_REVOKED_new(void);\nvoid X509_REVOKED_free(X509_REVOKED *);\n\nint X509_REVOKED_set_serialNumber(X509_REVOKED *, ASN1_INTEGER *);\n\nint X509_REVOKED_add1_ext_i2d(X509_REVOKED *, int, void *, int, unsigned long);\n\nX509_CRL *d2i_X509_CRL_bio(BIO *, X509_CRL **);\nX509_CRL *X509_CRL_new(void);\nvoid X509_CRL_free(X509_CRL *);\nint X509_CRL_add0_revoked(X509_CRL *, X509_REVOKED *);\nint i2d_X509_CRL_bio(BIO *, X509_CRL *);\nint X509_CRL_print(BIO *, X509_CRL *);\nint X509_CRL_set_issuer_name(X509_CRL *, X509_NAME *);\nint X509_CRL_sign(X509_CRL *, EVP_PKEY *, const EVP_MD *);\n\nint NETSCAPE_SPKI_verify(NETSCAPE_SPKI *, EVP_PKEY *);\nint NETSCAPE_SPKI_sign(NETSCAPE_SPKI *, EVP_PKEY *, const EVP_MD *);\nchar *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *);\nEVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *);\nint NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *, EVP_PKEY *);\nNETSCAPE_SPKI *NETSCAPE_SPKI_new(void);\nvoid NETSCAPE_SPKI_free(NETSCAPE_SPKI *);\n\n/* ASN1 serialization */\nint i2d_X509_bio(BIO *, X509 *);\nX509 *d2i_X509_bio(BIO *, X509 **);\n\nint i2d_X509_REQ_bio(BIO *, X509_REQ *);\nX509_REQ *d2i_X509_REQ_bio(BIO *, X509_REQ **);\n\nint i2d_PrivateKey_bio(BIO *, EVP_PKEY *);\nEVP_PKEY *d2i_PrivateKey_bio(BIO *, EVP_PKEY **);\n\nASN1_INTEGER *X509_get_serialNumber(X509 *);\nint X509_set_serialNumber(X509 *, ASN1_INTEGER *);\n\n/* X509_STORE */\nX509_STORE *X509_STORE_new(void);\nvoid X509_STORE_free(X509_STORE *);\nint X509_STORE_add_cert(X509_STORE *, X509 *);\nint X509_verify_cert(X509_STORE_CTX *);\n\"\"\"\n\nMACROS = \"\"\"\nlong X509_get_version(X509 *);\n\nASN1_TIME *X509_get_notBefore(X509 *);\nASN1_TIME *X509_get_notAfter(X509 *);\n\nlong X509_REQ_get_version(X509_REQ *);\nX509_NAME *X509_REQ_get_subject_name(X509_REQ *);\n\nCryptography_STACK_OF_X509 *sk_X509_new_null(void);\nvoid sk_X509_free(Cryptography_STACK_OF_X509 *);\nint sk_X509_num(Cryptography_STACK_OF_X509 *);\nint sk_X509_push(Cryptography_STACK_OF_X509 *, X509 *);\nX509 *sk_X509_value(Cryptography_STACK_OF_X509 *, int);\n\nX509_EXTENSIONS *sk_X509_EXTENSION_new_null(void);\nint sk_X509_EXTENSION_num(X509_EXTENSIONS *);\nX509_EXTENSION *sk_X509_EXTENSION_value(X509_EXTENSIONS *, int);\nint sk_X509_EXTENSION_push(X509_EXTENSIONS *, X509_EXTENSION *);\nX509_EXTENSION *sk_X509_EXTENSION_delete(X509_EXTENSIONS *, int);\nvoid sk_X509_EXTENSION_free(X509_EXTENSIONS *);\n\nint sk_X509_REVOKED_num(Cryptography_STACK_OF_X509_REVOKED *);\nX509_REVOKED *sk_X509_REVOKED_value(Cryptography_STACK_OF_X509_REVOKED *, int);\n\n/* These aren't macros these arguments are all const X on openssl > 1.0.x */\nint X509_CRL_set_lastUpdate(X509_CRL *, ASN1_TIME *);\nint X509_CRL_set_nextUpdate(X509_CRL *, ASN1_TIME *);\n\"\"\"\n\nCUSTOMIZATIONS = \"\"\"\n\"\"\"\n\nCONDITIONAL_NAMES = {}\n", "path": "cryptography/hazmat/bindings/openssl/x509.py"}]}
| 3,299 | 149 |
gh_patches_debug_34436
|
rasdani/github-patches
|
git_diff
|
OCHA-DAP__hdx-ckan-1720
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Ebola Page: title case, please
For example, change `Appeal coverage` to `Appeal Coverage`
</issue>
<code>
[start of ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py]
1 '''
2 Created on Nov 3, 2014
3
4 @author: alexandru-m-g
5 '''
6
7 import datetime as dt
8
9 import pylons.config as config
10 import logging
11
12 import ckan.lib.base as base
13 import ckan.logic as logic
14 import ckan.model as model
15 import ckan.common as common
16 import ckan.lib.helpers as h
17
18 render = base.render
19 get_action = logic.get_action
20 c = common.c
21 request = common.request
22
23 log = logging.getLogger(__name__)
24
25
26 class CrisisController(base.BaseController):
27
28 def show(self):
29
30 context = {'model': model, 'session': model.Session,
31 'user': c.user or c.author, 'for_view': True,
32 'auth_user_obj': c.userobj}
33
34 datastore_resource_id = self._get_datastore_resource_id(
35 context, config.get('hdx.crisis.ebola_dataset', None), config.get('hdx.crisis.ebola_resource_title', None))
36 if datastore_resource_id:
37 c.top_line_items = self._get_top_line_items(
38 context, datastore_resource_id)
39
40 limit = 25
41 c.q = u'ebola'
42
43 page = int(request.params.get('page', 1))
44 data_dict = {'sort': u'metadata_modified desc',
45 'fq': '+dataset_type:dataset',
46 'rows': limit,
47 'q': c.q,
48 'start': (page - 1) * limit
49 }
50 query = get_action("package_search")(context, data_dict)
51
52 def pager_url(q=None, page=None):
53 return h.url_for('show_crisis', page=page)
54
55 c.page = h.Page(
56 collection=query['results'],
57 page=page,
58 url=pager_url,
59 item_count=query['count'],
60 items_per_page=limit
61 )
62 c.items = query['results']
63 c.item_count = query['count']
64
65 c.other_links = {}
66 c.other_links['show_more'] = h.url_for(
67 "search", **{'q': u'ebola', 'sort': u'metadata_modified desc',
68 'ext_indicator': '0'})
69
70 return render('crisis/crisis.html')
71
72 def _get_top_line_items(self, context, datastore_resource_id):
73 modified_context = dict(context)
74 modified_context['ignore_auth'] = True
75 result = get_action('datastore_search')(
76 modified_context, {'resource_id': datastore_resource_id})
77 if 'records' in result:
78 for r in result['records']:
79 d = dt.datetime.strptime(
80 r[u'latest_date'], '%Y-%m-%dT%H:%M:%S')
81 r[u'latest_date'] = dt.datetime.strftime(d, '%b %d, %Y')
82 int_value = int(r[u'value'])
83 if int_value == r[u'value']:
84 r[u'value'] = '{:,}'.format(int_value)
85 else:
86 r[u'value'] = '{:,}'.format(r[u'value'])
87 return result['records']
88 return []
89
90 def _get_datastore_resource_id(self, context, dataset_id, resource_name):
91 try:
92 modified_context = dict(context)
93 modified_context['ignore_auth'] = True
94 dataset = get_action('package_show')(
95 modified_context, {'id': dataset_id})
96
97 if 'resources' in dataset:
98 for r in dataset['resources']:
99 if 'datastore_active' in r and r['datastore_active'] \
100 and r['name'] == resource_name:
101 return r['id']
102 return None
103 except:
104 log.warning('No dataset with id ' + dataset_id)
105 return None
106
[end of ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py]
[start of ckanext-hdx_theme/ckanext/hdx_theme/version.py]
1 hdx_version = 'v0.4.7'
2
[end of ckanext-hdx_theme/ckanext/hdx_theme/version.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py b/ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py
--- a/ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py
+++ b/ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py
@@ -19,6 +19,7 @@
get_action = logic.get_action
c = common.c
request = common.request
+_ = common._
log = logging.getLogger(__name__)
@@ -69,21 +70,34 @@
return render('crisis/crisis.html')
+ def _format_results(self, result):
+ for r in result['records']:
+ d = dt.datetime.strptime(r[u'latest_date'], '%Y-%m-%dT%H:%M:%S')
+ r[u'latest_date'] = dt.datetime.strftime(d, '%b %d, %Y')
+
+ modified_value = r[u'value']
+ if r[u'units'] == 'ratio':
+ modified_value *= 100.0
+ elif r[u'units'] == 'million':
+ modified_value /= 1000000.0
+
+ int_value = int(modified_value)
+ if int_value == modified_value:
+ r[u'formatted_value'] = '{:,}'.format(int_value)
+ else:
+ if r[u'units'] == 'ratio':
+ r[u'formatted_value'] = '{:,.1f}%'.format(modified_value)
+ elif r[u'units'] == 'million':
+ r[u'formatted_value'] = '{:,.1f} '.format(modified_value)
+ r[u'formatted_value'] += ' ' + _('million')
+
def _get_top_line_items(self, context, datastore_resource_id):
modified_context = dict(context)
modified_context['ignore_auth'] = True
result = get_action('datastore_search')(
modified_context, {'resource_id': datastore_resource_id})
if 'records' in result:
- for r in result['records']:
- d = dt.datetime.strptime(
- r[u'latest_date'], '%Y-%m-%dT%H:%M:%S')
- r[u'latest_date'] = dt.datetime.strftime(d, '%b %d, %Y')
- int_value = int(r[u'value'])
- if int_value == r[u'value']:
- r[u'value'] = '{:,}'.format(int_value)
- else:
- r[u'value'] = '{:,}'.format(r[u'value'])
+ self._format_results(result)
return result['records']
return []
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
@@ -1 +1 @@
-hdx_version = 'v0.4.7'
+hdx_version = 'v0.4.8'
|
{"golden_diff": "diff --git a/ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py b/ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py\n--- a/ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py\n+++ b/ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py\n@@ -19,6 +19,7 @@\n get_action = logic.get_action\n c = common.c\n request = common.request\n+_ = common._\n \n log = logging.getLogger(__name__)\n \n@@ -69,21 +70,34 @@\n \n return render('crisis/crisis.html')\n \n+ def _format_results(self, result):\n+ for r in result['records']:\n+ d = dt.datetime.strptime(r[u'latest_date'], '%Y-%m-%dT%H:%M:%S')\n+ r[u'latest_date'] = dt.datetime.strftime(d, '%b %d, %Y')\n+\n+ modified_value = r[u'value']\n+ if r[u'units'] == 'ratio':\n+ modified_value *= 100.0\n+ elif r[u'units'] == 'million':\n+ modified_value /= 1000000.0\n+\n+ int_value = int(modified_value)\n+ if int_value == modified_value:\n+ r[u'formatted_value'] = '{:,}'.format(int_value)\n+ else:\n+ if r[u'units'] == 'ratio':\n+ r[u'formatted_value'] = '{:,.1f}%'.format(modified_value)\n+ elif r[u'units'] == 'million':\n+ r[u'formatted_value'] = '{:,.1f} '.format(modified_value)\n+ r[u'formatted_value'] += ' ' + _('million')\n+\n def _get_top_line_items(self, context, datastore_resource_id):\n modified_context = dict(context)\n modified_context['ignore_auth'] = True\n result = get_action('datastore_search')(\n modified_context, {'resource_id': datastore_resource_id})\n if 'records' in result:\n- for r in result['records']:\n- d = dt.datetime.strptime(\n- r[u'latest_date'], '%Y-%m-%dT%H:%M:%S')\n- r[u'latest_date'] = dt.datetime.strftime(d, '%b %d, %Y')\n- int_value = int(r[u'value'])\n- if int_value == r[u'value']:\n- r[u'value'] = '{:,}'.format(int_value)\n- else:\n- r[u'value'] = '{:,}'.format(r[u'value'])\n+ self._format_results(result)\n return result['records']\n return []\n \ndiff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py\n--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py\n+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py\n@@ -1 +1 @@\n-hdx_version = 'v0.4.7'\n+hdx_version = 'v0.4.8'\n", "issue": "Ebola Page: title case, please\nFor example, change `Appeal coverage` to `Appeal Coverage`\n\n\n\n", "before_files": [{"content": "'''\nCreated on Nov 3, 2014\n\n@author: alexandru-m-g\n'''\n\nimport datetime as dt\n\nimport pylons.config as config\nimport logging\n\nimport ckan.lib.base as base\nimport ckan.logic as logic\nimport ckan.model as model\nimport ckan.common as common\nimport ckan.lib.helpers as h\n\nrender = base.render\nget_action = logic.get_action\nc = common.c\nrequest = common.request\n\nlog = logging.getLogger(__name__)\n\n\nclass CrisisController(base.BaseController):\n\n def show(self):\n\n context = {'model': model, 'session': model.Session,\n 'user': c.user or c.author, 'for_view': True,\n 'auth_user_obj': c.userobj}\n\n datastore_resource_id = self._get_datastore_resource_id(\n context, config.get('hdx.crisis.ebola_dataset', None), config.get('hdx.crisis.ebola_resource_title', None))\n if datastore_resource_id:\n c.top_line_items = self._get_top_line_items(\n context, datastore_resource_id)\n\n limit = 25\n c.q = u'ebola'\n\n page = int(request.params.get('page', 1))\n data_dict = {'sort': u'metadata_modified desc',\n 'fq': '+dataset_type:dataset',\n 'rows': limit,\n 'q': c.q,\n 'start': (page - 1) * limit\n }\n query = get_action(\"package_search\")(context, data_dict)\n\n def pager_url(q=None, page=None):\n return h.url_for('show_crisis', page=page)\n\n c.page = h.Page(\n collection=query['results'],\n page=page,\n url=pager_url,\n item_count=query['count'],\n items_per_page=limit\n )\n c.items = query['results']\n c.item_count = query['count']\n\n c.other_links = {}\n c.other_links['show_more'] = h.url_for(\n \"search\", **{'q': u'ebola', 'sort': u'metadata_modified desc',\n 'ext_indicator': '0'})\n\n return render('crisis/crisis.html')\n\n def _get_top_line_items(self, context, datastore_resource_id):\n modified_context = dict(context)\n modified_context['ignore_auth'] = True\n result = get_action('datastore_search')(\n modified_context, {'resource_id': datastore_resource_id})\n if 'records' in result:\n for r in result['records']:\n d = dt.datetime.strptime(\n r[u'latest_date'], '%Y-%m-%dT%H:%M:%S')\n r[u'latest_date'] = dt.datetime.strftime(d, '%b %d, %Y')\n int_value = int(r[u'value'])\n if int_value == r[u'value']:\n r[u'value'] = '{:,}'.format(int_value)\n else:\n r[u'value'] = '{:,}'.format(r[u'value'])\n return result['records']\n return []\n\n def _get_datastore_resource_id(self, context, dataset_id, resource_name):\n try:\n modified_context = dict(context)\n modified_context['ignore_auth'] = True\n dataset = get_action('package_show')(\n modified_context, {'id': dataset_id})\n\n if 'resources' in dataset:\n for r in dataset['resources']:\n if 'datastore_active' in r and r['datastore_active'] \\\n and r['name'] == resource_name:\n return r['id']\n return None\n except:\n log.warning('No dataset with id ' + dataset_id)\n return None\n", "path": "ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py"}, {"content": "hdx_version = 'v0.4.7'\n", "path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"}]}
| 1,710 | 726 |
gh_patches_debug_14139
|
rasdani/github-patches
|
git_diff
|
readthedocs__readthedocs.org-1969
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
move to sphinx 1.3.5
sphinx 1.3.4 introduced this bug: https://github.com/sphinx-doc/sphinx/issues/2247
, which breaks builds of projects using definition lists containing regular expression like strings.
This was considered a high priority bug by the sphinx devs and was fixed with version 1.3.5.
Please move to the new version so that I can again build my docs.
</issue>
<code>
[start of readthedocs/doc_builder/python_environments.py]
1 import logging
2 import os
3 import shutil
4
5 from django.conf import settings
6
7 from readthedocs.doc_builder.config import ConfigWrapper
8 from readthedocs.doc_builder.loader import get_builder_class
9 from readthedocs.projects.constants import LOG_TEMPLATE
10
11 log = logging.getLogger(__name__)
12
13
14 class PythonEnvironment(object):
15
16 def __init__(self, version, build_env, config=None):
17 self.version = version
18 self.project = version.project
19 self.build_env = build_env
20 if config:
21 self.config = config
22 else:
23 self.config = ConfigWrapper(version=version, yaml_config={})
24 # Compute here, since it's used a lot
25 self.checkout_path = self.project.checkout_path(self.version.slug)
26
27 def _log(self, msg):
28 log.info(LOG_TEMPLATE
29 .format(project=self.project.slug,
30 version=self.version.slug,
31 msg=msg))
32
33 def delete_existing_build_dir(self):
34
35 # Handle deleting old build dir
36 build_dir = os.path.join(
37 self.venv_path(),
38 'build')
39 if os.path.exists(build_dir):
40 self._log('Removing existing build directory')
41 shutil.rmtree(build_dir)
42
43 def install_package(self):
44 setup_path = os.path.join(self.checkout_path, 'setup.py')
45 if os.path.isfile(setup_path) and self.config.install_project:
46 if getattr(settings, 'USE_PIP_INSTALL', False):
47 self.build_env.run(
48 'python',
49 self.venv_bin(filename='pip'),
50 'install',
51 '--ignore-installed',
52 '--cache-dir',
53 self.project.pip_cache_path,
54 '.',
55 cwd=self.checkout_path,
56 bin_path=self.venv_bin()
57 )
58 else:
59 self.build_env.run(
60 'python',
61 'setup.py',
62 'install',
63 '--force',
64 cwd=self.checkout_path,
65 bin_path=self.venv_bin()
66 )
67
68 def venv_bin(self, filename=None):
69 """Return path to the virtualenv bin path, or a specific binary
70
71 :param filename: If specified, add this filename to the path return
72 :returns: Path to virtualenv bin or filename in virtualenv bin
73 """
74 parts = [self.venv_path(), 'bin']
75 if filename is not None:
76 parts.append(filename)
77 return os.path.join(*parts)
78
79
80 class Virtualenv(PythonEnvironment):
81
82 def venv_path(self):
83 return os.path.join(self.project.doc_path, 'envs', self.version.slug)
84
85 def setup_base(self):
86 site_packages = '--no-site-packages'
87 if self.config.use_system_site_packages:
88 site_packages = '--system-site-packages'
89 env_path = self.venv_path()
90 self.build_env.run(
91 self.config.python_interpreter,
92 '-mvirtualenv',
93 site_packages,
94 env_path,
95 bin_path=None, # Don't use virtualenv bin that doesn't exist yet
96 )
97
98 def install_core_requirements(self):
99 requirements = [
100 'sphinx==1.3.4',
101 'Pygments==2.0.2',
102 'setuptools==18.6.1',
103 'docutils==0.12',
104 'mkdocs==0.15.0',
105 'mock==1.0.1',
106 'pillow==2.6.1',
107 'readthedocs-sphinx-ext==0.5.4',
108 'sphinx-rtd-theme==0.1.9',
109 'alabaster>=0.7,<0.8,!=0.7.5',
110 'commonmark==0.5.4',
111 'recommonmark==0.1.1',
112 ]
113
114 cmd = [
115 'python',
116 self.venv_bin(filename='pip'),
117 'install',
118 '--use-wheel',
119 '-U',
120 '--cache-dir',
121 self.project.pip_cache_path,
122 ]
123 if self.config.use_system_site_packages:
124 # Other code expects sphinx-build to be installed inside the
125 # virtualenv. Using the -I option makes sure it gets installed
126 # even if it is already installed system-wide (and
127 # --system-site-packages is used)
128 cmd.append('-I')
129 cmd.extend(requirements)
130 self.build_env.run(
131 *cmd,
132 bin_path=self.venv_bin()
133 )
134
135 def install_user_requirements(self):
136 requirements_file_path = self.config.requirements_file
137 if not requirements_file_path:
138 builder_class = get_builder_class(self.project.documentation_type)
139 docs_dir = (builder_class(build_env=self.build_env, python_env=self)
140 .docs_dir())
141 for path in [docs_dir, '']:
142 for req_file in ['pip_requirements.txt', 'requirements.txt']:
143 test_path = os.path.join(self.checkout_path, path, req_file)
144 if os.path.exists(test_path):
145 requirements_file_path = test_path
146 break
147
148 if requirements_file_path:
149 self.build_env.run(
150 'python',
151 self.venv_bin(filename='pip'),
152 'install',
153 '--exists-action=w',
154 '--cache-dir',
155 self.project.pip_cache_path,
156 '-r{0}'.format(requirements_file_path),
157 cwd=self.checkout_path,
158 bin_path=self.venv_bin()
159 )
160
161
162 class Conda(PythonEnvironment):
163
164 def venv_path(self):
165 return os.path.join(self.project.doc_path, 'conda', self.version.slug)
166
167 def setup_base(self):
168 conda_env_path = os.path.join(self.project.doc_path, 'conda')
169 version_path = os.path.join(conda_env_path, self.version.slug)
170
171 if os.path.exists(version_path):
172 # Re-create conda directory each time to keep fresh state
173 self._log('Removing existing conda directory')
174 shutil.rmtree(version_path)
175 self.build_env.run(
176 'conda',
177 'env',
178 'create',
179 '--name',
180 self.version.slug,
181 '--file',
182 self.config.conda_file,
183 bin_path=None, # Don't use conda bin that doesn't exist yet
184 )
185
186 def install_core_requirements(self):
187
188 # Use conda for requirements it packages
189 requirements = [
190 'sphinx==1.3.1',
191 'Pygments==2.0.2',
192 'docutils==0.12',
193 'mock',
194 'pillow==3.0.0',
195 'sphinx_rtd_theme==0.1.7',
196 'alabaster>=0.7,<0.8,!=0.7.5',
197 ]
198
199 cmd = [
200 'conda',
201 'install',
202 '--yes',
203 '--name',
204 self.version.slug,
205 ]
206 cmd.extend(requirements)
207 self.build_env.run(
208 *cmd
209 )
210
211 # Install pip-only things.
212 pip_requirements = [
213 'mkdocs==0.15.0',
214 'readthedocs-sphinx-ext==0.5.4',
215 'commonmark==0.5.4',
216 'recommonmark==0.1.1',
217 ]
218
219 pip_cmd = [
220 'python',
221 self.venv_bin(filename='pip'),
222 'install',
223 '-U',
224 '--cache-dir',
225 self.project.pip_cache_path,
226 ]
227 pip_cmd.extend(pip_requirements)
228 self.build_env.run(
229 *pip_cmd,
230 bin_path=self.venv_bin()
231 )
232
233 def install_user_requirements(self):
234 self.build_env.run(
235 'conda',
236 'env',
237 'update',
238 '--name',
239 self.version.slug,
240 '--file',
241 self.config.conda_file,
242 )
243
[end of readthedocs/doc_builder/python_environments.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py
--- a/readthedocs/doc_builder/python_environments.py
+++ b/readthedocs/doc_builder/python_environments.py
@@ -97,7 +97,7 @@
def install_core_requirements(self):
requirements = [
- 'sphinx==1.3.4',
+ 'sphinx==1.3.5',
'Pygments==2.0.2',
'setuptools==18.6.1',
'docutils==0.12',
@@ -187,7 +187,7 @@
# Use conda for requirements it packages
requirements = [
- 'sphinx==1.3.1',
+ 'sphinx==1.3.5',
'Pygments==2.0.2',
'docutils==0.12',
'mock',
|
{"golden_diff": "diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py\n--- a/readthedocs/doc_builder/python_environments.py\n+++ b/readthedocs/doc_builder/python_environments.py\n@@ -97,7 +97,7 @@\n \n def install_core_requirements(self):\n requirements = [\n- 'sphinx==1.3.4',\n+ 'sphinx==1.3.5',\n 'Pygments==2.0.2',\n 'setuptools==18.6.1',\n 'docutils==0.12',\n@@ -187,7 +187,7 @@\n \n # Use conda for requirements it packages\n requirements = [\n- 'sphinx==1.3.1',\n+ 'sphinx==1.3.5',\n 'Pygments==2.0.2',\n 'docutils==0.12',\n 'mock',\n", "issue": "move to sphinx 1.3.5\nsphinx 1.3.4 introduced this bug: https://github.com/sphinx-doc/sphinx/issues/2247\n, which breaks builds of projects using definition lists containing regular expression like strings.\n\nThis was considered a high priority bug by the sphinx devs and was fixed with version 1.3.5.\nPlease move to the new version so that I can again build my docs.\n\n", "before_files": [{"content": "import logging\nimport os\nimport shutil\n\nfrom django.conf import settings\n\nfrom readthedocs.doc_builder.config import ConfigWrapper\nfrom readthedocs.doc_builder.loader import get_builder_class\nfrom readthedocs.projects.constants import LOG_TEMPLATE\n\nlog = logging.getLogger(__name__)\n\n\nclass PythonEnvironment(object):\n\n def __init__(self, version, build_env, config=None):\n self.version = version\n self.project = version.project\n self.build_env = build_env\n if config:\n self.config = config\n else:\n self.config = ConfigWrapper(version=version, yaml_config={})\n # Compute here, since it's used a lot\n self.checkout_path = self.project.checkout_path(self.version.slug)\n\n def _log(self, msg):\n log.info(LOG_TEMPLATE\n .format(project=self.project.slug,\n version=self.version.slug,\n msg=msg))\n\n def delete_existing_build_dir(self):\n\n # Handle deleting old build dir\n build_dir = os.path.join(\n self.venv_path(),\n 'build')\n if os.path.exists(build_dir):\n self._log('Removing existing build directory')\n shutil.rmtree(build_dir)\n\n def install_package(self):\n setup_path = os.path.join(self.checkout_path, 'setup.py')\n if os.path.isfile(setup_path) and self.config.install_project:\n if getattr(settings, 'USE_PIP_INSTALL', False):\n self.build_env.run(\n 'python',\n self.venv_bin(filename='pip'),\n 'install',\n '--ignore-installed',\n '--cache-dir',\n self.project.pip_cache_path,\n '.',\n cwd=self.checkout_path,\n bin_path=self.venv_bin()\n )\n else:\n self.build_env.run(\n 'python',\n 'setup.py',\n 'install',\n '--force',\n cwd=self.checkout_path,\n bin_path=self.venv_bin()\n )\n\n def venv_bin(self, filename=None):\n \"\"\"Return path to the virtualenv bin path, or a specific binary\n\n :param filename: If specified, add this filename to the path return\n :returns: Path to virtualenv bin or filename in virtualenv bin\n \"\"\"\n parts = [self.venv_path(), 'bin']\n if filename is not None:\n parts.append(filename)\n return os.path.join(*parts)\n\n\nclass Virtualenv(PythonEnvironment):\n\n def venv_path(self):\n return os.path.join(self.project.doc_path, 'envs', self.version.slug)\n\n def setup_base(self):\n site_packages = '--no-site-packages'\n if self.config.use_system_site_packages:\n site_packages = '--system-site-packages'\n env_path = self.venv_path()\n self.build_env.run(\n self.config.python_interpreter,\n '-mvirtualenv',\n site_packages,\n env_path,\n bin_path=None, # Don't use virtualenv bin that doesn't exist yet\n )\n\n def install_core_requirements(self):\n requirements = [\n 'sphinx==1.3.4',\n 'Pygments==2.0.2',\n 'setuptools==18.6.1',\n 'docutils==0.12',\n 'mkdocs==0.15.0',\n 'mock==1.0.1',\n 'pillow==2.6.1',\n 'readthedocs-sphinx-ext==0.5.4',\n 'sphinx-rtd-theme==0.1.9',\n 'alabaster>=0.7,<0.8,!=0.7.5',\n 'commonmark==0.5.4',\n 'recommonmark==0.1.1',\n ]\n\n cmd = [\n 'python',\n self.venv_bin(filename='pip'),\n 'install',\n '--use-wheel',\n '-U',\n '--cache-dir',\n self.project.pip_cache_path,\n ]\n if self.config.use_system_site_packages:\n # Other code expects sphinx-build to be installed inside the\n # virtualenv. Using the -I option makes sure it gets installed\n # even if it is already installed system-wide (and\n # --system-site-packages is used)\n cmd.append('-I')\n cmd.extend(requirements)\n self.build_env.run(\n *cmd,\n bin_path=self.venv_bin()\n )\n\n def install_user_requirements(self):\n requirements_file_path = self.config.requirements_file\n if not requirements_file_path:\n builder_class = get_builder_class(self.project.documentation_type)\n docs_dir = (builder_class(build_env=self.build_env, python_env=self)\n .docs_dir())\n for path in [docs_dir, '']:\n for req_file in ['pip_requirements.txt', 'requirements.txt']:\n test_path = os.path.join(self.checkout_path, path, req_file)\n if os.path.exists(test_path):\n requirements_file_path = test_path\n break\n\n if requirements_file_path:\n self.build_env.run(\n 'python',\n self.venv_bin(filename='pip'),\n 'install',\n '--exists-action=w',\n '--cache-dir',\n self.project.pip_cache_path,\n '-r{0}'.format(requirements_file_path),\n cwd=self.checkout_path,\n bin_path=self.venv_bin()\n )\n\n\nclass Conda(PythonEnvironment):\n\n def venv_path(self):\n return os.path.join(self.project.doc_path, 'conda', self.version.slug)\n\n def setup_base(self):\n conda_env_path = os.path.join(self.project.doc_path, 'conda')\n version_path = os.path.join(conda_env_path, self.version.slug)\n\n if os.path.exists(version_path):\n # Re-create conda directory each time to keep fresh state\n self._log('Removing existing conda directory')\n shutil.rmtree(version_path)\n self.build_env.run(\n 'conda',\n 'env',\n 'create',\n '--name',\n self.version.slug,\n '--file',\n self.config.conda_file,\n bin_path=None, # Don't use conda bin that doesn't exist yet\n )\n\n def install_core_requirements(self):\n\n # Use conda for requirements it packages\n requirements = [\n 'sphinx==1.3.1',\n 'Pygments==2.0.2',\n 'docutils==0.12',\n 'mock',\n 'pillow==3.0.0',\n 'sphinx_rtd_theme==0.1.7',\n 'alabaster>=0.7,<0.8,!=0.7.5',\n ]\n\n cmd = [\n 'conda',\n 'install',\n '--yes',\n '--name',\n self.version.slug,\n ]\n cmd.extend(requirements)\n self.build_env.run(\n *cmd\n )\n\n # Install pip-only things.\n pip_requirements = [\n 'mkdocs==0.15.0',\n 'readthedocs-sphinx-ext==0.5.4',\n 'commonmark==0.5.4',\n 'recommonmark==0.1.1',\n ]\n\n pip_cmd = [\n 'python',\n self.venv_bin(filename='pip'),\n 'install',\n '-U',\n '--cache-dir',\n self.project.pip_cache_path,\n ]\n pip_cmd.extend(pip_requirements)\n self.build_env.run(\n *pip_cmd,\n bin_path=self.venv_bin()\n )\n\n def install_user_requirements(self):\n self.build_env.run(\n 'conda',\n 'env',\n 'update',\n '--name',\n self.version.slug,\n '--file',\n self.config.conda_file,\n )\n", "path": "readthedocs/doc_builder/python_environments.py"}]}
| 2,906 | 207 |
gh_patches_debug_31067
|
rasdani/github-patches
|
git_diff
|
ansible-collections__community.general-2830
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
npm: version specific updates are broken
### Summary
Reported by @shaharmor in https://github.com/ansible-collections/community.general/pull/1625#discussion_r579845916 about #1625:
> This change breaks all version specific updates because this was the way npm was checking if a specific version is installed.
>
> Before:
> `npm list --json --long [email protected]` would return `{}` if `pkg` was not installed with version `1.2.3`
>
> After
> `npm list --json --long` would return the full `pkg` info regardless of which version is installed, and this will make ansible think that the module is installed.
### Issue Type
Bug Report
### Component Name
npm
### Ansible Version
```console (paste below)
devel
```
### Configuration
_No response_
### OS / Environment
_No response_
### Steps to Reproduce
...
### Expected Results
...
### Actual Results
_No response_
### Code of Conduct
- [X] I agree to follow the Ansible Code of Conduct
</issue>
<code>
[start of plugins/modules/packaging/language/npm.py]
1 #!/usr/bin/python
2 # -*- coding: utf-8 -*-
3 # Copyright (c) 2017 Chris Hoffman <[email protected]>
4 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
5
6 from __future__ import absolute_import, division, print_function
7 __metaclass__ = type
8
9
10 DOCUMENTATION = r'''
11 ---
12 module: npm
13 short_description: Manage node.js packages with npm
14 description:
15 - Manage node.js packages with Node Package Manager (npm).
16 author: "Chris Hoffman (@chrishoffman)"
17 options:
18 name:
19 description:
20 - The name of a node.js library to install.
21 type: str
22 required: false
23 path:
24 description:
25 - The base path where to install the node.js libraries.
26 type: path
27 required: false
28 version:
29 description:
30 - The version to be installed.
31 type: str
32 required: false
33 global:
34 description:
35 - Install the node.js library globally.
36 required: false
37 default: no
38 type: bool
39 executable:
40 description:
41 - The executable location for npm.
42 - This is useful if you are using a version manager, such as nvm.
43 type: path
44 required: false
45 ignore_scripts:
46 description:
47 - Use the C(--ignore-scripts) flag when installing.
48 required: false
49 type: bool
50 default: no
51 unsafe_perm:
52 description:
53 - Use the C(--unsafe-perm) flag when installing.
54 type: bool
55 default: no
56 ci:
57 description:
58 - Install packages based on package-lock file, same as running C(npm ci).
59 type: bool
60 default: no
61 production:
62 description:
63 - Install dependencies in production mode, excluding devDependencies.
64 required: false
65 type: bool
66 default: no
67 registry:
68 description:
69 - The registry to install modules from.
70 required: false
71 type: str
72 state:
73 description:
74 - The state of the node.js library.
75 required: false
76 type: str
77 default: present
78 choices: [ "present", "absent", "latest" ]
79 no_optional:
80 description:
81 - Use the C(--no-optional) flag when installing.
82 type: bool
83 default: no
84 version_added: 2.0.0
85 no_bin_links:
86 description:
87 - Use the C(--no-bin-links) flag when installing.
88 type: bool
89 default: no
90 version_added: 2.5.0
91 requirements:
92 - npm installed in bin path (recommended /usr/local/bin)
93 '''
94
95 EXAMPLES = r'''
96 - name: Install "coffee-script" node.js package.
97 community.general.npm:
98 name: coffee-script
99 path: /app/location
100
101 - name: Install "coffee-script" node.js package on version 1.6.1.
102 community.general.npm:
103 name: coffee-script
104 version: '1.6.1'
105 path: /app/location
106
107 - name: Install "coffee-script" node.js package globally.
108 community.general.npm:
109 name: coffee-script
110 global: yes
111
112 - name: Remove the globally package "coffee-script".
113 community.general.npm:
114 name: coffee-script
115 global: yes
116 state: absent
117
118 - name: Install "coffee-script" node.js package from custom registry.
119 community.general.npm:
120 name: coffee-script
121 registry: 'http://registry.mysite.com'
122
123 - name: Install packages based on package.json.
124 community.general.npm:
125 path: /app/location
126
127 - name: Update packages based on package.json to their latest version.
128 community.general.npm:
129 path: /app/location
130 state: latest
131
132 - name: Install packages based on package.json using the npm installed with nvm v0.10.1.
133 community.general.npm:
134 path: /app/location
135 executable: /opt/nvm/v0.10.1/bin/npm
136 state: present
137 '''
138
139 import json
140 import os
141 import re
142
143 from ansible.module_utils.basic import AnsibleModule
144 from ansible.module_utils._text import to_native
145
146
147 class Npm(object):
148 def __init__(self, module, **kwargs):
149 self.module = module
150 self.glbl = kwargs['glbl']
151 self.name = kwargs['name']
152 self.version = kwargs['version']
153 self.path = kwargs['path']
154 self.registry = kwargs['registry']
155 self.production = kwargs['production']
156 self.ignore_scripts = kwargs['ignore_scripts']
157 self.unsafe_perm = kwargs['unsafe_perm']
158 self.state = kwargs['state']
159 self.no_optional = kwargs['no_optional']
160 self.no_bin_links = kwargs['no_bin_links']
161
162 if kwargs['executable']:
163 self.executable = kwargs['executable'].split(' ')
164 else:
165 self.executable = [module.get_bin_path('npm', True)]
166
167 if kwargs['version'] and self.state != 'absent':
168 self.name_version = self.name + '@' + str(self.version)
169 else:
170 self.name_version = self.name
171
172 def _exec(self, args, run_in_check_mode=False, check_rc=True, add_package_name=True):
173 if not self.module.check_mode or (self.module.check_mode and run_in_check_mode):
174 cmd = self.executable + args
175
176 if self.glbl:
177 cmd.append('--global')
178 if self.production and ('install' in cmd or 'update' in cmd):
179 cmd.append('--production')
180 if self.ignore_scripts:
181 cmd.append('--ignore-scripts')
182 if self.unsafe_perm:
183 cmd.append('--unsafe-perm')
184 if self.name and add_package_name:
185 cmd.append(self.name_version)
186 if self.registry:
187 cmd.append('--registry')
188 cmd.append(self.registry)
189 if self.no_optional:
190 cmd.append('--no-optional')
191 if self.no_bin_links:
192 cmd.append('--no-bin-links')
193
194 # If path is specified, cd into that path and run the command.
195 cwd = None
196 if self.path:
197 if not os.path.exists(self.path):
198 os.makedirs(self.path)
199 if not os.path.isdir(self.path):
200 self.module.fail_json(msg="path %s is not a directory" % self.path)
201 cwd = self.path
202
203 rc, out, err = self.module.run_command(cmd, check_rc=check_rc, cwd=cwd)
204 return out
205 return ''
206
207 def list(self):
208 cmd = ['list', '--json', '--long']
209
210 installed = list()
211 missing = list()
212 data = {}
213 try:
214 data = json.loads(self._exec(cmd, True, False, False) or '{}')
215 except (getattr(json, 'JSONDecodeError', ValueError)) as e:
216 self.module.fail_json(msg="Failed to parse NPM output with error %s" % to_native(e))
217 if 'dependencies' in data:
218 for dep in data['dependencies']:
219 if 'missing' in data['dependencies'][dep] and data['dependencies'][dep]['missing']:
220 missing.append(dep)
221 elif 'invalid' in data['dependencies'][dep] and data['dependencies'][dep]['invalid']:
222 missing.append(dep)
223 else:
224 installed.append(dep)
225 if self.name and self.name not in installed:
226 missing.append(self.name)
227 # Named dependency not installed
228 else:
229 missing.append(self.name)
230
231 return installed, missing
232
233 def install(self):
234 return self._exec(['install'])
235
236 def ci_install(self):
237 return self._exec(['ci'])
238
239 def update(self):
240 return self._exec(['update'])
241
242 def uninstall(self):
243 return self._exec(['uninstall'])
244
245 def list_outdated(self):
246 outdated = list()
247 data = self._exec(['outdated'], True, False)
248 for dep in data.splitlines():
249 if dep:
250 # node.js v0.10.22 changed the `npm outdated` module separator
251 # from "@" to " ". Split on both for backwards compatibility.
252 pkg, other = re.split(r'\s|@', dep, 1)
253 outdated.append(pkg)
254
255 return outdated
256
257
258 def main():
259 arg_spec = dict(
260 name=dict(default=None, type='str'),
261 path=dict(default=None, type='path'),
262 version=dict(default=None, type='str'),
263 production=dict(default=False, type='bool'),
264 executable=dict(default=None, type='path'),
265 registry=dict(default=None, type='str'),
266 state=dict(default='present', choices=['present', 'absent', 'latest']),
267 ignore_scripts=dict(default=False, type='bool'),
268 unsafe_perm=dict(default=False, type='bool'),
269 ci=dict(default=False, type='bool'),
270 no_optional=dict(default=False, type='bool'),
271 no_bin_links=dict(default=False, type='bool'),
272 )
273 arg_spec['global'] = dict(default=False, type='bool')
274 module = AnsibleModule(
275 argument_spec=arg_spec,
276 supports_check_mode=True
277 )
278
279 name = module.params['name']
280 path = module.params['path']
281 version = module.params['version']
282 glbl = module.params['global']
283 production = module.params['production']
284 executable = module.params['executable']
285 registry = module.params['registry']
286 state = module.params['state']
287 ignore_scripts = module.params['ignore_scripts']
288 unsafe_perm = module.params['unsafe_perm']
289 ci = module.params['ci']
290 no_optional = module.params['no_optional']
291 no_bin_links = module.params['no_bin_links']
292
293 if not path and not glbl:
294 module.fail_json(msg='path must be specified when not using global')
295 if state == 'absent' and not name:
296 module.fail_json(msg='uninstalling a package is only available for named packages')
297
298 npm = Npm(module, name=name, path=path, version=version, glbl=glbl, production=production,
299 executable=executable, registry=registry, ignore_scripts=ignore_scripts,
300 unsafe_perm=unsafe_perm, state=state, no_optional=no_optional, no_bin_links=no_bin_links)
301
302 changed = False
303 if ci:
304 npm.ci_install()
305 changed = True
306 elif state == 'present':
307 installed, missing = npm.list()
308 if missing:
309 changed = True
310 npm.install()
311 elif state == 'latest':
312 installed, missing = npm.list()
313 outdated = npm.list_outdated()
314 if missing:
315 changed = True
316 npm.install()
317 if outdated:
318 changed = True
319 npm.update()
320 else: # absent
321 installed, missing = npm.list()
322 if name in installed:
323 changed = True
324 npm.uninstall()
325
326 module.exit_json(changed=changed)
327
328
329 if __name__ == '__main__':
330 main()
331
[end of plugins/modules/packaging/language/npm.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/plugins/modules/packaging/language/npm.py b/plugins/modules/packaging/language/npm.py
--- a/plugins/modules/packaging/language/npm.py
+++ b/plugins/modules/packaging/language/npm.py
@@ -181,7 +181,7 @@
cmd.append('--ignore-scripts')
if self.unsafe_perm:
cmd.append('--unsafe-perm')
- if self.name and add_package_name:
+ if self.name_version and add_package_name:
cmd.append(self.name_version)
if self.registry:
cmd.append('--registry')
@@ -215,14 +215,17 @@
except (getattr(json, 'JSONDecodeError', ValueError)) as e:
self.module.fail_json(msg="Failed to parse NPM output with error %s" % to_native(e))
if 'dependencies' in data:
- for dep in data['dependencies']:
- if 'missing' in data['dependencies'][dep] and data['dependencies'][dep]['missing']:
+ for dep, props in data['dependencies'].items():
+ dep_version = dep + '@' + str(props['version'])
+
+ if 'missing' in props and props['missing']:
missing.append(dep)
- elif 'invalid' in data['dependencies'][dep] and data['dependencies'][dep]['invalid']:
+ elif 'invalid' in props and props['invalid']:
missing.append(dep)
else:
installed.append(dep)
- if self.name and self.name not in installed:
+ installed.append(dep_version)
+ if self.name_version and self.name_version not in installed:
missing.append(self.name)
# Named dependency not installed
else:
|
{"golden_diff": "diff --git a/plugins/modules/packaging/language/npm.py b/plugins/modules/packaging/language/npm.py\n--- a/plugins/modules/packaging/language/npm.py\n+++ b/plugins/modules/packaging/language/npm.py\n@@ -181,7 +181,7 @@\n cmd.append('--ignore-scripts')\n if self.unsafe_perm:\n cmd.append('--unsafe-perm')\n- if self.name and add_package_name:\n+ if self.name_version and add_package_name:\n cmd.append(self.name_version)\n if self.registry:\n cmd.append('--registry')\n@@ -215,14 +215,17 @@\n except (getattr(json, 'JSONDecodeError', ValueError)) as e:\n self.module.fail_json(msg=\"Failed to parse NPM output with error %s\" % to_native(e))\n if 'dependencies' in data:\n- for dep in data['dependencies']:\n- if 'missing' in data['dependencies'][dep] and data['dependencies'][dep]['missing']:\n+ for dep, props in data['dependencies'].items():\n+ dep_version = dep + '@' + str(props['version'])\n+\n+ if 'missing' in props and props['missing']:\n missing.append(dep)\n- elif 'invalid' in data['dependencies'][dep] and data['dependencies'][dep]['invalid']:\n+ elif 'invalid' in props and props['invalid']:\n missing.append(dep)\n else:\n installed.append(dep)\n- if self.name and self.name not in installed:\n+ installed.append(dep_version)\n+ if self.name_version and self.name_version not in installed:\n missing.append(self.name)\n # Named dependency not installed\n else:\n", "issue": "npm: version specific updates are broken\n### Summary\n\nReported by @shaharmor in https://github.com/ansible-collections/community.general/pull/1625#discussion_r579845916 about #1625:\r\n\r\n> This change breaks all version specific updates because this was the way npm was checking if a specific version is installed.\r\n> \r\n> Before:\r\n> `npm list --json --long [email protected]` would return `{}` if `pkg` was not installed with version `1.2.3`\r\n> \r\n> After\r\n> `npm list --json --long` would return the full `pkg` info regardless of which version is installed, and this will make ansible think that the module is installed.\r\n \n\n### Issue Type\n\nBug Report\n\n### Component Name\n\nnpm\n\n### Ansible Version\n\n```console (paste below)\r\ndevel\r\n```\r\n\n\n### Configuration\n\n_No response_\n\n### OS / Environment\n\n_No response_\n\n### Steps to Reproduce\n\n...\n\n### Expected Results\n\n...\n\n### Actual Results\n\n_No response_\n\n### Code of Conduct\n\n- [X] I agree to follow the Ansible Code of Conduct\n", "before_files": [{"content": "#!/usr/bin/python\n# -*- coding: utf-8 -*-\n# Copyright (c) 2017 Chris Hoffman <[email protected]>\n# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)\n\nfrom __future__ import absolute_import, division, print_function\n__metaclass__ = type\n\n\nDOCUMENTATION = r'''\n---\nmodule: npm\nshort_description: Manage node.js packages with npm\ndescription:\n - Manage node.js packages with Node Package Manager (npm).\nauthor: \"Chris Hoffman (@chrishoffman)\"\noptions:\n name:\n description:\n - The name of a node.js library to install.\n type: str\n required: false\n path:\n description:\n - The base path where to install the node.js libraries.\n type: path\n required: false\n version:\n description:\n - The version to be installed.\n type: str\n required: false\n global:\n description:\n - Install the node.js library globally.\n required: false\n default: no\n type: bool\n executable:\n description:\n - The executable location for npm.\n - This is useful if you are using a version manager, such as nvm.\n type: path\n required: false\n ignore_scripts:\n description:\n - Use the C(--ignore-scripts) flag when installing.\n required: false\n type: bool\n default: no\n unsafe_perm:\n description:\n - Use the C(--unsafe-perm) flag when installing.\n type: bool\n default: no\n ci:\n description:\n - Install packages based on package-lock file, same as running C(npm ci).\n type: bool\n default: no\n production:\n description:\n - Install dependencies in production mode, excluding devDependencies.\n required: false\n type: bool\n default: no\n registry:\n description:\n - The registry to install modules from.\n required: false\n type: str\n state:\n description:\n - The state of the node.js library.\n required: false\n type: str\n default: present\n choices: [ \"present\", \"absent\", \"latest\" ]\n no_optional:\n description:\n - Use the C(--no-optional) flag when installing.\n type: bool\n default: no\n version_added: 2.0.0\n no_bin_links:\n description:\n - Use the C(--no-bin-links) flag when installing.\n type: bool\n default: no\n version_added: 2.5.0\nrequirements:\n - npm installed in bin path (recommended /usr/local/bin)\n'''\n\nEXAMPLES = r'''\n- name: Install \"coffee-script\" node.js package.\n community.general.npm:\n name: coffee-script\n path: /app/location\n\n- name: Install \"coffee-script\" node.js package on version 1.6.1.\n community.general.npm:\n name: coffee-script\n version: '1.6.1'\n path: /app/location\n\n- name: Install \"coffee-script\" node.js package globally.\n community.general.npm:\n name: coffee-script\n global: yes\n\n- name: Remove the globally package \"coffee-script\".\n community.general.npm:\n name: coffee-script\n global: yes\n state: absent\n\n- name: Install \"coffee-script\" node.js package from custom registry.\n community.general.npm:\n name: coffee-script\n registry: 'http://registry.mysite.com'\n\n- name: Install packages based on package.json.\n community.general.npm:\n path: /app/location\n\n- name: Update packages based on package.json to their latest version.\n community.general.npm:\n path: /app/location\n state: latest\n\n- name: Install packages based on package.json using the npm installed with nvm v0.10.1.\n community.general.npm:\n path: /app/location\n executable: /opt/nvm/v0.10.1/bin/npm\n state: present\n'''\n\nimport json\nimport os\nimport re\n\nfrom ansible.module_utils.basic import AnsibleModule\nfrom ansible.module_utils._text import to_native\n\n\nclass Npm(object):\n def __init__(self, module, **kwargs):\n self.module = module\n self.glbl = kwargs['glbl']\n self.name = kwargs['name']\n self.version = kwargs['version']\n self.path = kwargs['path']\n self.registry = kwargs['registry']\n self.production = kwargs['production']\n self.ignore_scripts = kwargs['ignore_scripts']\n self.unsafe_perm = kwargs['unsafe_perm']\n self.state = kwargs['state']\n self.no_optional = kwargs['no_optional']\n self.no_bin_links = kwargs['no_bin_links']\n\n if kwargs['executable']:\n self.executable = kwargs['executable'].split(' ')\n else:\n self.executable = [module.get_bin_path('npm', True)]\n\n if kwargs['version'] and self.state != 'absent':\n self.name_version = self.name + '@' + str(self.version)\n else:\n self.name_version = self.name\n\n def _exec(self, args, run_in_check_mode=False, check_rc=True, add_package_name=True):\n if not self.module.check_mode or (self.module.check_mode and run_in_check_mode):\n cmd = self.executable + args\n\n if self.glbl:\n cmd.append('--global')\n if self.production and ('install' in cmd or 'update' in cmd):\n cmd.append('--production')\n if self.ignore_scripts:\n cmd.append('--ignore-scripts')\n if self.unsafe_perm:\n cmd.append('--unsafe-perm')\n if self.name and add_package_name:\n cmd.append(self.name_version)\n if self.registry:\n cmd.append('--registry')\n cmd.append(self.registry)\n if self.no_optional:\n cmd.append('--no-optional')\n if self.no_bin_links:\n cmd.append('--no-bin-links')\n\n # If path is specified, cd into that path and run the command.\n cwd = None\n if self.path:\n if not os.path.exists(self.path):\n os.makedirs(self.path)\n if not os.path.isdir(self.path):\n self.module.fail_json(msg=\"path %s is not a directory\" % self.path)\n cwd = self.path\n\n rc, out, err = self.module.run_command(cmd, check_rc=check_rc, cwd=cwd)\n return out\n return ''\n\n def list(self):\n cmd = ['list', '--json', '--long']\n\n installed = list()\n missing = list()\n data = {}\n try:\n data = json.loads(self._exec(cmd, True, False, False) or '{}')\n except (getattr(json, 'JSONDecodeError', ValueError)) as e:\n self.module.fail_json(msg=\"Failed to parse NPM output with error %s\" % to_native(e))\n if 'dependencies' in data:\n for dep in data['dependencies']:\n if 'missing' in data['dependencies'][dep] and data['dependencies'][dep]['missing']:\n missing.append(dep)\n elif 'invalid' in data['dependencies'][dep] and data['dependencies'][dep]['invalid']:\n missing.append(dep)\n else:\n installed.append(dep)\n if self.name and self.name not in installed:\n missing.append(self.name)\n # Named dependency not installed\n else:\n missing.append(self.name)\n\n return installed, missing\n\n def install(self):\n return self._exec(['install'])\n\n def ci_install(self):\n return self._exec(['ci'])\n\n def update(self):\n return self._exec(['update'])\n\n def uninstall(self):\n return self._exec(['uninstall'])\n\n def list_outdated(self):\n outdated = list()\n data = self._exec(['outdated'], True, False)\n for dep in data.splitlines():\n if dep:\n # node.js v0.10.22 changed the `npm outdated` module separator\n # from \"@\" to \" \". Split on both for backwards compatibility.\n pkg, other = re.split(r'\\s|@', dep, 1)\n outdated.append(pkg)\n\n return outdated\n\n\ndef main():\n arg_spec = dict(\n name=dict(default=None, type='str'),\n path=dict(default=None, type='path'),\n version=dict(default=None, type='str'),\n production=dict(default=False, type='bool'),\n executable=dict(default=None, type='path'),\n registry=dict(default=None, type='str'),\n state=dict(default='present', choices=['present', 'absent', 'latest']),\n ignore_scripts=dict(default=False, type='bool'),\n unsafe_perm=dict(default=False, type='bool'),\n ci=dict(default=False, type='bool'),\n no_optional=dict(default=False, type='bool'),\n no_bin_links=dict(default=False, type='bool'),\n )\n arg_spec['global'] = dict(default=False, type='bool')\n module = AnsibleModule(\n argument_spec=arg_spec,\n supports_check_mode=True\n )\n\n name = module.params['name']\n path = module.params['path']\n version = module.params['version']\n glbl = module.params['global']\n production = module.params['production']\n executable = module.params['executable']\n registry = module.params['registry']\n state = module.params['state']\n ignore_scripts = module.params['ignore_scripts']\n unsafe_perm = module.params['unsafe_perm']\n ci = module.params['ci']\n no_optional = module.params['no_optional']\n no_bin_links = module.params['no_bin_links']\n\n if not path and not glbl:\n module.fail_json(msg='path must be specified when not using global')\n if state == 'absent' and not name:\n module.fail_json(msg='uninstalling a package is only available for named packages')\n\n npm = Npm(module, name=name, path=path, version=version, glbl=glbl, production=production,\n executable=executable, registry=registry, ignore_scripts=ignore_scripts,\n unsafe_perm=unsafe_perm, state=state, no_optional=no_optional, no_bin_links=no_bin_links)\n\n changed = False\n if ci:\n npm.ci_install()\n changed = True\n elif state == 'present':\n installed, missing = npm.list()\n if missing:\n changed = True\n npm.install()\n elif state == 'latest':\n installed, missing = npm.list()\n outdated = npm.list_outdated()\n if missing:\n changed = True\n npm.install()\n if outdated:\n changed = True\n npm.update()\n else: # absent\n installed, missing = npm.list()\n if name in installed:\n changed = True\n npm.uninstall()\n\n module.exit_json(changed=changed)\n\n\nif __name__ == '__main__':\n main()\n", "path": "plugins/modules/packaging/language/npm.py"}]}
| 4,034 | 357 |
gh_patches_debug_31493
|
rasdani/github-patches
|
git_diff
|
akvo__akvo-rsr-2120
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Employment application requires Django login
## Test plan
GIVEN the `/rest/v1/user/../request_organisation/` endpoint
WHEN POSTing a request from outside of RSR
AND the correct authentication details are provided
THEN the request should be process accordingly, instead trying to authenticate through Django's auth system
## Issue description
Just as for #2037, when posting a request for employment to the /rest/v1/user/request_organisation/ endpoint, a Django login is required, which is not the case for the rest of the API; an API key should be sufficient.
</issue>
<code>
[start of akvo/rest/views/user.py]
1 # -*- coding: utf-8 -*-
2 """Akvo RSR is covered by the GNU Affero General Public License.
3
4 See more details in the license.txt file located at the root folder of the Akvo RSR module.
5 For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
6 """
7
8 from django.contrib.auth import get_user_model
9 from django.db import IntegrityError
10 from django.utils.translation import ugettext_lazy as _
11
12 from rest_framework import status
13 from rest_framework.decorators import api_view, permission_classes
14 from rest_framework.exceptions import PermissionDenied
15 from rest_framework.response import Response
16
17 from ...rsr.models import Country, Employment, Organisation
18 from ..viewsets import BaseRSRViewSet
19 from ..serializers import EmploymentSerializer, OrganisationSerializer, CountrySerializer
20 from ..serializers import UserSerializer, UserDetailsSerializer, UserPasswordSerializer
21
22
23 class UserViewSet(BaseRSRViewSet):
24
25 """User resource."""
26
27 queryset = get_user_model().objects.select_related(
28 'organisation',
29 'organisation__primary_location',
30 'organisation__primary_location__country',
31 'organisation__primary_location__location_target',
32 'organisation__primary_location__location_target__internal_org_ids',
33 ).prefetch_related(
34 'organisations',
35 'organisations__primary_location',
36 'organisations__primary_location__country',
37 'organisations__primary_location__location_target',)
38 serializer_class = UserSerializer
39 filter_fields = ('username', 'email', 'first_name', 'last_name', 'is_active', 'is_staff',
40 'is_admin')
41
42
43 @api_view(['POST'])
44 def change_password(request, pk=None):
45 # Get the user, or return an error if the user does not exist
46 try:
47 user = get_user_model().objects.get(pk=pk)
48 except get_user_model().DoesNotExist:
49 return Response({'user': _('User does not exist')}, status=status.HTTP_400_BAD_REQUEST)
50
51 # Users are only allowed to edit their own details
52 request_user = getattr(request, 'user', None)
53 if not user == request_user:
54 raise PermissionDenied()
55
56 # Process request
57 serializer = UserPasswordSerializer(data=request.DATA, instance=user)
58 if serializer.is_valid():
59 user.set_password(serializer.data['new_password2'])
60 user.save()
61 return Response({'status': 'password set'})
62 else:
63 return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
64
65
66 @api_view(['POST'])
67 def update_details(request, pk=None):
68 # Get the user, or return an error if the user does not exist
69 try:
70 user = get_user_model().objects.get(pk=pk)
71 except get_user_model().DoesNotExist:
72 return Response({'user': _('User does not exist')}, status=status.HTTP_400_BAD_REQUEST)
73
74 # Users are only allowed to edit their own details
75 request_user = getattr(request, 'user', None)
76 if not user == request_user:
77 raise PermissionDenied()
78
79 # Process request
80 serializer = UserDetailsSerializer(data=request.DATA, instance=user)
81 if serializer.is_valid():
82 user.first_name = serializer.data['first_name']
83 user.last_name = serializer.data['last_name']
84 user.save()
85 return Response(request.DATA)
86 else:
87 return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
88
89
90 @api_view(['POST'])
91 def request_organisation(request, pk=None):
92 # Get the user, or return an error if the user does not exist
93 try:
94 user = get_user_model().objects.get(pk=pk)
95 except get_user_model().DoesNotExist:
96 return Response({'user': _('User does not exist')}, status=status.HTTP_400_BAD_REQUEST)
97
98 # Users themselves are only allowed to request to join an organisation
99 request_user = getattr(request, 'user', None)
100 if not user == request_user:
101 raise PermissionDenied()
102 request.DATA['user'] = pk
103
104 # Process request
105 serializer = EmploymentSerializer(data=request.DATA)
106 if serializer.is_valid():
107 try:
108 organisation = Organisation.objects.get(pk=serializer.data['organisation'])
109 if serializer.data['country']:
110 country = Country.objects.get(pk=serializer.data['country'])
111 else:
112 country = None
113 employment = Employment(
114 user=user,
115 organisation=organisation,
116 country=country,
117 job_title=serializer.data['job_title'],
118 is_approved=False,
119 )
120 employment.save()
121 except IntegrityError:
122 return Response({'detail': _(u'User already linked to this organisation')},
123 status=status.HTTP_409_CONFLICT)
124
125 serializer.data['country_full'] = CountrySerializer(country).data
126 serializer.data['organisation_full'] = OrganisationSerializer(organisation).data
127 serializer.data['id'] = employment.pk
128
129 return Response(serializer.data)
130 else:
131 return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
132
[end of akvo/rest/views/user.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/akvo/rest/views/user.py b/akvo/rest/views/user.py
--- a/akvo/rest/views/user.py
+++ b/akvo/rest/views/user.py
@@ -10,10 +10,12 @@
from django.utils.translation import ugettext_lazy as _
from rest_framework import status
-from rest_framework.decorators import api_view, permission_classes
+from rest_framework.authentication import SessionAuthentication
+from rest_framework.decorators import api_view, permission_classes, authentication_classes
from rest_framework.exceptions import PermissionDenied
from rest_framework.response import Response
+from akvo.rest.models import TastyTokenAuthentication
from ...rsr.models import Country, Employment, Organisation
from ..viewsets import BaseRSRViewSet
from ..serializers import EmploymentSerializer, OrganisationSerializer, CountrySerializer
@@ -88,16 +90,19 @@
@api_view(['POST'])
+@authentication_classes([SessionAuthentication, TastyTokenAuthentication])
def request_organisation(request, pk=None):
+
# Get the user, or return an error if the user does not exist
try:
- user = get_user_model().objects.get(pk=pk)
+ user_by_pk = get_user_model().objects.get(pk=pk)
except get_user_model().DoesNotExist:
return Response({'user': _('User does not exist')}, status=status.HTTP_400_BAD_REQUEST)
+ # request.user is the user identified by the auth token
+ user = request.user
# Users themselves are only allowed to request to join an organisation
- request_user = getattr(request, 'user', None)
- if not user == request_user:
+ if not user_by_pk == request.user:
raise PermissionDenied()
request.DATA['user'] = pk
|
{"golden_diff": "diff --git a/akvo/rest/views/user.py b/akvo/rest/views/user.py\n--- a/akvo/rest/views/user.py\n+++ b/akvo/rest/views/user.py\n@@ -10,10 +10,12 @@\n from django.utils.translation import ugettext_lazy as _\n \n from rest_framework import status\n-from rest_framework.decorators import api_view, permission_classes\n+from rest_framework.authentication import SessionAuthentication\n+from rest_framework.decorators import api_view, permission_classes, authentication_classes\n from rest_framework.exceptions import PermissionDenied\n from rest_framework.response import Response\n \n+from akvo.rest.models import TastyTokenAuthentication\n from ...rsr.models import Country, Employment, Organisation\n from ..viewsets import BaseRSRViewSet\n from ..serializers import EmploymentSerializer, OrganisationSerializer, CountrySerializer\n@@ -88,16 +90,19 @@\n \n \n @api_view(['POST'])\n+@authentication_classes([SessionAuthentication, TastyTokenAuthentication])\n def request_organisation(request, pk=None):\n+\n # Get the user, or return an error if the user does not exist\n try:\n- user = get_user_model().objects.get(pk=pk)\n+ user_by_pk = get_user_model().objects.get(pk=pk)\n except get_user_model().DoesNotExist:\n return Response({'user': _('User does not exist')}, status=status.HTTP_400_BAD_REQUEST)\n \n+ # request.user is the user identified by the auth token\n+ user = request.user\n # Users themselves are only allowed to request to join an organisation\n- request_user = getattr(request, 'user', None)\n- if not user == request_user:\n+ if not user_by_pk == request.user:\n raise PermissionDenied()\n request.DATA['user'] = pk\n", "issue": "Employment application requires Django login\n## Test plan\n\nGIVEN the `/rest/v1/user/../request_organisation/` endpoint\nWHEN POSTing a request from outside of RSR\nAND the correct authentication details are provided\nTHEN the request should be process accordingly, instead trying to authenticate through Django's auth system\n## Issue description\n\nJust as for #2037, when posting a request for employment to the /rest/v1/user/request_organisation/ endpoint, a Django login is required, which is not the case for the rest of the API; an API key should be sufficient.\n\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n\"\"\"Akvo RSR is covered by the GNU Affero General Public License.\n\nSee more details in the license.txt file located at the root folder of the Akvo RSR module.\nFor additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.\n\"\"\"\n\nfrom django.contrib.auth import get_user_model\nfrom django.db import IntegrityError\nfrom django.utils.translation import ugettext_lazy as _\n\nfrom rest_framework import status\nfrom rest_framework.decorators import api_view, permission_classes\nfrom rest_framework.exceptions import PermissionDenied\nfrom rest_framework.response import Response\n\nfrom ...rsr.models import Country, Employment, Organisation\nfrom ..viewsets import BaseRSRViewSet\nfrom ..serializers import EmploymentSerializer, OrganisationSerializer, CountrySerializer\nfrom ..serializers import UserSerializer, UserDetailsSerializer, UserPasswordSerializer\n\n\nclass UserViewSet(BaseRSRViewSet):\n\n \"\"\"User resource.\"\"\"\n\n queryset = get_user_model().objects.select_related(\n 'organisation',\n 'organisation__primary_location',\n 'organisation__primary_location__country',\n 'organisation__primary_location__location_target',\n 'organisation__primary_location__location_target__internal_org_ids',\n ).prefetch_related(\n 'organisations',\n 'organisations__primary_location',\n 'organisations__primary_location__country',\n 'organisations__primary_location__location_target',)\n serializer_class = UserSerializer\n filter_fields = ('username', 'email', 'first_name', 'last_name', 'is_active', 'is_staff',\n 'is_admin')\n\n\n@api_view(['POST'])\ndef change_password(request, pk=None):\n # Get the user, or return an error if the user does not exist\n try:\n user = get_user_model().objects.get(pk=pk)\n except get_user_model().DoesNotExist:\n return Response({'user': _('User does not exist')}, status=status.HTTP_400_BAD_REQUEST)\n\n # Users are only allowed to edit their own details\n request_user = getattr(request, 'user', None)\n if not user == request_user:\n raise PermissionDenied()\n\n # Process request\n serializer = UserPasswordSerializer(data=request.DATA, instance=user)\n if serializer.is_valid():\n user.set_password(serializer.data['new_password2'])\n user.save()\n return Response({'status': 'password set'})\n else:\n return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)\n\n\n@api_view(['POST'])\ndef update_details(request, pk=None):\n # Get the user, or return an error if the user does not exist\n try:\n user = get_user_model().objects.get(pk=pk)\n except get_user_model().DoesNotExist:\n return Response({'user': _('User does not exist')}, status=status.HTTP_400_BAD_REQUEST)\n\n # Users are only allowed to edit their own details\n request_user = getattr(request, 'user', None)\n if not user == request_user:\n raise PermissionDenied()\n\n # Process request\n serializer = UserDetailsSerializer(data=request.DATA, instance=user)\n if serializer.is_valid():\n user.first_name = serializer.data['first_name']\n user.last_name = serializer.data['last_name']\n user.save()\n return Response(request.DATA)\n else:\n return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)\n\n\n@api_view(['POST'])\ndef request_organisation(request, pk=None):\n # Get the user, or return an error if the user does not exist\n try:\n user = get_user_model().objects.get(pk=pk)\n except get_user_model().DoesNotExist:\n return Response({'user': _('User does not exist')}, status=status.HTTP_400_BAD_REQUEST)\n\n # Users themselves are only allowed to request to join an organisation\n request_user = getattr(request, 'user', None)\n if not user == request_user:\n raise PermissionDenied()\n request.DATA['user'] = pk\n\n # Process request\n serializer = EmploymentSerializer(data=request.DATA)\n if serializer.is_valid():\n try:\n organisation = Organisation.objects.get(pk=serializer.data['organisation'])\n if serializer.data['country']:\n country = Country.objects.get(pk=serializer.data['country'])\n else:\n country = None\n employment = Employment(\n user=user,\n organisation=organisation,\n country=country,\n job_title=serializer.data['job_title'],\n is_approved=False,\n )\n employment.save()\n except IntegrityError:\n return Response({'detail': _(u'User already linked to this organisation')},\n status=status.HTTP_409_CONFLICT)\n\n serializer.data['country_full'] = CountrySerializer(country).data\n serializer.data['organisation_full'] = OrganisationSerializer(organisation).data\n serializer.data['id'] = employment.pk\n\n return Response(serializer.data)\n else:\n return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)\n", "path": "akvo/rest/views/user.py"}]}
| 1,990 | 376 |
gh_patches_debug_29788
|
rasdani/github-patches
|
git_diff
|
nilearn__nilearn-2659
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
check_embedded_nifti_masker assumes estimator has attributes set
**Disclaimer:** I know `check_embedded_nifti_masker` is implicitly meant to be a low-level function, etc., etc.
```
Traceback (most recent call last):
File "toto.py", line 13, in <module>
Toto(memory=None).fit()
File "toto.py", line 10, in fit
self.masker_ = check_embedded_nifti_masker(self)
File "/home/elvis/.local/lib/python2.7/site-packages/nilearn-0.2.3-py2.7.egg/nilearn/input_data/masker_validation.py", line 53, in check_embedded_nifti_masker
new_masker_params['memory_level'] = max(0, estimator.memory_level - 1)
AttributeError: 'Toto' object has no attribute 'memory_level'
```
Reproduce with:
```
from nilearn.input_data.masker_validation import check_embedded_nifti_masker
class Toto(object):
def __init__(self, **kwargs):
for k, v in kwargs.items():
setattr(self, k, v)
def fit(self, *args, **kwargs):
self.masker_ = check_embedded_nifti_masker(self)
Toto(memory=None).fit()
```
check_embedded_nifti_masker assumes estimator has attributes set
**Disclaimer:** I know `check_embedded_nifti_masker` is implicitly meant to be a low-level function, etc., etc.
```
Traceback (most recent call last):
File "toto.py", line 13, in <module>
Toto(memory=None).fit()
File "toto.py", line 10, in fit
self.masker_ = check_embedded_nifti_masker(self)
File "/home/elvis/.local/lib/python2.7/site-packages/nilearn-0.2.3-py2.7.egg/nilearn/input_data/masker_validation.py", line 53, in check_embedded_nifti_masker
new_masker_params['memory_level'] = max(0, estimator.memory_level - 1)
AttributeError: 'Toto' object has no attribute 'memory_level'
```
Reproduce with:
```
from nilearn.input_data.masker_validation import check_embedded_nifti_masker
class Toto(object):
def __init__(self, **kwargs):
for k, v in kwargs.items():
setattr(self, k, v)
def fit(self, *args, **kwargs):
self.masker_ = check_embedded_nifti_masker(self)
Toto(memory=None).fit()
```
</issue>
<code>
[start of nilearn/input_data/masker_validation.py]
1 import warnings
2
3 import numpy as np
4
5 from .._utils.class_inspect import get_params
6 from .._utils.cache_mixin import _check_memory
7 from .multi_nifti_masker import MultiNiftiMasker
8 from .nifti_masker import NiftiMasker
9
10
11 def check_embedded_nifti_masker(estimator, multi_subject=True):
12 """Base function for using a masker within a BaseEstimator class
13
14 This creates a masker from instance parameters :
15 - If instance contains a mask image in mask parameter,
16 we use this image as new masker mask_img, forwarding instance parameters to
17 new masker : smoothing_fwhm, standardize, detrend, low_pass= high_pass,
18 t_r, target_affine, target_shape, mask_strategy, mask_args,
19 - If instance contains a masker in mask parameter, we use a copy of
20 this masker, overriding all instance masker related parameters.
21 In all case, we forward system parameters of instance to new masker :
22 memory, memory_level, verbose, n_jobs
23
24 Parameters
25 ----------
26 instance: object, instance of BaseEstimator
27 The object that gives us the values of the parameters
28
29 multi_subject: boolean
30 Indicates whether to return a MultiNiftiMasker or a NiftiMasker
31 (the default is True)
32
33 Returns
34 -------
35 masker: MultiNiftiMasker or NiftiMasker
36 New masker
37 """
38 masker_type = MultiNiftiMasker if multi_subject else NiftiMasker
39 estimator_params = get_params(masker_type, estimator)
40 mask = getattr(estimator, 'mask', None)
41
42 if isinstance(mask, (NiftiMasker, MultiNiftiMasker)):
43 # Creating (Multi)NiftiMasker from provided masker
44 masker_params = get_params(masker_type, mask)
45 new_masker_params = masker_params
46 else:
47 # Creating (Multi)NiftiMasker
48 # with parameters extracted from estimator
49 new_masker_params = estimator_params
50 new_masker_params['mask_img'] = mask
51 # Forwarding system parameters of instance to new masker in all case
52 if multi_subject and hasattr(estimator, 'n_jobs'):
53 # For MultiNiftiMasker only
54 new_masker_params['n_jobs'] = estimator.n_jobs
55 new_masker_params['memory'] = _check_memory(estimator.memory)
56 new_masker_params['memory_level'] = max(0, estimator.memory_level - 1)
57 new_masker_params['verbose'] = estimator.verbose
58
59 # Raising warning if masker override parameters
60 conflict_string = ""
61 for param_key in sorted(estimator_params):
62 if np.any(new_masker_params[param_key] != estimator_params[param_key]):
63 conflict_string += ("Parameter {0} :\n"
64 " Masker parameter {1}"
65 " - overriding estimator parameter {2}\n"
66 ).format(param_key,
67 new_masker_params[param_key],
68 estimator_params[param_key])
69
70 if conflict_string != "":
71 warn_str = ("Overriding provided-default estimator parameters with"
72 " provided masker parameters :\n"
73 "{0:s}").format(conflict_string)
74 warnings.warn(warn_str)
75 masker = masker_type(**new_masker_params)
76
77 # Forwarding potential attribute of provided masker
78 if hasattr(mask, 'mask_img_'):
79 # Allow free fit of returned mask
80 masker.mask_img = mask.mask_img_
81
82 return masker
83
[end of nilearn/input_data/masker_validation.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/nilearn/input_data/masker_validation.py b/nilearn/input_data/masker_validation.py
--- a/nilearn/input_data/masker_validation.py
+++ b/nilearn/input_data/masker_validation.py
@@ -1,6 +1,7 @@
import warnings
import numpy as np
+from string import Template
from .._utils.class_inspect import get_params
from .._utils.cache_mixin import _check_memory
@@ -52,9 +53,30 @@
if multi_subject and hasattr(estimator, 'n_jobs'):
# For MultiNiftiMasker only
new_masker_params['n_jobs'] = estimator.n_jobs
- new_masker_params['memory'] = _check_memory(estimator.memory)
- new_masker_params['memory_level'] = max(0, estimator.memory_level - 1)
- new_masker_params['verbose'] = estimator.verbose
+
+ warning_msg = Template("Provided estimator has no $attribute attribute set."
+ "Setting $attribute to $default_value by default.")
+
+ if hasattr(estimator, 'memory'):
+ new_masker_params['memory'] = _check_memory(estimator.memory)
+ else:
+ warnings.warn(warning_msg.substitute(attribute='memory',
+ default_value='Memory(location=None)'))
+ new_masker_params['memory'] = _check_memory(None)
+
+ if hasattr(estimator, 'memory_level'):
+ new_masker_params['memory_level'] = max(0, estimator.memory_level - 1)
+ else:
+ warnings.warn(warning_msg.substitute(attribute='memory_level',
+ default_value='0'))
+ new_masker_params['memory_level'] = 0
+
+ if hasattr(estimator, 'verbose'):
+ new_masker_params['verbose'] = estimator.verbose
+ else:
+ warnings.warn(warning_msg.substitute(attribute='verbose',
+ default_value='0'))
+ new_masker_params['verbose'] = 0
# Raising warning if masker override parameters
conflict_string = ""
|
{"golden_diff": "diff --git a/nilearn/input_data/masker_validation.py b/nilearn/input_data/masker_validation.py\n--- a/nilearn/input_data/masker_validation.py\n+++ b/nilearn/input_data/masker_validation.py\n@@ -1,6 +1,7 @@\n import warnings\n \n import numpy as np\n+from string import Template\n \n from .._utils.class_inspect import get_params\n from .._utils.cache_mixin import _check_memory\n@@ -52,9 +53,30 @@\n if multi_subject and hasattr(estimator, 'n_jobs'):\n # For MultiNiftiMasker only\n new_masker_params['n_jobs'] = estimator.n_jobs\n- new_masker_params['memory'] = _check_memory(estimator.memory)\n- new_masker_params['memory_level'] = max(0, estimator.memory_level - 1)\n- new_masker_params['verbose'] = estimator.verbose\n+\n+ warning_msg = Template(\"Provided estimator has no $attribute attribute set.\"\n+ \"Setting $attribute to $default_value by default.\")\n+\n+ if hasattr(estimator, 'memory'):\n+ new_masker_params['memory'] = _check_memory(estimator.memory)\n+ else:\n+ warnings.warn(warning_msg.substitute(attribute='memory',\n+ default_value='Memory(location=None)'))\n+ new_masker_params['memory'] = _check_memory(None)\n+\n+ if hasattr(estimator, 'memory_level'):\n+ new_masker_params['memory_level'] = max(0, estimator.memory_level - 1)\n+ else:\n+ warnings.warn(warning_msg.substitute(attribute='memory_level',\n+ default_value='0'))\n+ new_masker_params['memory_level'] = 0\n+\n+ if hasattr(estimator, 'verbose'):\n+ new_masker_params['verbose'] = estimator.verbose\n+ else:\n+ warnings.warn(warning_msg.substitute(attribute='verbose',\n+ default_value='0'))\n+ new_masker_params['verbose'] = 0\n \n # Raising warning if masker override parameters\n conflict_string = \"\"\n", "issue": "check_embedded_nifti_masker assumes estimator has attributes set\n**Disclaimer:** I know `check_embedded_nifti_masker` is implicitly meant to be a low-level function, etc., etc.\n\n```\nTraceback (most recent call last):\n File \"toto.py\", line 13, in <module>\n Toto(memory=None).fit()\n File \"toto.py\", line 10, in fit\n self.masker_ = check_embedded_nifti_masker(self)\n File \"/home/elvis/.local/lib/python2.7/site-packages/nilearn-0.2.3-py2.7.egg/nilearn/input_data/masker_validation.py\", line 53, in check_embedded_nifti_masker\n new_masker_params['memory_level'] = max(0, estimator.memory_level - 1)\nAttributeError: 'Toto' object has no attribute 'memory_level'\n```\n\nReproduce with:\n\n```\nfrom nilearn.input_data.masker_validation import check_embedded_nifti_masker\n\n\nclass Toto(object):\n def __init__(self, **kwargs):\n for k, v in kwargs.items():\n setattr(self, k, v)\n\n def fit(self, *args, **kwargs):\n self.masker_ = check_embedded_nifti_masker(self)\n\n\nToto(memory=None).fit()\n```\n\ncheck_embedded_nifti_masker assumes estimator has attributes set\n**Disclaimer:** I know `check_embedded_nifti_masker` is implicitly meant to be a low-level function, etc., etc.\n\n```\nTraceback (most recent call last):\n File \"toto.py\", line 13, in <module>\n Toto(memory=None).fit()\n File \"toto.py\", line 10, in fit\n self.masker_ = check_embedded_nifti_masker(self)\n File \"/home/elvis/.local/lib/python2.7/site-packages/nilearn-0.2.3-py2.7.egg/nilearn/input_data/masker_validation.py\", line 53, in check_embedded_nifti_masker\n new_masker_params['memory_level'] = max(0, estimator.memory_level - 1)\nAttributeError: 'Toto' object has no attribute 'memory_level'\n```\n\nReproduce with:\n\n```\nfrom nilearn.input_data.masker_validation import check_embedded_nifti_masker\n\n\nclass Toto(object):\n def __init__(self, **kwargs):\n for k, v in kwargs.items():\n setattr(self, k, v)\n\n def fit(self, *args, **kwargs):\n self.masker_ = check_embedded_nifti_masker(self)\n\n\nToto(memory=None).fit()\n```\n\n", "before_files": [{"content": "import warnings\n\nimport numpy as np\n\nfrom .._utils.class_inspect import get_params\nfrom .._utils.cache_mixin import _check_memory\nfrom .multi_nifti_masker import MultiNiftiMasker\nfrom .nifti_masker import NiftiMasker\n\n\ndef check_embedded_nifti_masker(estimator, multi_subject=True):\n \"\"\"Base function for using a masker within a BaseEstimator class\n\n This creates a masker from instance parameters :\n - If instance contains a mask image in mask parameter,\n we use this image as new masker mask_img, forwarding instance parameters to\n new masker : smoothing_fwhm, standardize, detrend, low_pass= high_pass,\n t_r, target_affine, target_shape, mask_strategy, mask_args,\n - If instance contains a masker in mask parameter, we use a copy of\n this masker, overriding all instance masker related parameters.\n In all case, we forward system parameters of instance to new masker :\n memory, memory_level, verbose, n_jobs\n\n Parameters\n ----------\n instance: object, instance of BaseEstimator\n The object that gives us the values of the parameters\n\n multi_subject: boolean\n Indicates whether to return a MultiNiftiMasker or a NiftiMasker\n (the default is True)\n\n Returns\n -------\n masker: MultiNiftiMasker or NiftiMasker\n New masker\n \"\"\"\n masker_type = MultiNiftiMasker if multi_subject else NiftiMasker\n estimator_params = get_params(masker_type, estimator)\n mask = getattr(estimator, 'mask', None)\n\n if isinstance(mask, (NiftiMasker, MultiNiftiMasker)):\n # Creating (Multi)NiftiMasker from provided masker\n masker_params = get_params(masker_type, mask)\n new_masker_params = masker_params\n else:\n # Creating (Multi)NiftiMasker\n # with parameters extracted from estimator\n new_masker_params = estimator_params\n new_masker_params['mask_img'] = mask\n # Forwarding system parameters of instance to new masker in all case\n if multi_subject and hasattr(estimator, 'n_jobs'):\n # For MultiNiftiMasker only\n new_masker_params['n_jobs'] = estimator.n_jobs\n new_masker_params['memory'] = _check_memory(estimator.memory)\n new_masker_params['memory_level'] = max(0, estimator.memory_level - 1)\n new_masker_params['verbose'] = estimator.verbose\n\n # Raising warning if masker override parameters\n conflict_string = \"\"\n for param_key in sorted(estimator_params):\n if np.any(new_masker_params[param_key] != estimator_params[param_key]):\n conflict_string += (\"Parameter {0} :\\n\"\n \" Masker parameter {1}\"\n \" - overriding estimator parameter {2}\\n\"\n ).format(param_key,\n new_masker_params[param_key],\n estimator_params[param_key])\n\n if conflict_string != \"\":\n warn_str = (\"Overriding provided-default estimator parameters with\"\n \" provided masker parameters :\\n\"\n \"{0:s}\").format(conflict_string)\n warnings.warn(warn_str)\n masker = masker_type(**new_masker_params)\n\n # Forwarding potential attribute of provided masker\n if hasattr(mask, 'mask_img_'):\n # Allow free fit of returned mask\n masker.mask_img = mask.mask_img_\n\n return masker\n", "path": "nilearn/input_data/masker_validation.py"}]}
| 2,075 | 453 |
gh_patches_debug_14296
|
rasdani/github-patches
|
git_diff
|
DataDog__dd-trace-py-2384
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
grpc client fails when parse_method_path() does not return a value for package
### Which version of dd-trace-py are you using?
ddtrace==0.48.0
### Which version of pip are you using?
pip 21.1
### Which version of the libraries are you using?
ddtrace==0.48.0
### How can we reproduce your problem?
parse_method_path() can [return None](https://github.com/DataDog/dd-trace-py/blob/7f817089fac3efc2d1204d347e5d21abe344445c/ddtrace/contrib/grpc/utils.py#L12) for the `package` value. This is then passed to [span._set_str_tag()](https://github.com/DataDog/dd-trace-py/blob/7f817089fac3efc2d1204d347e5d21abe344445c/ddtrace/contrib/grpc/client_interceptor.py#L184), which expects the value to always be `str`.
### What is the result that you get?
```2021-04-29 12:50:27 [6] [ERROR] grpc._server Exception calling application: not expecting type '<class 'NoneType'>'
Traceback (most recent call last):
File "/pyenv/versions/app_venv/lib/python3.7/site-packages/grpc/_server.py", line 435, in _call_behavior
response_or_iterator = behavior(argument, context)
File "/pyenv/versions/app_venv/lib/python3.7/site-packages/ddtrace/contrib/grpc/server_interceptor.py", line 112, in unary_unary
return self._fn(constants.GRPC_METHOD_KIND_UNARY, self.__wrapped__.unary_unary, args, kwargs)
File "/pyenv/versions/app_venv/lib/python3.7/site-packages/ddtrace/contrib/grpc/server_interceptor.py", line 79, in _fn
span._set_str_tag(constants.GRPC_METHOD_PACKAGE_KEY, method_package)
File "/pyenv/versions/app_venv/lib/python3.7/site-packages/ddtrace/span.py", line 318, in _set_str_tag
self.meta[key] = ensure_text(value, errors="replace")
File "/pyenv/versions/app_venv/lib/python3.7/site-packages/ddtrace/vendor/six/__init__.py", line 937, in ensure_text
raise TypeError("not expecting type '%s'" % type(s))
TypeError: not expecting type '<class 'NoneType'>'
```
### What is the result that you expected?
The interceptor does not raise exceptions when the value is not available.
The issue seems to be surfaces as a result of #2218. it's not clear if the method package should be omitted or converted to a string as done in some of the other integrations edited in that PR.
</issue>
<code>
[start of ddtrace/contrib/grpc/utils.py]
1 from . import constants
2
3
4 def parse_method_path(method_path):
5 """ Returns (package, service, method) tuple from parsing method path """
6 # unpack method path based on "/{package}.{service}/{method}"
7 # first remove leading "/" as unnecessary
8 package_service, method_name = method_path.lstrip("/").rsplit("/", 1)
9
10 # {package} is optional
11 package_service = package_service.rsplit(".", 1)
12 if len(package_service) == 2:
13 return package_service[0], package_service[1], method_name
14
15 return None, package_service[0], method_name
16
17
18 def set_grpc_method_meta(span, method, method_kind):
19 method_path = method
20 method_package, method_service, method_name = parse_method_path(method_path)
21 span._set_str_tag(constants.GRPC_METHOD_PATH_KEY, method_path)
22 span._set_str_tag(constants.GRPC_METHOD_PACKAGE_KEY, method_package)
23 span._set_str_tag(constants.GRPC_METHOD_SERVICE_KEY, method_service)
24 span._set_str_tag(constants.GRPC_METHOD_NAME_KEY, method_name)
25 span._set_str_tag(constants.GRPC_METHOD_KIND_KEY, method_kind)
26
[end of ddtrace/contrib/grpc/utils.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/ddtrace/contrib/grpc/utils.py b/ddtrace/contrib/grpc/utils.py
--- a/ddtrace/contrib/grpc/utils.py
+++ b/ddtrace/contrib/grpc/utils.py
@@ -19,7 +19,8 @@
method_path = method
method_package, method_service, method_name = parse_method_path(method_path)
span._set_str_tag(constants.GRPC_METHOD_PATH_KEY, method_path)
- span._set_str_tag(constants.GRPC_METHOD_PACKAGE_KEY, method_package)
+ if method_package is not None:
+ span._set_str_tag(constants.GRPC_METHOD_PACKAGE_KEY, method_package)
span._set_str_tag(constants.GRPC_METHOD_SERVICE_KEY, method_service)
span._set_str_tag(constants.GRPC_METHOD_NAME_KEY, method_name)
span._set_str_tag(constants.GRPC_METHOD_KIND_KEY, method_kind)
|
{"golden_diff": "diff --git a/ddtrace/contrib/grpc/utils.py b/ddtrace/contrib/grpc/utils.py\n--- a/ddtrace/contrib/grpc/utils.py\n+++ b/ddtrace/contrib/grpc/utils.py\n@@ -19,7 +19,8 @@\n method_path = method\n method_package, method_service, method_name = parse_method_path(method_path)\n span._set_str_tag(constants.GRPC_METHOD_PATH_KEY, method_path)\n- span._set_str_tag(constants.GRPC_METHOD_PACKAGE_KEY, method_package)\n+ if method_package is not None:\n+ span._set_str_tag(constants.GRPC_METHOD_PACKAGE_KEY, method_package)\n span._set_str_tag(constants.GRPC_METHOD_SERVICE_KEY, method_service)\n span._set_str_tag(constants.GRPC_METHOD_NAME_KEY, method_name)\n span._set_str_tag(constants.GRPC_METHOD_KIND_KEY, method_kind)\n", "issue": "grpc client fails when parse_method_path() does not return a value for package\n### Which version of dd-trace-py are you using?\r\n\r\nddtrace==0.48.0\r\n\r\n### Which version of pip are you using?\r\n\r\npip 21.1\r\n\r\n### Which version of the libraries are you using?\r\n\r\nddtrace==0.48.0\r\n\r\n### How can we reproduce your problem?\r\n\r\nparse_method_path() can [return None](https://github.com/DataDog/dd-trace-py/blob/7f817089fac3efc2d1204d347e5d21abe344445c/ddtrace/contrib/grpc/utils.py#L12) for the `package` value. This is then passed to [span._set_str_tag()](https://github.com/DataDog/dd-trace-py/blob/7f817089fac3efc2d1204d347e5d21abe344445c/ddtrace/contrib/grpc/client_interceptor.py#L184), which expects the value to always be `str`.\r\n\r\n### What is the result that you get?\r\n```2021-04-29 12:50:27 [6] [ERROR] grpc._server Exception calling application: not expecting type '<class 'NoneType'>'\r\nTraceback (most recent call last):\r\n File \"/pyenv/versions/app_venv/lib/python3.7/site-packages/grpc/_server.py\", line 435, in _call_behavior\r\n response_or_iterator = behavior(argument, context)\r\n File \"/pyenv/versions/app_venv/lib/python3.7/site-packages/ddtrace/contrib/grpc/server_interceptor.py\", line 112, in unary_unary\r\n return self._fn(constants.GRPC_METHOD_KIND_UNARY, self.__wrapped__.unary_unary, args, kwargs)\r\n File \"/pyenv/versions/app_venv/lib/python3.7/site-packages/ddtrace/contrib/grpc/server_interceptor.py\", line 79, in _fn\r\n span._set_str_tag(constants.GRPC_METHOD_PACKAGE_KEY, method_package)\r\n File \"/pyenv/versions/app_venv/lib/python3.7/site-packages/ddtrace/span.py\", line 318, in _set_str_tag\r\n self.meta[key] = ensure_text(value, errors=\"replace\")\r\n File \"/pyenv/versions/app_venv/lib/python3.7/site-packages/ddtrace/vendor/six/__init__.py\", line 937, in ensure_text\r\n raise TypeError(\"not expecting type '%s'\" % type(s))\r\nTypeError: not expecting type '<class 'NoneType'>'\r\n```\r\n\r\n### What is the result that you expected?\r\nThe interceptor does not raise exceptions when the value is not available.\r\n\r\nThe issue seems to be surfaces as a result of #2218. it's not clear if the method package should be omitted or converted to a string as done in some of the other integrations edited in that PR.\n", "before_files": [{"content": "from . import constants\n\n\ndef parse_method_path(method_path):\n \"\"\" Returns (package, service, method) tuple from parsing method path \"\"\"\n # unpack method path based on \"/{package}.{service}/{method}\"\n # first remove leading \"/\" as unnecessary\n package_service, method_name = method_path.lstrip(\"/\").rsplit(\"/\", 1)\n\n # {package} is optional\n package_service = package_service.rsplit(\".\", 1)\n if len(package_service) == 2:\n return package_service[0], package_service[1], method_name\n\n return None, package_service[0], method_name\n\n\ndef set_grpc_method_meta(span, method, method_kind):\n method_path = method\n method_package, method_service, method_name = parse_method_path(method_path)\n span._set_str_tag(constants.GRPC_METHOD_PATH_KEY, method_path)\n span._set_str_tag(constants.GRPC_METHOD_PACKAGE_KEY, method_package)\n span._set_str_tag(constants.GRPC_METHOD_SERVICE_KEY, method_service)\n span._set_str_tag(constants.GRPC_METHOD_NAME_KEY, method_name)\n span._set_str_tag(constants.GRPC_METHOD_KIND_KEY, method_kind)\n", "path": "ddtrace/contrib/grpc/utils.py"}]}
| 1,487 | 181 |
gh_patches_debug_39844
|
rasdani/github-patches
|
git_diff
|
pyjanitor-devs__pyjanitor-1049
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[EHN] let `filter_string` suit parameters of `Series.str.contains`
# Brief Description
<!-- Please provide a brief description of what you'd like to propose. -->
- `Series.str.contains(pat, case=True, flags=0, na=None, regex=True)`
- `filter_string(df, column_name, search_string, complement=False)`
`filter_string` is a super sugary syntax for `contains`.
`contains` has five arguements, but `filter_string` only has one arguement `search_string`.
I thought we should complete parameters of `filter string`.
# Example API
<!-- One of the selling points of pyjanitor is the API. Hence, we guard the API very carefully, and want to
make sure that it is accessible and understandable to many people. Please provide a few examples of what the API
of the new function you're proposing will look like. We have provided an example that you should modify. -->
A example `filter_string` would get error result.
```python
import pandas as pd
import janitor # noqa
df = pd.Series(["JoseChen", "Brian.Salvi"], name="Name").to_frame()
# find any '.' rows
df[df.Name.str.contains(".", regex=False)]
# Name
# 1 Brian.Salvi
# error
df.filter_string(".")
# Name
# 0 JoseChen
# 1 Brian.Salvi
```
</issue>
<code>
[start of janitor/functions/filter.py]
1 import datetime as dt
2 import warnings
3 from functools import reduce
4 from typing import Dict, Hashable, Iterable, List, Optional
5
6 import numpy as np
7 import pandas as pd
8 import pandas_flavor as pf
9 from janitor.utils import deprecated_alias
10
11
12 @pf.register_dataframe_method
13 @deprecated_alias(column="column_name")
14 def filter_string(
15 df: pd.DataFrame,
16 column_name: Hashable,
17 search_string: str,
18 complement: bool = False,
19 ) -> pd.DataFrame:
20 """Filter a string-based column according to whether it contains a substring.
21
22 This is super sugary syntax that builds on top of
23 `pandas.Series.str.contains`. It is meant to be the method-chaining
24 equivalent of the following:
25
26 ```python
27 df = df[df[column_name].str.contains(search_string)]]
28 ```
29
30 This method does not mutate the original DataFrame.
31
32 Example: Retain rows whose column values contain a particular substring.
33
34 >>> import pandas as pd
35 >>> import janitor
36 >>> df = pd.DataFrame({"a": range(3, 6), "b": ["bear", "peel", "sail"]})
37 >>> df
38 a b
39 0 3 bear
40 1 4 peel
41 2 5 sail
42 >>> df.filter_string(column_name="b", search_string="ee")
43 a b
44 1 4 peel
45
46 `search_string` is also permitted to be any valid regex pattern.
47
48 :param df: A pandas DataFrame.
49 :param column_name: The column to filter. The column should contain strings.
50 :param search_string: A regex pattern or a (sub-)string to search.
51 :param complement: Whether to return the complement of the filter or not. If
52 set to True, then the rows for which the string search fails are retained
53 instead.
54 :returns: A filtered pandas DataFrame.
55 """ # noqa: E501
56 criteria = df[column_name].str.contains(search_string)
57 if complement:
58 return df[~criteria]
59 return df[criteria]
60
61
62 @pf.register_dataframe_method
63 def filter_on(
64 df: pd.DataFrame,
65 criteria: str,
66 complement: bool = False,
67 ) -> pd.DataFrame:
68 """Return a dataframe filtered on a particular criteria.
69
70 This method does not mutate the original DataFrame.
71
72 This is super-sugary syntax that wraps the pandas `.query()` API, enabling
73 users to use strings to quickly specify filters for filtering their
74 dataframe. The intent is that `filter_on` as a verb better matches the
75 intent of a pandas user than the verb `query`.
76
77 This is intended to be the method-chaining equivalent of the following:
78 ```python
79 df = df[df["score"] < 3]
80 ```
81
82 Example: Filter students who failed an exam (scored less than 50).
83
84 >>> import pandas as pd
85 >>> import janitor
86 >>> df = pd.DataFrame({
87 ... "student_id": ["S1", "S2", "S3"],
88 ... "score": [40, 60, 85],
89 ... })
90 >>> df
91 student_id score
92 0 S1 40
93 1 S2 60
94 2 S3 85
95 >>> df.filter_on("score < 50", complement=False)
96 student_id score
97 0 S1 40
98
99 Credit to Brant Peterson for the name.
100
101 :param df: A pandas DataFrame.
102 :param criteria: A filtering criteria that returns an array or Series of
103 booleans, on which pandas can filter on.
104 :param complement: Whether to return the complement of the filter or not.
105 If set to True, then the rows for which the criteria is False are
106 retained instead.
107 :returns: A filtered pandas DataFrame.
108 """
109 if complement:
110 return df.query(f"not ({criteria})")
111 return df.query(criteria)
112
113
114 @pf.register_dataframe_method
115 @deprecated_alias(column="column_name", start="start_date", end="end_date")
116 def filter_date(
117 df: pd.DataFrame,
118 column_name: Hashable,
119 start_date: Optional[dt.date] = None,
120 end_date: Optional[dt.date] = None,
121 years: Optional[List] = None,
122 months: Optional[List] = None,
123 days: Optional[List] = None,
124 column_date_options: Optional[Dict] = None,
125 format: Optional[str] = None, # skipcq: PYL-W0622
126 ) -> pd.DataFrame:
127 """Filter a date-based column based on certain criteria.
128
129 This method does not mutate the original DataFrame.
130
131 Dates may be finicky and this function builds on top of the *magic* from
132 the pandas `to_datetime` function that is able to parse dates well.
133
134 Additional options to parse the date type of your column may be found at
135 the official pandas [documentation][datetime].
136
137 [datetime]: https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.to_datetime.html
138
139 Example:
140
141 >>> import pandas as pd
142 >>> import janitor
143 >>> df = pd.DataFrame({
144 ... "a": range(5, 9),
145 ... "dt": ["2021-11-12", "2021-12-15", "2022-01-03", "2022-01-09"],
146 ... })
147 >>> df
148 a dt
149 0 5 2021-11-12
150 1 6 2021-12-15
151 2 7 2022-01-03
152 3 8 2022-01-09
153 >>> df.filter_date("dt", start_date="2021-12-01", end_date="2022-01-05")
154 a dt
155 1 6 2021-12-15
156 2 7 2022-01-03
157 >>> df.filter_date("dt", years=[2021], months=[12])
158 a dt
159 1 6 2021-12-15
160
161 !!!note
162
163 This method will cast your column to a Timestamp!
164
165 !!!note
166
167 This only affects the format of the `start_date` and `end_date`
168 parameters. If there's an issue with the format of the DataFrame being
169 parsed, you would pass `{'format': your_format}` to `column_date_options`.
170
171 :param df: The dataframe to filter on.
172 :param column_name: The column which to apply the fraction transformation.
173 :param start_date: The beginning date to use to filter the DataFrame.
174 :param end_date: The end date to use to filter the DataFrame.
175 :param years: The years to use to filter the DataFrame.
176 :param months: The months to use to filter the DataFrame.
177 :param days: The days to use to filter the DataFrame.
178 :param column_date_options: Special options to use when parsing the date
179 column in the original DataFrame. The options may be found at the
180 official Pandas documentation.
181 :param format: If you're using a format for `start_date` or `end_date`
182 that is not recognized natively by pandas' `to_datetime` function, you
183 may supply the format yourself. Python date and time formats may be
184 found [here](http://strftime.org/).
185 :returns: A filtered pandas DataFrame.
186 """ # noqa: E501
187
188 def _date_filter_conditions(conditions):
189 """Taken from: https://stackoverflow.com/a/13616382."""
190 return reduce(np.logical_and, conditions)
191
192 if column_date_options:
193 df.loc[:, column_name] = pd.to_datetime(
194 df.loc[:, column_name], **column_date_options
195 )
196 else:
197 df.loc[:, column_name] = pd.to_datetime(df.loc[:, column_name])
198
199 _filter_list = []
200
201 if start_date:
202 start_date = pd.to_datetime(start_date, format=format)
203 _filter_list.append(df.loc[:, column_name] >= start_date)
204
205 if end_date:
206 end_date = pd.to_datetime(end_date, format=format)
207 _filter_list.append(df.loc[:, column_name] <= end_date)
208
209 if years:
210 _filter_list.append(df.loc[:, column_name].dt.year.isin(years))
211
212 if months:
213 _filter_list.append(df.loc[:, column_name].dt.month.isin(months))
214
215 if days:
216 _filter_list.append(df.loc[:, column_name].dt.day.isin(days))
217
218 if start_date and end_date and start_date > end_date:
219 warnings.warn(
220 f"Your start date of {start_date} is after your end date of "
221 f"{end_date}. Is this intended?"
222 )
223
224 return df.loc[_date_filter_conditions(_filter_list), :]
225
226
227 @pf.register_dataframe_method
228 @deprecated_alias(column="column_name")
229 def filter_column_isin(
230 df: pd.DataFrame,
231 column_name: Hashable,
232 iterable: Iterable,
233 complement: bool = False,
234 ) -> pd.DataFrame:
235 """Filter a dataframe for values in a column that exist in the given iterable.
236
237 This method does not mutate the original DataFrame.
238
239 Assumes exact matching; fuzzy matching not implemented.
240
241 Example: Filter the dataframe to retain rows for which `names`
242 are exactly `James` or `John`.
243
244 >>> import pandas as pd
245 >>> import janitor
246 >>> df = pd.DataFrame({"names": ["Jane", "Jeremy", "John"], "foo": list("xyz")})
247 >>> df
248 names foo
249 0 Jane x
250 1 Jeremy y
251 2 John z
252 >>> df.filter_column_isin(column_name="names", iterable=["James", "John"])
253 names foo
254 2 John z
255
256 This is the method-chaining alternative to:
257
258 ```python
259 df = df[df["names"].isin(["James", "John"])]
260 ```
261
262 If `complement=True`, then we will only get rows for which the names
263 are neither `James` nor `John`.
264
265 :param df: A pandas DataFrame.
266 :param column_name: The column on which to filter.
267 :param iterable: An iterable. Could be a list, tuple, another pandas
268 Series.
269 :param complement: Whether to return the complement of the selection or
270 not.
271 :returns: A filtered pandas DataFrame.
272 :raises ValueError: If `iterable` does not have a length of `1`
273 or greater.
274 """ # noqa: E501
275 if len(iterable) == 0:
276 raise ValueError(
277 "`iterable` kwarg must be given an iterable of length 1 "
278 "or greater."
279 )
280 criteria = df[column_name].isin(iterable)
281
282 if complement:
283 return df[~criteria]
284 return df[criteria]
285
[end of janitor/functions/filter.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/janitor/functions/filter.py b/janitor/functions/filter.py
--- a/janitor/functions/filter.py
+++ b/janitor/functions/filter.py
@@ -16,12 +16,15 @@
column_name: Hashable,
search_string: str,
complement: bool = False,
+ case: bool = True,
+ flags: int = 0,
+ na=None,
+ regex: bool = True,
) -> pd.DataFrame:
"""Filter a string-based column according to whether it contains a substring.
- This is super sugary syntax that builds on top of
- `pandas.Series.str.contains`. It is meant to be the method-chaining
- equivalent of the following:
+ This is super sugary syntax that builds on top of `pandas.Series.str.contains`.
+ It is meant to be the method-chaining equivalent of the following:
```python
df = df[df[column_name].str.contains(search_string)]]
@@ -33,17 +36,32 @@
>>> import pandas as pd
>>> import janitor
- >>> df = pd.DataFrame({"a": range(3, 6), "b": ["bear", "peel", "sail"]})
+ >>> df = pd.DataFrame({"a": range(3, 6), "b": ["bear", "peeL", "sail"]})
>>> df
a b
0 3 bear
- 1 4 peel
+ 1 4 peeL
2 5 sail
>>> df.filter_string(column_name="b", search_string="ee")
a b
- 1 4 peel
+ 1 4 peeL
+ >>> df.filter_string(column_name="b", search_string="L", case=False)
+ a b
+ 1 4 peeL
+ 2 5 sail
- `search_string` is also permitted to be any valid regex pattern.
+ Example: Filter names does not contain `'.'` (disable regex mode).
+
+ >>> import pandas as pd
+ >>> import janitor
+ >>> df = pd.Series(["JoseChen", "Brian.Salvi"], name="Name").to_frame()
+ >>> df
+ Name
+ 0 JoseChen
+ 1 Brian.Salvi
+ >>> df.filter_string(column_name="Name", search_string=".", regex=False, complement=True)
+ Name
+ 0 JoseChen
:param df: A pandas DataFrame.
:param column_name: The column to filter. The column should contain strings.
@@ -51,11 +69,27 @@
:param complement: Whether to return the complement of the filter or not. If
set to True, then the rows for which the string search fails are retained
instead.
+ :param case: If True, case sensitive.
+ :param flags: Flags to pass through to the re module, e.g. re.IGNORECASE.
+ :param na: Fill value for missing values. The default depends on dtype of
+ the array. For object-dtype, `numpy.nan` is used. For `StringDtype`,
+ `pandas.NA` is used.
+ :param regex: If True, assumes `search_string` is a regular expression. If False,
+ treats the `search_string` as a literal string.
:returns: A filtered pandas DataFrame.
""" # noqa: E501
- criteria = df[column_name].str.contains(search_string)
+
+ criteria = df[column_name].str.contains(
+ pat=search_string,
+ case=case,
+ flags=flags,
+ na=na,
+ regex=regex,
+ )
+
if complement:
return df[~criteria]
+
return df[criteria]
|
{"golden_diff": "diff --git a/janitor/functions/filter.py b/janitor/functions/filter.py\n--- a/janitor/functions/filter.py\n+++ b/janitor/functions/filter.py\n@@ -16,12 +16,15 @@\n column_name: Hashable,\n search_string: str,\n complement: bool = False,\n+ case: bool = True,\n+ flags: int = 0,\n+ na=None,\n+ regex: bool = True,\n ) -> pd.DataFrame:\n \"\"\"Filter a string-based column according to whether it contains a substring.\n \n- This is super sugary syntax that builds on top of\n- `pandas.Series.str.contains`. It is meant to be the method-chaining\n- equivalent of the following:\n+ This is super sugary syntax that builds on top of `pandas.Series.str.contains`.\n+ It is meant to be the method-chaining equivalent of the following:\n \n ```python\n df = df[df[column_name].str.contains(search_string)]]\n@@ -33,17 +36,32 @@\n \n >>> import pandas as pd\n >>> import janitor\n- >>> df = pd.DataFrame({\"a\": range(3, 6), \"b\": [\"bear\", \"peel\", \"sail\"]})\n+ >>> df = pd.DataFrame({\"a\": range(3, 6), \"b\": [\"bear\", \"peeL\", \"sail\"]})\n >>> df\n a b\n 0 3 bear\n- 1 4 peel\n+ 1 4 peeL\n 2 5 sail\n >>> df.filter_string(column_name=\"b\", search_string=\"ee\")\n a b\n- 1 4 peel\n+ 1 4 peeL\n+ >>> df.filter_string(column_name=\"b\", search_string=\"L\", case=False)\n+ a b\n+ 1 4 peeL\n+ 2 5 sail\n \n- `search_string` is also permitted to be any valid regex pattern.\n+ Example: Filter names does not contain `'.'` (disable regex mode).\n+\n+ >>> import pandas as pd\n+ >>> import janitor\n+ >>> df = pd.Series([\"JoseChen\", \"Brian.Salvi\"], name=\"Name\").to_frame()\n+ >>> df\n+ Name\n+ 0 JoseChen\n+ 1 Brian.Salvi\n+ >>> df.filter_string(column_name=\"Name\", search_string=\".\", regex=False, complement=True)\n+ Name\n+ 0 JoseChen\n \n :param df: A pandas DataFrame.\n :param column_name: The column to filter. The column should contain strings.\n@@ -51,11 +69,27 @@\n :param complement: Whether to return the complement of the filter or not. If\n set to True, then the rows for which the string search fails are retained\n instead.\n+ :param case: If True, case sensitive.\n+ :param flags: Flags to pass through to the re module, e.g. re.IGNORECASE.\n+ :param na: Fill value for missing values. The default depends on dtype of\n+ the array. For object-dtype, `numpy.nan` is used. For `StringDtype`,\n+ `pandas.NA` is used.\n+ :param regex: If True, assumes `search_string` is a regular expression. If False,\n+ treats the `search_string` as a literal string.\n :returns: A filtered pandas DataFrame.\n \"\"\" # noqa: E501\n- criteria = df[column_name].str.contains(search_string)\n+\n+ criteria = df[column_name].str.contains(\n+ pat=search_string,\n+ case=case,\n+ flags=flags,\n+ na=na,\n+ regex=regex,\n+ )\n+\n if complement:\n return df[~criteria]\n+\n return df[criteria]\n", "issue": "[EHN] let `filter_string` suit parameters of `Series.str.contains`\n# Brief Description\r\n\r\n<!-- Please provide a brief description of what you'd like to propose. -->\r\n\r\n- `Series.str.contains(pat, case=True, flags=0, na=None, regex=True)`\r\n- `filter_string(df, column_name, search_string, complement=False)`\r\n\r\n`filter_string` is a super sugary syntax for `contains`.\r\n`contains` has five arguements, but `filter_string` only has one arguement `search_string`.\r\n\r\nI thought we should complete parameters of `filter string`.\r\n\r\n# Example API\r\n\r\n<!-- One of the selling points of pyjanitor is the API. Hence, we guard the API very carefully, and want to\r\nmake sure that it is accessible and understandable to many people. Please provide a few examples of what the API\r\nof the new function you're proposing will look like. We have provided an example that you should modify. -->\r\n\r\nA example `filter_string` would get error result.\r\n\r\n```python\r\nimport pandas as pd\r\nimport janitor # noqa\r\n\r\ndf = pd.Series([\"JoseChen\", \"Brian.Salvi\"], name=\"Name\").to_frame()\r\n\r\n# find any '.' rows\r\ndf[df.Name.str.contains(\".\", regex=False)]\r\n# Name\r\n# 1 Brian.Salvi\r\n\r\n# error\r\ndf.filter_string(\".\")\r\n# Name\r\n# 0 JoseChen\r\n# 1 Brian.Salvi\r\n```\r\n\n", "before_files": [{"content": "import datetime as dt\nimport warnings\nfrom functools import reduce\nfrom typing import Dict, Hashable, Iterable, List, Optional\n\nimport numpy as np\nimport pandas as pd\nimport pandas_flavor as pf\nfrom janitor.utils import deprecated_alias\n\n\[email protected]_dataframe_method\n@deprecated_alias(column=\"column_name\")\ndef filter_string(\n df: pd.DataFrame,\n column_name: Hashable,\n search_string: str,\n complement: bool = False,\n) -> pd.DataFrame:\n \"\"\"Filter a string-based column according to whether it contains a substring.\n\n This is super sugary syntax that builds on top of\n `pandas.Series.str.contains`. It is meant to be the method-chaining\n equivalent of the following:\n\n ```python\n df = df[df[column_name].str.contains(search_string)]]\n ```\n\n This method does not mutate the original DataFrame.\n\n Example: Retain rows whose column values contain a particular substring.\n\n >>> import pandas as pd\n >>> import janitor\n >>> df = pd.DataFrame({\"a\": range(3, 6), \"b\": [\"bear\", \"peel\", \"sail\"]})\n >>> df\n a b\n 0 3 bear\n 1 4 peel\n 2 5 sail\n >>> df.filter_string(column_name=\"b\", search_string=\"ee\")\n a b\n 1 4 peel\n\n `search_string` is also permitted to be any valid regex pattern.\n\n :param df: A pandas DataFrame.\n :param column_name: The column to filter. The column should contain strings.\n :param search_string: A regex pattern or a (sub-)string to search.\n :param complement: Whether to return the complement of the filter or not. If\n set to True, then the rows for which the string search fails are retained\n instead.\n :returns: A filtered pandas DataFrame.\n \"\"\" # noqa: E501\n criteria = df[column_name].str.contains(search_string)\n if complement:\n return df[~criteria]\n return df[criteria]\n\n\[email protected]_dataframe_method\ndef filter_on(\n df: pd.DataFrame,\n criteria: str,\n complement: bool = False,\n) -> pd.DataFrame:\n \"\"\"Return a dataframe filtered on a particular criteria.\n\n This method does not mutate the original DataFrame.\n\n This is super-sugary syntax that wraps the pandas `.query()` API, enabling\n users to use strings to quickly specify filters for filtering their\n dataframe. The intent is that `filter_on` as a verb better matches the\n intent of a pandas user than the verb `query`.\n\n This is intended to be the method-chaining equivalent of the following:\n ```python\n df = df[df[\"score\"] < 3]\n ```\n\n Example: Filter students who failed an exam (scored less than 50).\n\n >>> import pandas as pd\n >>> import janitor\n >>> df = pd.DataFrame({\n ... \"student_id\": [\"S1\", \"S2\", \"S3\"],\n ... \"score\": [40, 60, 85],\n ... })\n >>> df\n student_id score\n 0 S1 40\n 1 S2 60\n 2 S3 85\n >>> df.filter_on(\"score < 50\", complement=False)\n student_id score\n 0 S1 40\n\n Credit to Brant Peterson for the name.\n\n :param df: A pandas DataFrame.\n :param criteria: A filtering criteria that returns an array or Series of\n booleans, on which pandas can filter on.\n :param complement: Whether to return the complement of the filter or not.\n If set to True, then the rows for which the criteria is False are\n retained instead.\n :returns: A filtered pandas DataFrame.\n \"\"\"\n if complement:\n return df.query(f\"not ({criteria})\")\n return df.query(criteria)\n\n\[email protected]_dataframe_method\n@deprecated_alias(column=\"column_name\", start=\"start_date\", end=\"end_date\")\ndef filter_date(\n df: pd.DataFrame,\n column_name: Hashable,\n start_date: Optional[dt.date] = None,\n end_date: Optional[dt.date] = None,\n years: Optional[List] = None,\n months: Optional[List] = None,\n days: Optional[List] = None,\n column_date_options: Optional[Dict] = None,\n format: Optional[str] = None, # skipcq: PYL-W0622\n) -> pd.DataFrame:\n \"\"\"Filter a date-based column based on certain criteria.\n\n This method does not mutate the original DataFrame.\n\n Dates may be finicky and this function builds on top of the *magic* from\n the pandas `to_datetime` function that is able to parse dates well.\n\n Additional options to parse the date type of your column may be found at\n the official pandas [documentation][datetime].\n\n [datetime]: https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.to_datetime.html\n\n Example:\n\n >>> import pandas as pd\n >>> import janitor\n >>> df = pd.DataFrame({\n ... \"a\": range(5, 9),\n ... \"dt\": [\"2021-11-12\", \"2021-12-15\", \"2022-01-03\", \"2022-01-09\"],\n ... })\n >>> df\n a dt\n 0 5 2021-11-12\n 1 6 2021-12-15\n 2 7 2022-01-03\n 3 8 2022-01-09\n >>> df.filter_date(\"dt\", start_date=\"2021-12-01\", end_date=\"2022-01-05\")\n a dt\n 1 6 2021-12-15\n 2 7 2022-01-03\n >>> df.filter_date(\"dt\", years=[2021], months=[12])\n a dt\n 1 6 2021-12-15\n\n !!!note\n\n This method will cast your column to a Timestamp!\n\n !!!note\n\n This only affects the format of the `start_date` and `end_date`\n parameters. If there's an issue with the format of the DataFrame being\n parsed, you would pass `{'format': your_format}` to `column_date_options`.\n\n :param df: The dataframe to filter on.\n :param column_name: The column which to apply the fraction transformation.\n :param start_date: The beginning date to use to filter the DataFrame.\n :param end_date: The end date to use to filter the DataFrame.\n :param years: The years to use to filter the DataFrame.\n :param months: The months to use to filter the DataFrame.\n :param days: The days to use to filter the DataFrame.\n :param column_date_options: Special options to use when parsing the date\n column in the original DataFrame. The options may be found at the\n official Pandas documentation.\n :param format: If you're using a format for `start_date` or `end_date`\n that is not recognized natively by pandas' `to_datetime` function, you\n may supply the format yourself. Python date and time formats may be\n found [here](http://strftime.org/).\n :returns: A filtered pandas DataFrame.\n \"\"\" # noqa: E501\n\n def _date_filter_conditions(conditions):\n \"\"\"Taken from: https://stackoverflow.com/a/13616382.\"\"\"\n return reduce(np.logical_and, conditions)\n\n if column_date_options:\n df.loc[:, column_name] = pd.to_datetime(\n df.loc[:, column_name], **column_date_options\n )\n else:\n df.loc[:, column_name] = pd.to_datetime(df.loc[:, column_name])\n\n _filter_list = []\n\n if start_date:\n start_date = pd.to_datetime(start_date, format=format)\n _filter_list.append(df.loc[:, column_name] >= start_date)\n\n if end_date:\n end_date = pd.to_datetime(end_date, format=format)\n _filter_list.append(df.loc[:, column_name] <= end_date)\n\n if years:\n _filter_list.append(df.loc[:, column_name].dt.year.isin(years))\n\n if months:\n _filter_list.append(df.loc[:, column_name].dt.month.isin(months))\n\n if days:\n _filter_list.append(df.loc[:, column_name].dt.day.isin(days))\n\n if start_date and end_date and start_date > end_date:\n warnings.warn(\n f\"Your start date of {start_date} is after your end date of \"\n f\"{end_date}. Is this intended?\"\n )\n\n return df.loc[_date_filter_conditions(_filter_list), :]\n\n\[email protected]_dataframe_method\n@deprecated_alias(column=\"column_name\")\ndef filter_column_isin(\n df: pd.DataFrame,\n column_name: Hashable,\n iterable: Iterable,\n complement: bool = False,\n) -> pd.DataFrame:\n \"\"\"Filter a dataframe for values in a column that exist in the given iterable.\n\n This method does not mutate the original DataFrame.\n\n Assumes exact matching; fuzzy matching not implemented.\n\n Example: Filter the dataframe to retain rows for which `names`\n are exactly `James` or `John`.\n\n >>> import pandas as pd\n >>> import janitor\n >>> df = pd.DataFrame({\"names\": [\"Jane\", \"Jeremy\", \"John\"], \"foo\": list(\"xyz\")})\n >>> df\n names foo\n 0 Jane x\n 1 Jeremy y\n 2 John z\n >>> df.filter_column_isin(column_name=\"names\", iterable=[\"James\", \"John\"])\n names foo\n 2 John z\n\n This is the method-chaining alternative to:\n\n ```python\n df = df[df[\"names\"].isin([\"James\", \"John\"])]\n ```\n\n If `complement=True`, then we will only get rows for which the names\n are neither `James` nor `John`.\n\n :param df: A pandas DataFrame.\n :param column_name: The column on which to filter.\n :param iterable: An iterable. Could be a list, tuple, another pandas\n Series.\n :param complement: Whether to return the complement of the selection or\n not.\n :returns: A filtered pandas DataFrame.\n :raises ValueError: If `iterable` does not have a length of `1`\n or greater.\n \"\"\" # noqa: E501\n if len(iterable) == 0:\n raise ValueError(\n \"`iterable` kwarg must be given an iterable of length 1 \"\n \"or greater.\"\n )\n criteria = df[column_name].isin(iterable)\n\n if complement:\n return df[~criteria]\n return df[criteria]\n", "path": "janitor/functions/filter.py"}]}
| 4,071 | 876 |
gh_patches_debug_43037
|
rasdani/github-patches
|
git_diff
|
digitalfabrik__integreat-cms-301
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Fix translation coverage
The translation coverage is not working due to the changed language model a while ago...
Error: `'Language' object has no attribute 'name'`
</issue>
<code>
[start of backend/cms/views/analytics/translation_coverage_view.py]
1 """Views related to the statistics module"""
2 from django.contrib.auth.decorators import login_required
3 from django.utils.decorators import method_decorator
4 from django.views.generic import TemplateView
5 from django.shortcuts import render
6
7 from ...models import Language, Page, PageTranslation
8 from ...decorators import region_permission_required
9
10
11 @method_decorator(login_required, name='dispatch')
12 @method_decorator(region_permission_required, name='dispatch')
13 class TranslationCoverageView(TemplateView):
14 """
15 Class to create the statistic page, that can be found via -> "Statistiken"
16 """
17 template_name = 'analytics/translation_coverage.html'
18 base_context = {'current_menu_item': 'translation_coverage'}
19
20 def get(self, request, *args, **kwargs):
21
22 languages = Language.objects.all()
23
24 languages = list(map(lambda x: [x.code, x.name, x.id], languages))
25
26 all_pages = Page.objects.count()
27
28 # pylint: disable=consider-using-enumerate
29 for i in range(len(languages)):
30 translated_count = PageTranslation.objects.filter(language_id=languages[i][2]).count()
31 languages[i].append(translated_count)
32 languages[i].append(all_pages - languages[i][3])
33
34 return render(
35 request,
36 self.template_name,
37 {
38 **self.base_context,
39 'coverages': languages
40 }
41 )
42
[end of backend/cms/views/analytics/translation_coverage_view.py]
[start of backend/cms/models/pages/page_translation.py]
1 """Models representing a page and page translation with content
2 """
3 import logging
4
5 from django.conf import settings
6 from django.db import models
7 from django.utils import timezone
8
9 from .page import Page
10 from ..languages.language import Language
11 from ...constants import status
12
13
14 logger = logging.getLogger(__name__)
15
16
17 class PageTranslation(models.Model):
18 """Class defining a Translation of a Page
19
20 Args:
21 models : Class inherit of django-Models
22 """
23
24 page = models.ForeignKey(Page, related_name='translations', on_delete=models.CASCADE)
25 language = models.ForeignKey(
26 Language,
27 related_name='page_translations',
28 on_delete=models.CASCADE
29 )
30 slug = models.SlugField(max_length=200, blank=True, allow_unicode=True)
31 title = models.CharField(max_length=250)
32 text = models.TextField(blank=True)
33 status = models.CharField(max_length=6, choices=status.CHOICES, default=status.DRAFT)
34 currently_in_translation = models.BooleanField(default=False)
35 version = models.PositiveIntegerField(default=0)
36 minor_edit = models.BooleanField(default=False)
37 creator = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL)
38 created_date = models.DateTimeField(default=timezone.now)
39 last_updated = models.DateTimeField(auto_now=True)
40
41 @property
42 def foreign_object(self):
43 return self.page
44
45 @property
46 def ancestor_path(self):
47 return '/'.join([
48 ancestor.get_first_translation([self.language.code]).slug
49 for ancestor in self.page.get_ancestors()
50 ])
51
52 @property
53 def permalink(self):
54 return '/'.join(filter(None, [
55 self.page.region.slug,
56 self.language.code,
57 self.ancestor_path,
58 self.slug
59 ]))
60
61 @property
62 def available_languages(self):
63 languages = self.page.languages
64 languages.remove(self.language)
65 available_languages = {}
66 for language in languages:
67 other_translation = self.page.get_public_translation(language.code)
68 if other_translation:
69 available_languages[language.code] = {
70 'id': other_translation.id,
71 'url': other_translation.permalink
72 }
73 return available_languages
74
75 @property
76 def source_translation(self):
77 source_language_tree_node = self.page.region.language_tree_nodes.get(language=self.language).parent
78 if source_language_tree_node:
79 return self.page.get_translation(source_language_tree_node.code)
80 return None
81
82 @property
83 def latest_public_revision(self):
84 return self.page.translations.filter(
85 language=self.language,
86 status=status.PUBLIC,
87 ).first()
88
89 @property
90 def latest_major_revision(self):
91 return self.page.translations.filter(
92 language=self.language,
93 minor_edit=False,
94 ).first()
95
96 @property
97 def latest_major_public_revision(self):
98 return self.page.translations.filter(
99 language=self.language,
100 status=status.PUBLIC,
101 minor_edit=False,
102 ).first()
103
104 @property
105 def previous_revision(self):
106 version = self.version - 1
107 return self.page.translations.filter(
108 language=self.language,
109 version=version,
110 ).first()
111
112 @property
113 def is_outdated(self):
114 source_translation = self.source_translation
115 # If self.language is the root language, this translation can never be outdated
116 if not source_translation:
117 return False
118 # If the source translation is outdated, this translation can not be up to date
119 if source_translation.is_outdated:
120 return True
121 self_revision = self.latest_major_public_revision
122 source_revision = source_translation.latest_major_public_revision
123 # If on of the translations has no major public revision, it cannot be outdated
124 if not self_revision or not source_revision:
125 return False
126 return self_revision.last_updated < source_revision.last_updated
127
128 @property
129 def combined_text(self):
130 """
131 Combines the text from the PageTranslation with the text from the mirrored page.
132 """
133 if self.page.mirrored_page_first:
134 return self.page.get_mirrored_text(self.language.code) + self.text
135 return self.text + self.page.get_mirrored_text(self.language.code)
136
137 def __str__(self):
138 if self.id:
139 return '(id: {}, lang: {}, slug: {})'.format(self.id, self.language.code, self.slug)
140 return super(PageTranslation, self).__str__()
141
142 class Meta:
143 ordering = ['page', '-version']
144 default_permissions = ()
145
[end of backend/cms/models/pages/page_translation.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/backend/cms/models/pages/page_translation.py b/backend/cms/models/pages/page_translation.py
--- a/backend/cms/models/pages/page_translation.py
+++ b/backend/cms/models/pages/page_translation.py
@@ -120,7 +120,7 @@
return True
self_revision = self.latest_major_public_revision
source_revision = source_translation.latest_major_public_revision
- # If on of the translations has no major public revision, it cannot be outdated
+ # If one of the translations has no major public revision, it cannot be outdated
if not self_revision or not source_revision:
return False
return self_revision.last_updated < source_revision.last_updated
@@ -134,9 +134,21 @@
return self.page.get_mirrored_text(self.language.code) + self.text
return self.text + self.page.get_mirrored_text(self.language.code)
+ @classmethod
+ def get_translations(cls, region, language):
+ return cls.objects.filter(page__region=region, language=language).distinct('page')
+
+ @classmethod
+ def get_outdated_translations(cls, region, language):
+ return [t for t in cls.objects.filter(page__region=region, language=language).distinct('page') if t.is_outdated]
+
+ @classmethod
+ def get_up_to_date_translations(cls, region, language):
+ return [t for t in cls.objects.filter(page__region=region, language=language).distinct('page') if not t.is_outdated]
+
def __str__(self):
if self.id:
- return '(id: {}, lang: {}, slug: {})'.format(self.id, self.language.code, self.slug)
+ return '(id: {}, page_id: {}, lang: {}, version: {}, slug: {})'.format(self.id, self.page.id, self.language.code, self.version, self.slug)
return super(PageTranslation, self).__str__()
class Meta:
diff --git a/backend/cms/views/analytics/translation_coverage_view.py b/backend/cms/views/analytics/translation_coverage_view.py
--- a/backend/cms/views/analytics/translation_coverage_view.py
+++ b/backend/cms/views/analytics/translation_coverage_view.py
@@ -4,7 +4,7 @@
from django.views.generic import TemplateView
from django.shortcuts import render
-from ...models import Language, Page, PageTranslation
+from ...models import PageTranslation, Region
from ...decorators import region_permission_required
@@ -12,30 +12,31 @@
@method_decorator(region_permission_required, name='dispatch')
class TranslationCoverageView(TemplateView):
"""
- Class to create the statistic page, that can be found via -> "Statistiken"
+ Class to create the translation coverage statistic
"""
template_name = 'analytics/translation_coverage.html'
base_context = {'current_menu_item': 'translation_coverage'}
def get(self, request, *args, **kwargs):
- languages = Language.objects.all()
+ region = Region.get_current_region(request)
+ num_pages = region.pages.count()
+ languages = []
- languages = list(map(lambda x: [x.code, x.name, x.id], languages))
-
- all_pages = Page.objects.count()
-
- # pylint: disable=consider-using-enumerate
- for i in range(len(languages)):
- translated_count = PageTranslation.objects.filter(language_id=languages[i][2]).count()
- languages[i].append(translated_count)
- languages[i].append(all_pages - languages[i][3])
+ for language in region.languages:
+ page_translations = PageTranslation.get_translations(region, language)
+ languages.append({
+ 'translated_name': language.translated_name,
+ 'num_page_translations_up_to_date': len([t for t in page_translations if not t.is_outdated]),
+ 'num_page_translations_outdated': len([t for t in page_translations if t.is_outdated]),
+ 'num_page_translations_missing': num_pages - page_translations.count()
+ })
return render(
request,
self.template_name,
{
**self.base_context,
- 'coverages': languages
+ 'languages': languages
}
)
|
{"golden_diff": "diff --git a/backend/cms/models/pages/page_translation.py b/backend/cms/models/pages/page_translation.py\n--- a/backend/cms/models/pages/page_translation.py\n+++ b/backend/cms/models/pages/page_translation.py\n@@ -120,7 +120,7 @@\n return True\n self_revision = self.latest_major_public_revision\n source_revision = source_translation.latest_major_public_revision\n- # If on of the translations has no major public revision, it cannot be outdated\n+ # If one of the translations has no major public revision, it cannot be outdated\n if not self_revision or not source_revision:\n return False\n return self_revision.last_updated < source_revision.last_updated\n@@ -134,9 +134,21 @@\n return self.page.get_mirrored_text(self.language.code) + self.text\n return self.text + self.page.get_mirrored_text(self.language.code)\n \n+ @classmethod\n+ def get_translations(cls, region, language):\n+ return cls.objects.filter(page__region=region, language=language).distinct('page')\n+\n+ @classmethod\n+ def get_outdated_translations(cls, region, language):\n+ return [t for t in cls.objects.filter(page__region=region, language=language).distinct('page') if t.is_outdated]\n+\n+ @classmethod\n+ def get_up_to_date_translations(cls, region, language):\n+ return [t for t in cls.objects.filter(page__region=region, language=language).distinct('page') if not t.is_outdated]\n+\n def __str__(self):\n if self.id:\n- return '(id: {}, lang: {}, slug: {})'.format(self.id, self.language.code, self.slug)\n+ return '(id: {}, page_id: {}, lang: {}, version: {}, slug: {})'.format(self.id, self.page.id, self.language.code, self.version, self.slug)\n return super(PageTranslation, self).__str__()\n \n class Meta:\ndiff --git a/backend/cms/views/analytics/translation_coverage_view.py b/backend/cms/views/analytics/translation_coverage_view.py\n--- a/backend/cms/views/analytics/translation_coverage_view.py\n+++ b/backend/cms/views/analytics/translation_coverage_view.py\n@@ -4,7 +4,7 @@\n from django.views.generic import TemplateView\n from django.shortcuts import render\n \n-from ...models import Language, Page, PageTranslation\n+from ...models import PageTranslation, Region\n from ...decorators import region_permission_required\n \n \n@@ -12,30 +12,31 @@\n @method_decorator(region_permission_required, name='dispatch')\n class TranslationCoverageView(TemplateView):\n \"\"\"\n- Class to create the statistic page, that can be found via -> \"Statistiken\"\n+ Class to create the translation coverage statistic\n \"\"\"\n template_name = 'analytics/translation_coverage.html'\n base_context = {'current_menu_item': 'translation_coverage'}\n \n def get(self, request, *args, **kwargs):\n \n- languages = Language.objects.all()\n+ region = Region.get_current_region(request)\n+ num_pages = region.pages.count()\n+ languages = []\n \n- languages = list(map(lambda x: [x.code, x.name, x.id], languages))\n-\n- all_pages = Page.objects.count()\n-\n- # pylint: disable=consider-using-enumerate\n- for i in range(len(languages)):\n- translated_count = PageTranslation.objects.filter(language_id=languages[i][2]).count()\n- languages[i].append(translated_count)\n- languages[i].append(all_pages - languages[i][3])\n+ for language in region.languages:\n+ page_translations = PageTranslation.get_translations(region, language)\n+ languages.append({\n+ 'translated_name': language.translated_name,\n+ 'num_page_translations_up_to_date': len([t for t in page_translations if not t.is_outdated]),\n+ 'num_page_translations_outdated': len([t for t in page_translations if t.is_outdated]),\n+ 'num_page_translations_missing': num_pages - page_translations.count()\n+ })\n \n return render(\n request,\n self.template_name,\n {\n **self.base_context,\n- 'coverages': languages\n+ 'languages': languages\n }\n )\n", "issue": "Fix translation coverage\nThe translation coverage is not working due to the changed language model a while ago...\r\nError: `'Language' object has no attribute 'name'`\n", "before_files": [{"content": "\"\"\"Views related to the statistics module\"\"\"\nfrom django.contrib.auth.decorators import login_required\nfrom django.utils.decorators import method_decorator\nfrom django.views.generic import TemplateView\nfrom django.shortcuts import render\n\nfrom ...models import Language, Page, PageTranslation\nfrom ...decorators import region_permission_required\n\n\n@method_decorator(login_required, name='dispatch')\n@method_decorator(region_permission_required, name='dispatch')\nclass TranslationCoverageView(TemplateView):\n \"\"\"\n Class to create the statistic page, that can be found via -> \"Statistiken\"\n \"\"\"\n template_name = 'analytics/translation_coverage.html'\n base_context = {'current_menu_item': 'translation_coverage'}\n\n def get(self, request, *args, **kwargs):\n\n languages = Language.objects.all()\n\n languages = list(map(lambda x: [x.code, x.name, x.id], languages))\n\n all_pages = Page.objects.count()\n\n # pylint: disable=consider-using-enumerate\n for i in range(len(languages)):\n translated_count = PageTranslation.objects.filter(language_id=languages[i][2]).count()\n languages[i].append(translated_count)\n languages[i].append(all_pages - languages[i][3])\n\n return render(\n request,\n self.template_name,\n {\n **self.base_context,\n 'coverages': languages\n }\n )\n", "path": "backend/cms/views/analytics/translation_coverage_view.py"}, {"content": "\"\"\"Models representing a page and page translation with content\n\"\"\"\nimport logging\n\nfrom django.conf import settings\nfrom django.db import models\nfrom django.utils import timezone\n\nfrom .page import Page\nfrom ..languages.language import Language\nfrom ...constants import status\n\n\nlogger = logging.getLogger(__name__)\n\n\nclass PageTranslation(models.Model):\n \"\"\"Class defining a Translation of a Page\n\n Args:\n models : Class inherit of django-Models\n \"\"\"\n\n page = models.ForeignKey(Page, related_name='translations', on_delete=models.CASCADE)\n language = models.ForeignKey(\n Language,\n related_name='page_translations',\n on_delete=models.CASCADE\n )\n slug = models.SlugField(max_length=200, blank=True, allow_unicode=True)\n title = models.CharField(max_length=250)\n text = models.TextField(blank=True)\n status = models.CharField(max_length=6, choices=status.CHOICES, default=status.DRAFT)\n currently_in_translation = models.BooleanField(default=False)\n version = models.PositiveIntegerField(default=0)\n minor_edit = models.BooleanField(default=False)\n creator = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL)\n created_date = models.DateTimeField(default=timezone.now)\n last_updated = models.DateTimeField(auto_now=True)\n\n @property\n def foreign_object(self):\n return self.page\n\n @property\n def ancestor_path(self):\n return '/'.join([\n ancestor.get_first_translation([self.language.code]).slug\n for ancestor in self.page.get_ancestors()\n ])\n\n @property\n def permalink(self):\n return '/'.join(filter(None, [\n self.page.region.slug,\n self.language.code,\n self.ancestor_path,\n self.slug\n ]))\n\n @property\n def available_languages(self):\n languages = self.page.languages\n languages.remove(self.language)\n available_languages = {}\n for language in languages:\n other_translation = self.page.get_public_translation(language.code)\n if other_translation:\n available_languages[language.code] = {\n 'id': other_translation.id,\n 'url': other_translation.permalink\n }\n return available_languages\n\n @property\n def source_translation(self):\n source_language_tree_node = self.page.region.language_tree_nodes.get(language=self.language).parent\n if source_language_tree_node:\n return self.page.get_translation(source_language_tree_node.code)\n return None\n\n @property\n def latest_public_revision(self):\n return self.page.translations.filter(\n language=self.language,\n status=status.PUBLIC,\n ).first()\n\n @property\n def latest_major_revision(self):\n return self.page.translations.filter(\n language=self.language,\n minor_edit=False,\n ).first()\n\n @property\n def latest_major_public_revision(self):\n return self.page.translations.filter(\n language=self.language,\n status=status.PUBLIC,\n minor_edit=False,\n ).first()\n\n @property\n def previous_revision(self):\n version = self.version - 1\n return self.page.translations.filter(\n language=self.language,\n version=version,\n ).first()\n\n @property\n def is_outdated(self):\n source_translation = self.source_translation\n # If self.language is the root language, this translation can never be outdated\n if not source_translation:\n return False\n # If the source translation is outdated, this translation can not be up to date\n if source_translation.is_outdated:\n return True\n self_revision = self.latest_major_public_revision\n source_revision = source_translation.latest_major_public_revision\n # If on of the translations has no major public revision, it cannot be outdated\n if not self_revision or not source_revision:\n return False\n return self_revision.last_updated < source_revision.last_updated\n\n @property\n def combined_text(self):\n \"\"\"\n Combines the text from the PageTranslation with the text from the mirrored page.\n \"\"\"\n if self.page.mirrored_page_first:\n return self.page.get_mirrored_text(self.language.code) + self.text\n return self.text + self.page.get_mirrored_text(self.language.code)\n\n def __str__(self):\n if self.id:\n return '(id: {}, lang: {}, slug: {})'.format(self.id, self.language.code, self.slug)\n return super(PageTranslation, self).__str__()\n\n class Meta:\n ordering = ['page', '-version']\n default_permissions = ()\n", "path": "backend/cms/models/pages/page_translation.py"}]}
| 2,230 | 919 |
gh_patches_debug_33637
|
rasdani/github-patches
|
git_diff
|
kubeflow__pipelines-5973
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[v2compat] wrong param passed when param contains JSON
### Environment
* KFP SDK version: master branch
### Steps to reproduce
```python
import kfp
from kfp import dsl
from kfp.components import create_component_from_func
@create_component_from_func
def test(json_param: str):
print(json_param)
@dsl.pipeline(name='bug-json-param')
def my_pipeline(
json_param: str = '{"a":"b"}',
value: str = 'c',
):
test(json_param).set_display_name('test1')
test('{"a":"' + f'{value}' + '"}').set_display_name('test2')
if __name__ == '__main__':
kfp.Client().create_run_from_pipeline_func(
my_pipeline,
arguments={},
mode=dsl.PipelineExecutionMode.V2_COMPATIBLE,
)
```
I got the following log for `test2` task (`task1` is expected).
```
{\"a\":\"c\"}
```
### Expected result
<!-- What should the correct behavior be? -->
```
{"a":"c"}
```
### Materials and Reference
<!-- Help us debug this issue by providing resources such as: sample code, background context, or links to references. -->
---
<!-- Don't delete message below to encourage users to support your issue! -->
Impacted by this bug? Give it a 👍. We prioritise the issues with the most 👍.
</issue>
<code>
[start of sdk/python/kfp/compiler/v2_compat.py]
1 # Copyright 2021 The Kubeflow Authors
2 #
3 # Licensed under the Apache License, Version 2.0 (the "License");
4 # you may not use this file except in compliance with the License.
5 # You may obtain a copy of the License at
6 #
7 # http://www.apache.org/licenses/LICENSE-2.0
8 #
9 # Unless required by applicable law or agreed to in writing, software
10 # distributed under the License is distributed on an "AS IS" BASIS,
11 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 # See the License for the specific language governing permissions and
13 # limitations under the License.
14 """Utility functions for enabling v2-compatible pipelines in v1."""
15 import collections
16 import json
17 from typing import Optional
18
19 from kfp import dsl
20 from kfp.compiler import _default_transformers
21 from kfp.pipeline_spec import pipeline_spec_pb2
22 from kfp.v2 import compiler
23
24 from kubernetes import client as k8s_client
25
26 _DEFAULT_LAUNCHER_IMAGE = "gcr.io/ml-pipeline/kfp-launcher:1.6.4"
27
28
29 def update_op(op: dsl.ContainerOp,
30 pipeline_name: dsl.PipelineParam,
31 pipeline_root: dsl.PipelineParam,
32 launcher_image: Optional[str] = None) -> None:
33 """Updates the passed in Op for running in v2-compatible mode.
34
35 Args:
36 op: The Op to update.
37 pipeline_spec: The PipelineSpec for the pipeline under which `op`
38 runs.
39 pipeline_root: The root output directory for pipeline artifacts.
40 launcher_image: An optional launcher image. Useful for tests.
41 """
42 op.is_v2 = True
43 # Inject the launcher binary and overwrite the entrypoint.
44 image_name = launcher_image or _DEFAULT_LAUNCHER_IMAGE
45 launcher_container = dsl.UserContainer(name="kfp-launcher",
46 image=image_name,
47 command="/bin/mount_launcher.sh",
48 mirror_volume_mounts=True)
49
50 op.add_init_container(launcher_container)
51 op.add_volume(k8s_client.V1Volume(name='kfp-launcher'))
52 op.add_volume_mount(
53 k8s_client.V1VolumeMount(name='kfp-launcher', mount_path='/kfp-launcher'))
54
55 op.command = [
56 "/kfp-launcher/launch",
57 "--mlmd_server_address",
58 "$(METADATA_GRPC_SERVICE_HOST)",
59 "--mlmd_server_port",
60 "$(METADATA_GRPC_SERVICE_PORT)",
61 "--runtime_info_json",
62 "$(KFP_V2_RUNTIME_INFO)",
63 "--container_image",
64 "$(KFP_V2_IMAGE)",
65 "--task_name",
66 op.name,
67 "--pipeline_name",
68 pipeline_name,
69 "--pipeline_run_id",
70 "$(WORKFLOW_ID)",
71 "--pipeline_task_id",
72 "$(KFP_POD_NAME)",
73 "--pipeline_root",
74 pipeline_root,
75 ]
76
77 # Mount necessary environment variables.
78 op.apply(_default_transformers.add_kfp_pod_env)
79 op.container.add_env_variable(
80 k8s_client.V1EnvVar(name="KFP_V2_IMAGE", value=op.container.image))
81
82 config_map_ref = k8s_client.V1ConfigMapEnvSource(
83 name='metadata-grpc-configmap', optional=True)
84 op.container.add_env_from(
85 k8s_client.V1EnvFromSource(config_map_ref=config_map_ref))
86
87 op.arguments = list(op.container_spec.command) + list(op.container_spec.args)
88
89 runtime_info = {
90 "inputParameters": collections.OrderedDict(),
91 "inputArtifacts": collections.OrderedDict(),
92 "outputParameters": collections.OrderedDict(),
93 "outputArtifacts": collections.OrderedDict(),
94 }
95
96 component_spec = op.component_spec
97 for parameter, spec in sorted(
98 component_spec.input_definitions.parameters.items()):
99 parameter_info = {
100 "type":
101 pipeline_spec_pb2.PrimitiveType.PrimitiveTypeEnum.Name(spec.type),
102 "value":
103 "BEGIN-KFP-PARAM[{}]END-KFP-PARAM".format(
104 op._parameter_arguments[parameter])
105 }
106 runtime_info["inputParameters"][parameter] = parameter_info
107
108 for artifact_name, spec in sorted(
109 component_spec.input_definitions.artifacts.items()):
110 artifact_info = {
111 "metadataPath": op.input_artifact_paths[artifact_name],
112 "schemaTitle": spec.artifact_type.schema_title,
113 "instanceSchema": spec.artifact_type.instance_schema,
114 }
115 runtime_info["inputArtifacts"][artifact_name] = artifact_info
116
117 for parameter, spec in sorted(
118 component_spec.output_definitions.parameters.items()):
119 parameter_info = {
120 "type":
121 pipeline_spec_pb2.PrimitiveType.PrimitiveTypeEnum.Name(spec.type),
122 "path":
123 op.file_outputs[parameter],
124 }
125 runtime_info["outputParameters"][parameter] = parameter_info
126
127 for artifact_name, spec in sorted(
128 component_spec.output_definitions.artifacts.items()):
129 # TODO: Assert instance_schema.
130 artifact_info = {
131 # Type used to register output artifacts.
132 "schemaTitle": spec.artifact_type.schema_title,
133 "instanceSchema": spec.artifact_type.instance_schema,
134 # File used to write out the registered artifact ID.
135 "metadataPath": op.file_outputs[artifact_name],
136 }
137 runtime_info["outputArtifacts"][artifact_name] = artifact_info
138
139 op.container.add_env_variable(
140 k8s_client.V1EnvVar(name="KFP_V2_RUNTIME_INFO",
141 value=json.dumps(runtime_info)))
142
143 op.pod_annotations['pipelines.kubeflow.org/v2_component'] = "true"
144 op.pod_labels['pipelines.kubeflow.org/v2_component']= "true"
145
[end of sdk/python/kfp/compiler/v2_compat.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/sdk/python/kfp/compiler/v2_compat.py b/sdk/python/kfp/compiler/v2_compat.py
--- a/sdk/python/kfp/compiler/v2_compat.py
+++ b/sdk/python/kfp/compiler/v2_compat.py
@@ -52,6 +52,40 @@
op.add_volume_mount(
k8s_client.V1VolumeMount(name='kfp-launcher', mount_path='/kfp-launcher'))
+ # op.command + op.args will have the following sections:
+ # 1. args passed to kfp-launcher
+ # 2. a separator "--"
+ # 3. parameters in format "key1=value1", "key2=value2", ...
+ # 4. a separator "--" as end of arguments passed to launcher
+ # 5. (start of op.args) arguments of the original user program command + args
+ #
+ # example:
+ # - command:
+ # - /kfp-launcher/launch
+ # - '--mlmd_server_address'
+ # - $(METADATA_GRPC_SERVICE_HOST)
+ # - '--mlmd_server_port'
+ # - $(METADATA_GRPC_SERVICE_PORT)
+ # - ... # more launcher params
+ # - '--pipeline_task_id'
+ # - $(KFP_POD_NAME)
+ # - '--pipeline_root'
+ # - ''
+ # - '--' # start of parameter values
+ # - first=first
+ # - second=second
+ # - '--' # start of user command and args
+ # args:
+ # - sh
+ # - '-ec'
+ # - |
+ # program_path=$(mktemp)
+ # printf "%s" "$0" > "$program_path"
+ # python3 -u "$program_path" "$@"
+ # - >
+ # import json
+ # import xxx
+ # ...
op.command = [
"/kfp-launcher/launch",
"--mlmd_server_address",
@@ -93,17 +127,17 @@
"outputArtifacts": collections.OrderedDict(),
}
+ op.command += ["--"]
component_spec = op.component_spec
for parameter, spec in sorted(
component_spec.input_definitions.parameters.items()):
parameter_info = {
"type":
pipeline_spec_pb2.PrimitiveType.PrimitiveTypeEnum.Name(spec.type),
- "value":
- "BEGIN-KFP-PARAM[{}]END-KFP-PARAM".format(
- op._parameter_arguments[parameter])
}
+ op.command += [f"{parameter}={op._parameter_arguments[parameter]}"]
runtime_info["inputParameters"][parameter] = parameter_info
+ op.command += ["--"]
for artifact_name, spec in sorted(
component_spec.input_definitions.artifacts.items()):
|
{"golden_diff": "diff --git a/sdk/python/kfp/compiler/v2_compat.py b/sdk/python/kfp/compiler/v2_compat.py\n--- a/sdk/python/kfp/compiler/v2_compat.py\n+++ b/sdk/python/kfp/compiler/v2_compat.py\n@@ -52,6 +52,40 @@\n op.add_volume_mount(\n k8s_client.V1VolumeMount(name='kfp-launcher', mount_path='/kfp-launcher'))\n \n+ # op.command + op.args will have the following sections:\n+ # 1. args passed to kfp-launcher\n+ # 2. a separator \"--\"\n+ # 3. parameters in format \"key1=value1\", \"key2=value2\", ...\n+ # 4. a separator \"--\" as end of arguments passed to launcher\n+ # 5. (start of op.args) arguments of the original user program command + args\n+ #\n+ # example:\n+ # - command:\n+ # - /kfp-launcher/launch\n+ # - '--mlmd_server_address'\n+ # - $(METADATA_GRPC_SERVICE_HOST)\n+ # - '--mlmd_server_port'\n+ # - $(METADATA_GRPC_SERVICE_PORT)\n+ # - ... # more launcher params\n+ # - '--pipeline_task_id'\n+ # - $(KFP_POD_NAME)\n+ # - '--pipeline_root'\n+ # - ''\n+ # - '--' # start of parameter values\n+ # - first=first\n+ # - second=second\n+ # - '--' # start of user command and args\n+ # args:\n+ # - sh\n+ # - '-ec'\n+ # - |\n+ # program_path=$(mktemp)\n+ # printf \"%s\" \"$0\" > \"$program_path\"\n+ # python3 -u \"$program_path\" \"$@\"\n+ # - >\n+ # import json\n+ # import xxx\n+ # ...\n op.command = [\n \"/kfp-launcher/launch\",\n \"--mlmd_server_address\",\n@@ -93,17 +127,17 @@\n \"outputArtifacts\": collections.OrderedDict(),\n }\n \n+ op.command += [\"--\"]\n component_spec = op.component_spec\n for parameter, spec in sorted(\n component_spec.input_definitions.parameters.items()):\n parameter_info = {\n \"type\":\n pipeline_spec_pb2.PrimitiveType.PrimitiveTypeEnum.Name(spec.type),\n- \"value\":\n- \"BEGIN-KFP-PARAM[{}]END-KFP-PARAM\".format(\n- op._parameter_arguments[parameter])\n }\n+ op.command += [f\"{parameter}={op._parameter_arguments[parameter]}\"]\n runtime_info[\"inputParameters\"][parameter] = parameter_info\n+ op.command += [\"--\"]\n \n for artifact_name, spec in sorted(\n component_spec.input_definitions.artifacts.items()):\n", "issue": "[v2compat] wrong param passed when param contains JSON\n### Environment\r\n\r\n* KFP SDK version: master branch\r\n\r\n### Steps to reproduce\r\n\r\n```python\r\nimport kfp\r\nfrom kfp import dsl\r\nfrom kfp.components import create_component_from_func\r\n\r\n\r\n@create_component_from_func\r\ndef test(json_param: str):\r\n print(json_param)\r\n\r\n\r\[email protected](name='bug-json-param')\r\ndef my_pipeline(\r\n json_param: str = '{\"a\":\"b\"}',\r\n value: str = 'c',\r\n):\r\n test(json_param).set_display_name('test1')\r\n test('{\"a\":\"' + f'{value}' + '\"}').set_display_name('test2')\r\n\r\n\r\nif __name__ == '__main__':\r\n kfp.Client().create_run_from_pipeline_func(\r\n my_pipeline,\r\n arguments={},\r\n mode=dsl.PipelineExecutionMode.V2_COMPATIBLE,\r\n )\r\n```\r\n\r\nI got the following log for `test2` task (`task1` is expected).\r\n```\r\n{\\\"a\\\":\\\"c\\\"}\r\n```\r\n\r\n### Expected result\r\n\r\n<!-- What should the correct behavior be? -->\r\n```\r\n{\"a\":\"c\"}\r\n```\r\n\r\n### Materials and Reference\r\n\r\n<!-- Help us debug this issue by providing resources such as: sample code, background context, or links to references. -->\r\n\r\n---\r\n\r\n<!-- Don't delete message below to encourage users to support your issue! -->\r\nImpacted by this bug? Give it a \ud83d\udc4d. We prioritise the issues with the most \ud83d\udc4d.\r\n\n", "before_files": [{"content": "# Copyright 2021 The Kubeflow Authors\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\"\"\"Utility functions for enabling v2-compatible pipelines in v1.\"\"\"\nimport collections\nimport json\nfrom typing import Optional\n\nfrom kfp import dsl\nfrom kfp.compiler import _default_transformers\nfrom kfp.pipeline_spec import pipeline_spec_pb2\nfrom kfp.v2 import compiler\n\nfrom kubernetes import client as k8s_client\n\n_DEFAULT_LAUNCHER_IMAGE = \"gcr.io/ml-pipeline/kfp-launcher:1.6.4\"\n\n\ndef update_op(op: dsl.ContainerOp,\n pipeline_name: dsl.PipelineParam,\n pipeline_root: dsl.PipelineParam,\n launcher_image: Optional[str] = None) -> None:\n \"\"\"Updates the passed in Op for running in v2-compatible mode.\n\n Args:\n op: The Op to update.\n pipeline_spec: The PipelineSpec for the pipeline under which `op`\n runs.\n pipeline_root: The root output directory for pipeline artifacts.\n launcher_image: An optional launcher image. Useful for tests.\n \"\"\"\n op.is_v2 = True\n # Inject the launcher binary and overwrite the entrypoint.\n image_name = launcher_image or _DEFAULT_LAUNCHER_IMAGE\n launcher_container = dsl.UserContainer(name=\"kfp-launcher\",\n image=image_name,\n command=\"/bin/mount_launcher.sh\",\n mirror_volume_mounts=True)\n\n op.add_init_container(launcher_container)\n op.add_volume(k8s_client.V1Volume(name='kfp-launcher'))\n op.add_volume_mount(\n k8s_client.V1VolumeMount(name='kfp-launcher', mount_path='/kfp-launcher'))\n\n op.command = [\n \"/kfp-launcher/launch\",\n \"--mlmd_server_address\",\n \"$(METADATA_GRPC_SERVICE_HOST)\",\n \"--mlmd_server_port\",\n \"$(METADATA_GRPC_SERVICE_PORT)\",\n \"--runtime_info_json\",\n \"$(KFP_V2_RUNTIME_INFO)\",\n \"--container_image\",\n \"$(KFP_V2_IMAGE)\",\n \"--task_name\",\n op.name,\n \"--pipeline_name\",\n pipeline_name,\n \"--pipeline_run_id\",\n \"$(WORKFLOW_ID)\",\n \"--pipeline_task_id\",\n \"$(KFP_POD_NAME)\",\n \"--pipeline_root\",\n pipeline_root,\n ]\n\n # Mount necessary environment variables.\n op.apply(_default_transformers.add_kfp_pod_env)\n op.container.add_env_variable(\n k8s_client.V1EnvVar(name=\"KFP_V2_IMAGE\", value=op.container.image))\n\n config_map_ref = k8s_client.V1ConfigMapEnvSource(\n name='metadata-grpc-configmap', optional=True)\n op.container.add_env_from(\n k8s_client.V1EnvFromSource(config_map_ref=config_map_ref))\n\n op.arguments = list(op.container_spec.command) + list(op.container_spec.args)\n\n runtime_info = {\n \"inputParameters\": collections.OrderedDict(),\n \"inputArtifacts\": collections.OrderedDict(),\n \"outputParameters\": collections.OrderedDict(),\n \"outputArtifacts\": collections.OrderedDict(),\n }\n\n component_spec = op.component_spec\n for parameter, spec in sorted(\n component_spec.input_definitions.parameters.items()):\n parameter_info = {\n \"type\":\n pipeline_spec_pb2.PrimitiveType.PrimitiveTypeEnum.Name(spec.type),\n \"value\":\n \"BEGIN-KFP-PARAM[{}]END-KFP-PARAM\".format(\n op._parameter_arguments[parameter])\n }\n runtime_info[\"inputParameters\"][parameter] = parameter_info\n\n for artifact_name, spec in sorted(\n component_spec.input_definitions.artifacts.items()):\n artifact_info = {\n \"metadataPath\": op.input_artifact_paths[artifact_name],\n \"schemaTitle\": spec.artifact_type.schema_title,\n \"instanceSchema\": spec.artifact_type.instance_schema,\n }\n runtime_info[\"inputArtifacts\"][artifact_name] = artifact_info\n\n for parameter, spec in sorted(\n component_spec.output_definitions.parameters.items()):\n parameter_info = {\n \"type\":\n pipeline_spec_pb2.PrimitiveType.PrimitiveTypeEnum.Name(spec.type),\n \"path\":\n op.file_outputs[parameter],\n }\n runtime_info[\"outputParameters\"][parameter] = parameter_info\n\n for artifact_name, spec in sorted(\n component_spec.output_definitions.artifacts.items()):\n # TODO: Assert instance_schema.\n artifact_info = {\n # Type used to register output artifacts.\n \"schemaTitle\": spec.artifact_type.schema_title,\n \"instanceSchema\": spec.artifact_type.instance_schema,\n # File used to write out the registered artifact ID.\n \"metadataPath\": op.file_outputs[artifact_name],\n }\n runtime_info[\"outputArtifacts\"][artifact_name] = artifact_info\n\n op.container.add_env_variable(\n k8s_client.V1EnvVar(name=\"KFP_V2_RUNTIME_INFO\",\n value=json.dumps(runtime_info)))\n\n op.pod_annotations['pipelines.kubeflow.org/v2_component'] = \"true\"\n op.pod_labels['pipelines.kubeflow.org/v2_component']= \"true\"\n", "path": "sdk/python/kfp/compiler/v2_compat.py"}]}
| 2,377 | 633 |
gh_patches_debug_35990
|
rasdani/github-patches
|
git_diff
|
optuna__optuna-1449
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
AllenNLP integration: Can't load configurations that expect ext_vars from environment variables
Optuna's AllenNLP integration evaluates the jsonnet config that you give it, passing in the trial parameters as the `ext_vars`. AllenNLP's default behavior when loading a configuration is a little different, in that it also passes through environment variables:
https://github.com/allenai/allennlp/blob/4de68a42a0df89df01a999ee48f361f24c8c19d4/allennlp/common/params.py#L488
So if you rely on specifying e.g. a path to a file as an environment variable, that configuration won't load as expected when using the integration
## Expected behavior
Optuna should pass environment variables through when the jsonnet is interpreted. Ideally, it'd just use the AllenNLP config loading code directly so that all behavior is identical, just overriding whatever the trial needs to override.
## Environment
- Optuna version: 1.5.0
- Python version: 3.6
- OS: Ubuntu 18.04.4
- (Optional) Other libraries and their versions: AllenNLP 1.0
## Error messages, stack traces, or logs
You'll get `RuntimeError: undefined external variable` during the interpretation of the jsonnet here:
https://github.com/optuna/optuna/blob/9f5c5cf5c36df1628567f0b4a9873892d148ad40/optuna/integration/allennlp.py#L108
## Steps to reproduce
1. Use a AllenNLP configuration that expects to be able to use an environment variable to fill an extVar
</issue>
<code>
[start of optuna/integration/allennlp.py]
1 import json
2 import os
3 from typing import Any
4 from typing import Dict
5 from typing import List
6 from typing import Optional
7 from typing import Union
8 import warnings
9
10 import optuna
11 from optuna._experimental import experimental
12 from optuna._imports import try_import
13
14 with try_import() as _imports:
15 import allennlp.commands
16 import allennlp.common.util
17
18 if _imports.is_successful():
19 import _jsonnet
20
21
22 def dump_best_config(input_config_file: str, output_config_file: str, study: optuna.Study) -> None:
23 """Save JSON config file after updating with parameters from the best trial in the study.
24
25 Args:
26 input_config_file:
27 Input Jsonnet config file used with
28 :class:`~optuna.integration.AllenNLPExecutor`.
29 output_config_file:
30 Output JSON config file.
31 study:
32 Instance of :class:`~optuna.study.Study`.
33 Note that :func:`~optuna.study.Study.optimize` must have been called.
34
35 """
36 _imports.check()
37
38 best_params = study.best_params
39 for key, value in best_params.items():
40 best_params[key] = str(value)
41 best_config = json.loads(_jsonnet.evaluate_file(input_config_file, ext_vars=best_params))
42 best_config = allennlp.common.params.infer_and_cast(best_config)
43
44 with open(output_config_file, "w") as f:
45 json.dump(best_config, f, indent=4)
46
47
48 @experimental("1.4.0")
49 class AllenNLPExecutor(object):
50 """AllenNLP extension to use optuna with Jsonnet config file.
51
52 This feature is experimental since AllenNLP major release will come soon.
53 The interface may change without prior notice to correspond to the update.
54
55 See the examples of `objective function <https://github.com/optuna/optuna/blob/
56 master/examples/allennlp/allennlp_jsonnet.py>`_ and
57 `config file <https://github.com/optuna/optuna/blob/master/
58 examples/allennlp/classifier.jsonnet>`_.
59
60 Args:
61 trial:
62 A :class:`~optuna.trial.Trial` corresponding to the current evaluation
63 of the objective function.
64 config_file:
65 Config file for AllenNLP.
66 Hyperparameters should be masked with ``std.extVar``.
67 Please refer to `the config example <https://github.com/allenai/allentune/blob/
68 master/examples/classifier.jsonnet>`_.
69 serialization_dir:
70 A path which model weights and logs are saved.
71 metrics:
72 An evaluation metric for the result of ``objective``.
73 include_package:
74 Additional packages to include.
75 For more information, please see
76 `AllenNLP documentation <https://docs.allennlp.org/master/api/commands/train/>`_.
77
78 """
79
80 def __init__(
81 self,
82 trial: optuna.Trial,
83 config_file: str,
84 serialization_dir: str,
85 metrics: str = "best_validation_accuracy",
86 *,
87 include_package: Optional[Union[str, List[str]]] = None
88 ):
89 _imports.check()
90
91 self._params = trial.params
92 self._config_file = config_file
93 self._serialization_dir = serialization_dir
94 self._metrics = metrics
95 if include_package is None:
96 include_package = []
97 if isinstance(include_package, str):
98 self._include_package = [include_package]
99 else:
100 self._include_package = include_package
101
102 def _build_params(self) -> Dict[str, Any]:
103 """Create a dict of params for AllenNLP."""
104 # _build_params is based on allentune's train_func.
105 # https://github.com/allenai/allentune/blob/master/allentune/modules/allennlp_runner.py#L34-L65
106 for key, value in self._params.items():
107 self._params[key] = str(value)
108 _params = json.loads(_jsonnet.evaluate_file(self._config_file, ext_vars=self._params))
109
110 # _params contains a list of string or string as value values.
111 # Some params couldn't be casted correctly and
112 # infer_and_cast converts them into desired values.
113 return allennlp.common.params.infer_and_cast(_params)
114
115 def run(self) -> float:
116 """Train a model using AllenNLP."""
117 try:
118 import_func = allennlp.common.util.import_submodules
119 except AttributeError:
120 import_func = allennlp.common.util.import_module_and_submodules
121 warnings.warn("AllenNLP>0.9 has not been supported officially yet.")
122
123 for package_name in self._include_package:
124 import_func(package_name)
125
126 params = allennlp.common.params.Params(self._build_params())
127 allennlp.commands.train.train_model(params, self._serialization_dir)
128
129 metrics = json.load(open(os.path.join(self._serialization_dir, "metrics.json")))
130 return metrics[self._metrics]
131
[end of optuna/integration/allennlp.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/optuna/integration/allennlp.py b/optuna/integration/allennlp.py
--- a/optuna/integration/allennlp.py
+++ b/optuna/integration/allennlp.py
@@ -57,6 +57,13 @@
`config file <https://github.com/optuna/optuna/blob/master/
examples/allennlp/classifier.jsonnet>`_.
+ .. note::
+ In :class:`~optuna.integration.AllenNLPExecutor`,
+ you can pass parameters to AllenNLP by either defining a search space using
+ Optuna suggest methods or setting environment variables just like AllenNLP CLI.
+ If a value is set in both a search space in Optuna and the environment variables,
+ the executor will use the value specified in the search space in Optuna.
+
Args:
trial:
A :class:`~optuna.trial.Trial` corresponding to the current evaluation
@@ -100,17 +107,29 @@
self._include_package = include_package
def _build_params(self) -> Dict[str, Any]:
- """Create a dict of params for AllenNLP."""
- # _build_params is based on allentune's train_func.
- # https://github.com/allenai/allentune/blob/master/allentune/modules/allennlp_runner.py#L34-L65
- for key, value in self._params.items():
- self._params[key] = str(value)
- _params = json.loads(_jsonnet.evaluate_file(self._config_file, ext_vars=self._params))
-
- # _params contains a list of string or string as value values.
+ """Create a dict of params for AllenNLP.
+
+ _build_params is based on allentune's train_func.
+ For more detail, please refer to
+ https://github.com/allenai/allentune/blob/master/allentune/modules/allennlp_runner.py#L34-L65
+
+ """
+ params = self._environment_variables()
+ params.update({key: str(value) for key, value in self._params.items()})
+
+ allennlp_params = json.loads(_jsonnet.evaluate_file(self._config_file, ext_vars=params))
+ # allennlp_params contains a list of string or string as value values.
# Some params couldn't be casted correctly and
# infer_and_cast converts them into desired values.
- return allennlp.common.params.infer_and_cast(_params)
+ return allennlp.common.params.infer_and_cast(allennlp_params)
+
+ @staticmethod
+ def _is_encodable(value: str) -> bool:
+ # https://github.com/allenai/allennlp/blob/master/allennlp/common/params.py#L77-L85
+ return (value == "") or (value.encode("utf-8", "ignore") != b"")
+
+ def _environment_variables(self) -> Dict[str, str]:
+ return {key: value for key, value in os.environ.items() if self._is_encodable(value)}
def run(self) -> float:
"""Train a model using AllenNLP."""
|
{"golden_diff": "diff --git a/optuna/integration/allennlp.py b/optuna/integration/allennlp.py\n--- a/optuna/integration/allennlp.py\n+++ b/optuna/integration/allennlp.py\n@@ -57,6 +57,13 @@\n `config file <https://github.com/optuna/optuna/blob/master/\n examples/allennlp/classifier.jsonnet>`_.\n \n+ .. note::\n+ In :class:`~optuna.integration.AllenNLPExecutor`,\n+ you can pass parameters to AllenNLP by either defining a search space using\n+ Optuna suggest methods or setting environment variables just like AllenNLP CLI.\n+ If a value is set in both a search space in Optuna and the environment variables,\n+ the executor will use the value specified in the search space in Optuna.\n+\n Args:\n trial:\n A :class:`~optuna.trial.Trial` corresponding to the current evaluation\n@@ -100,17 +107,29 @@\n self._include_package = include_package\n \n def _build_params(self) -> Dict[str, Any]:\n- \"\"\"Create a dict of params for AllenNLP.\"\"\"\n- # _build_params is based on allentune's train_func.\n- # https://github.com/allenai/allentune/blob/master/allentune/modules/allennlp_runner.py#L34-L65\n- for key, value in self._params.items():\n- self._params[key] = str(value)\n- _params = json.loads(_jsonnet.evaluate_file(self._config_file, ext_vars=self._params))\n-\n- # _params contains a list of string or string as value values.\n+ \"\"\"Create a dict of params for AllenNLP.\n+\n+ _build_params is based on allentune's train_func.\n+ For more detail, please refer to\n+ https://github.com/allenai/allentune/blob/master/allentune/modules/allennlp_runner.py#L34-L65\n+\n+ \"\"\"\n+ params = self._environment_variables()\n+ params.update({key: str(value) for key, value in self._params.items()})\n+\n+ allennlp_params = json.loads(_jsonnet.evaluate_file(self._config_file, ext_vars=params))\n+ # allennlp_params contains a list of string or string as value values.\n # Some params couldn't be casted correctly and\n # infer_and_cast converts them into desired values.\n- return allennlp.common.params.infer_and_cast(_params)\n+ return allennlp.common.params.infer_and_cast(allennlp_params)\n+\n+ @staticmethod\n+ def _is_encodable(value: str) -> bool:\n+ # https://github.com/allenai/allennlp/blob/master/allennlp/common/params.py#L77-L85\n+ return (value == \"\") or (value.encode(\"utf-8\", \"ignore\") != b\"\")\n+\n+ def _environment_variables(self) -> Dict[str, str]:\n+ return {key: value for key, value in os.environ.items() if self._is_encodable(value)}\n \n def run(self) -> float:\n \"\"\"Train a model using AllenNLP.\"\"\"\n", "issue": "AllenNLP integration: Can't load configurations that expect ext_vars from environment variables\nOptuna's AllenNLP integration evaluates the jsonnet config that you give it, passing in the trial parameters as the `ext_vars`. AllenNLP's default behavior when loading a configuration is a little different, in that it also passes through environment variables: \r\n\r\nhttps://github.com/allenai/allennlp/blob/4de68a42a0df89df01a999ee48f361f24c8c19d4/allennlp/common/params.py#L488\r\n\r\nSo if you rely on specifying e.g. a path to a file as an environment variable, that configuration won't load as expected when using the integration\r\n\r\n## Expected behavior\r\n\r\nOptuna should pass environment variables through when the jsonnet is interpreted. Ideally, it'd just use the AllenNLP config loading code directly so that all behavior is identical, just overriding whatever the trial needs to override.\r\n\r\n## Environment\r\n\r\n- Optuna version: 1.5.0\r\n- Python version: 3.6\r\n- OS: Ubuntu 18.04.4\r\n- (Optional) Other libraries and their versions: AllenNLP 1.0\r\n\r\n## Error messages, stack traces, or logs\r\n\r\nYou'll get `RuntimeError: undefined external variable` during the interpretation of the jsonnet here:\r\n\r\nhttps://github.com/optuna/optuna/blob/9f5c5cf5c36df1628567f0b4a9873892d148ad40/optuna/integration/allennlp.py#L108\r\n\r\n## Steps to reproduce\r\n\r\n1. Use a AllenNLP configuration that expects to be able to use an environment variable to fill an extVar\n", "before_files": [{"content": "import json\nimport os\nfrom typing import Any\nfrom typing import Dict\nfrom typing import List\nfrom typing import Optional\nfrom typing import Union\nimport warnings\n\nimport optuna\nfrom optuna._experimental import experimental\nfrom optuna._imports import try_import\n\nwith try_import() as _imports:\n import allennlp.commands\n import allennlp.common.util\n\nif _imports.is_successful():\n import _jsonnet\n\n\ndef dump_best_config(input_config_file: str, output_config_file: str, study: optuna.Study) -> None:\n \"\"\"Save JSON config file after updating with parameters from the best trial in the study.\n\n Args:\n input_config_file:\n Input Jsonnet config file used with\n :class:`~optuna.integration.AllenNLPExecutor`.\n output_config_file:\n Output JSON config file.\n study:\n Instance of :class:`~optuna.study.Study`.\n Note that :func:`~optuna.study.Study.optimize` must have been called.\n\n \"\"\"\n _imports.check()\n\n best_params = study.best_params\n for key, value in best_params.items():\n best_params[key] = str(value)\n best_config = json.loads(_jsonnet.evaluate_file(input_config_file, ext_vars=best_params))\n best_config = allennlp.common.params.infer_and_cast(best_config)\n\n with open(output_config_file, \"w\") as f:\n json.dump(best_config, f, indent=4)\n\n\n@experimental(\"1.4.0\")\nclass AllenNLPExecutor(object):\n \"\"\"AllenNLP extension to use optuna with Jsonnet config file.\n\n This feature is experimental since AllenNLP major release will come soon.\n The interface may change without prior notice to correspond to the update.\n\n See the examples of `objective function <https://github.com/optuna/optuna/blob/\n master/examples/allennlp/allennlp_jsonnet.py>`_ and\n `config file <https://github.com/optuna/optuna/blob/master/\n examples/allennlp/classifier.jsonnet>`_.\n\n Args:\n trial:\n A :class:`~optuna.trial.Trial` corresponding to the current evaluation\n of the objective function.\n config_file:\n Config file for AllenNLP.\n Hyperparameters should be masked with ``std.extVar``.\n Please refer to `the config example <https://github.com/allenai/allentune/blob/\n master/examples/classifier.jsonnet>`_.\n serialization_dir:\n A path which model weights and logs are saved.\n metrics:\n An evaluation metric for the result of ``objective``.\n include_package:\n Additional packages to include.\n For more information, please see\n `AllenNLP documentation <https://docs.allennlp.org/master/api/commands/train/>`_.\n\n \"\"\"\n\n def __init__(\n self,\n trial: optuna.Trial,\n config_file: str,\n serialization_dir: str,\n metrics: str = \"best_validation_accuracy\",\n *,\n include_package: Optional[Union[str, List[str]]] = None\n ):\n _imports.check()\n\n self._params = trial.params\n self._config_file = config_file\n self._serialization_dir = serialization_dir\n self._metrics = metrics\n if include_package is None:\n include_package = []\n if isinstance(include_package, str):\n self._include_package = [include_package]\n else:\n self._include_package = include_package\n\n def _build_params(self) -> Dict[str, Any]:\n \"\"\"Create a dict of params for AllenNLP.\"\"\"\n # _build_params is based on allentune's train_func.\n # https://github.com/allenai/allentune/blob/master/allentune/modules/allennlp_runner.py#L34-L65\n for key, value in self._params.items():\n self._params[key] = str(value)\n _params = json.loads(_jsonnet.evaluate_file(self._config_file, ext_vars=self._params))\n\n # _params contains a list of string or string as value values.\n # Some params couldn't be casted correctly and\n # infer_and_cast converts them into desired values.\n return allennlp.common.params.infer_and_cast(_params)\n\n def run(self) -> float:\n \"\"\"Train a model using AllenNLP.\"\"\"\n try:\n import_func = allennlp.common.util.import_submodules\n except AttributeError:\n import_func = allennlp.common.util.import_module_and_submodules\n warnings.warn(\"AllenNLP>0.9 has not been supported officially yet.\")\n\n for package_name in self._include_package:\n import_func(package_name)\n\n params = allennlp.common.params.Params(self._build_params())\n allennlp.commands.train.train_model(params, self._serialization_dir)\n\n metrics = json.load(open(os.path.join(self._serialization_dir, \"metrics.json\")))\n return metrics[self._metrics]\n", "path": "optuna/integration/allennlp.py"}]}
| 2,266 | 696 |
gh_patches_debug_32590
|
rasdani/github-patches
|
git_diff
|
Lightning-AI__torchmetrics-2180
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
`MeanAveragePrecision` update method does not accept `torchvision.datapoints.BoundingBox` arguments
## 🐛 Bug
When the `preds` or `target` arguments to `MeanAveragePrecision.update` method are not of the type `list[dict[str,Tensor]]` a ValueError is raised, but this precludes dictionary values of type `torchvision.datapoints.BoundingBox` which inherit from Tensor.
The ValueError is raised in the function `torchmetrics.detection.helpers._input_validator`. I think this could be fixed by changing all the lines like
`if any(type(target[ivn]) is not Tensor for target in targets):`
to be something like
`if not all(isinstance(target[ivn], Tensor) for target in targets):`
One could also validate that the `BoundingBox.format` is the same as `MeanAveragePrecision.box_format` whenever a BoundingBox class is passed to the update method.
### To Reproduce
```python
from torch import tensor
from torchmetrics.detection import MeanAveragePrecision
from torchvision.datapoints import BoundingBox, BoundingBoxFormat
preds = [
dict(
boxes=tensor([[1.0, 2.0, 1.0, 2.0]]),
scores=tensor([0.1]),
labels=tensor([0]),
)
]
bounding_box = BoundingBox(
data=tensor([[1.0, 2.0, 1.0, 2.0]]),
format=BoundingBoxFormat.XYXY,
spatial_size=(100,100)
)
target = [
dict(
boxes=bounding_box,
labels=tensor([0]),
)
]
metric = MeanAveragePrecision(iou_type='bbox', box_format='xyxy')
metric.update(preds, target)
```
### Expected behavior
`MeanAveragePrecision.update` should accept `torchvision.datapoints.BoundingBox` arguments.
### Environment
python 3.11.4
pytorch 2.0.1
torchmetrics 1.2.0
torchvision 0.15.2
</issue>
<code>
[start of src/torchmetrics/detection/helpers.py]
1 # Copyright The PyTorch Lightning team.
2 #
3 # Licensed under the Apache License, Version 2.0 (the "License");
4 # you may not use this file except in compliance with the License.
5 # You may obtain a copy of the License at
6 #
7 # http://www.apache.org/licenses/LICENSE-2.0
8 #
9 # Unless required by applicable law or agreed to in writing, software
10 # distributed under the License is distributed on an "AS IS" BASIS,
11 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 # See the License for the specific language governing permissions and
13 # limitations under the License.
14 from typing import Dict, Literal, Sequence, Tuple, Union
15
16 from torch import Tensor
17
18
19 def _input_validator(
20 preds: Sequence[Dict[str, Tensor]],
21 targets: Sequence[Dict[str, Tensor]],
22 iou_type: Union[Literal["bbox", "segm"], Tuple[Literal["bbox", "segm"]]] = "bbox",
23 ignore_score: bool = False,
24 ) -> None:
25 """Ensure the correct input format of `preds` and `targets`."""
26 if isinstance(iou_type, str):
27 iou_type = (iou_type,)
28
29 name_map = {"bbox": "boxes", "segm": "masks"}
30 if any(tp not in name_map for tp in iou_type):
31 raise Exception(f"IOU type {iou_type} is not supported")
32 item_val_name = [name_map[tp] for tp in iou_type]
33
34 if not isinstance(preds, Sequence):
35 raise ValueError(f"Expected argument `preds` to be of type Sequence, but got {preds}")
36 if not isinstance(targets, Sequence):
37 raise ValueError(f"Expected argument `target` to be of type Sequence, but got {targets}")
38 if len(preds) != len(targets):
39 raise ValueError(
40 f"Expected argument `preds` and `target` to have the same length, but got {len(preds)} and {len(targets)}"
41 )
42
43 for k in [*item_val_name, "labels"] + (["scores"] if not ignore_score else []):
44 if any(k not in p for p in preds):
45 raise ValueError(f"Expected all dicts in `preds` to contain the `{k}` key")
46
47 for k in [*item_val_name, "labels"]:
48 if any(k not in p for p in targets):
49 raise ValueError(f"Expected all dicts in `target` to contain the `{k}` key")
50
51 for ivn in item_val_name:
52 if any(type(pred[ivn]) is not Tensor for pred in preds):
53 raise ValueError(f"Expected all {ivn} in `preds` to be of type Tensor")
54 if not ignore_score and any(type(pred["scores"]) is not Tensor for pred in preds):
55 raise ValueError("Expected all scores in `preds` to be of type Tensor")
56 if any(type(pred["labels"]) is not Tensor for pred in preds):
57 raise ValueError("Expected all labels in `preds` to be of type Tensor")
58 for ivn in item_val_name:
59 if any(type(target[ivn]) is not Tensor for target in targets):
60 raise ValueError(f"Expected all {ivn} in `target` to be of type Tensor")
61 if any(type(target["labels"]) is not Tensor for target in targets):
62 raise ValueError("Expected all labels in `target` to be of type Tensor")
63
64 for i, item in enumerate(targets):
65 for ivn in item_val_name:
66 if item[ivn].size(0) != item["labels"].size(0):
67 raise ValueError(
68 f"Input '{ivn}' and labels of sample {i} in targets have a"
69 f" different length (expected {item[ivn].size(0)} labels, got {item['labels'].size(0)})"
70 )
71 if ignore_score:
72 return
73 for i, item in enumerate(preds):
74 for ivn in item_val_name:
75 if not (item[ivn].size(0) == item["labels"].size(0) == item["scores"].size(0)):
76 raise ValueError(
77 f"Input '{ivn}', labels and scores of sample {i} in predictions have a"
78 f" different length (expected {item[ivn].size(0)} labels and scores,"
79 f" got {item['labels'].size(0)} labels and {item['scores'].size(0)})"
80 )
81
82
83 def _fix_empty_tensors(boxes: Tensor) -> Tensor:
84 """Empty tensors can cause problems in DDP mode, this methods corrects them."""
85 if boxes.numel() == 0 and boxes.ndim == 1:
86 return boxes.unsqueeze(0)
87 return boxes
88
89
90 def _validate_iou_type_arg(iou_type: Union[Literal["bbox", "segm"], Tuple[str]] = "bbox") -> Tuple[str]:
91 allowed_iou_types = ("segm", "bbox")
92 if isinstance(iou_type, str):
93 iou_type = (iou_type,)
94 if any(tp not in allowed_iou_types for tp in iou_type):
95 raise ValueError(
96 f"Expected argument `iou_type` to be one of {allowed_iou_types} or a list of, but got {iou_type}"
97 )
98 return iou_type
99
[end of src/torchmetrics/detection/helpers.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/src/torchmetrics/detection/helpers.py b/src/torchmetrics/detection/helpers.py
--- a/src/torchmetrics/detection/helpers.py
+++ b/src/torchmetrics/detection/helpers.py
@@ -49,16 +49,16 @@
raise ValueError(f"Expected all dicts in `target` to contain the `{k}` key")
for ivn in item_val_name:
- if any(type(pred[ivn]) is not Tensor for pred in preds):
+ if not all(isinstance(pred[ivn], Tensor) for pred in preds):
raise ValueError(f"Expected all {ivn} in `preds` to be of type Tensor")
- if not ignore_score and any(type(pred["scores"]) is not Tensor for pred in preds):
+ if not ignore_score and not all(isinstance(pred["scores"], Tensor) for pred in preds):
raise ValueError("Expected all scores in `preds` to be of type Tensor")
- if any(type(pred["labels"]) is not Tensor for pred in preds):
+ if not all(isinstance(pred["labels"], Tensor) for pred in preds):
raise ValueError("Expected all labels in `preds` to be of type Tensor")
for ivn in item_val_name:
- if any(type(target[ivn]) is not Tensor for target in targets):
+ if not all(isinstance(target[ivn], Tensor) for target in targets):
raise ValueError(f"Expected all {ivn} in `target` to be of type Tensor")
- if any(type(target["labels"]) is not Tensor for target in targets):
+ if not all(isinstance(target["labels"], Tensor) for target in targets):
raise ValueError("Expected all labels in `target` to be of type Tensor")
for i, item in enumerate(targets):
@@ -88,6 +88,7 @@
def _validate_iou_type_arg(iou_type: Union[Literal["bbox", "segm"], Tuple[str]] = "bbox") -> Tuple[str]:
+ """Validate that iou type argument is correct."""
allowed_iou_types = ("segm", "bbox")
if isinstance(iou_type, str):
iou_type = (iou_type,)
|
{"golden_diff": "diff --git a/src/torchmetrics/detection/helpers.py b/src/torchmetrics/detection/helpers.py\n--- a/src/torchmetrics/detection/helpers.py\n+++ b/src/torchmetrics/detection/helpers.py\n@@ -49,16 +49,16 @@\n raise ValueError(f\"Expected all dicts in `target` to contain the `{k}` key\")\n \n for ivn in item_val_name:\n- if any(type(pred[ivn]) is not Tensor for pred in preds):\n+ if not all(isinstance(pred[ivn], Tensor) for pred in preds):\n raise ValueError(f\"Expected all {ivn} in `preds` to be of type Tensor\")\n- if not ignore_score and any(type(pred[\"scores\"]) is not Tensor for pred in preds):\n+ if not ignore_score and not all(isinstance(pred[\"scores\"], Tensor) for pred in preds):\n raise ValueError(\"Expected all scores in `preds` to be of type Tensor\")\n- if any(type(pred[\"labels\"]) is not Tensor for pred in preds):\n+ if not all(isinstance(pred[\"labels\"], Tensor) for pred in preds):\n raise ValueError(\"Expected all labels in `preds` to be of type Tensor\")\n for ivn in item_val_name:\n- if any(type(target[ivn]) is not Tensor for target in targets):\n+ if not all(isinstance(target[ivn], Tensor) for target in targets):\n raise ValueError(f\"Expected all {ivn} in `target` to be of type Tensor\")\n- if any(type(target[\"labels\"]) is not Tensor for target in targets):\n+ if not all(isinstance(target[\"labels\"], Tensor) for target in targets):\n raise ValueError(\"Expected all labels in `target` to be of type Tensor\")\n \n for i, item in enumerate(targets):\n@@ -88,6 +88,7 @@\n \n \n def _validate_iou_type_arg(iou_type: Union[Literal[\"bbox\", \"segm\"], Tuple[str]] = \"bbox\") -> Tuple[str]:\n+ \"\"\"Validate that iou type argument is correct.\"\"\"\n allowed_iou_types = (\"segm\", \"bbox\")\n if isinstance(iou_type, str):\n iou_type = (iou_type,)\n", "issue": "`MeanAveragePrecision` update method does not accept `torchvision.datapoints.BoundingBox` arguments\n## \ud83d\udc1b Bug\r\n\r\nWhen the `preds` or `target` arguments to `MeanAveragePrecision.update` method are not of the type `list[dict[str,Tensor]]` a ValueError is raised, but this precludes dictionary values of type `torchvision.datapoints.BoundingBox` which inherit from Tensor. \r\n\r\nThe ValueError is raised in the function `torchmetrics.detection.helpers._input_validator`. I think this could be fixed by changing all the lines like \r\n\r\n`if any(type(target[ivn]) is not Tensor for target in targets):`\r\n\r\nto be something like\r\n\r\n`if not all(isinstance(target[ivn], Tensor) for target in targets):`\r\n\r\nOne could also validate that the `BoundingBox.format` is the same as `MeanAveragePrecision.box_format` whenever a BoundingBox class is passed to the update method.\r\n\r\n### To Reproduce\r\n\r\n```python\r\nfrom torch import tensor\r\nfrom torchmetrics.detection import MeanAveragePrecision\r\nfrom torchvision.datapoints import BoundingBox, BoundingBoxFormat\r\n\r\npreds = [\r\n dict(\r\n boxes=tensor([[1.0, 2.0, 1.0, 2.0]]),\r\n scores=tensor([0.1]),\r\n labels=tensor([0]),\r\n )\r\n]\r\n\r\nbounding_box = BoundingBox(\r\n data=tensor([[1.0, 2.0, 1.0, 2.0]]),\r\n format=BoundingBoxFormat.XYXY,\r\n spatial_size=(100,100)\r\n)\r\ntarget = [\r\n dict(\r\n boxes=bounding_box,\r\n labels=tensor([0]),\r\n )\r\n]\r\n\r\nmetric = MeanAveragePrecision(iou_type='bbox', box_format='xyxy')\r\nmetric.update(preds, target)\r\n```\r\n\r\n### Expected behavior\r\n\r\n`MeanAveragePrecision.update` should accept `torchvision.datapoints.BoundingBox` arguments.\r\n\r\n### Environment\r\npython 3.11.4\r\npytorch 2.0.1\r\ntorchmetrics 1.2.0\r\ntorchvision 0.15.2\r\n\r\n\n", "before_files": [{"content": "# Copyright The PyTorch Lightning team.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\nfrom typing import Dict, Literal, Sequence, Tuple, Union\n\nfrom torch import Tensor\n\n\ndef _input_validator(\n preds: Sequence[Dict[str, Tensor]],\n targets: Sequence[Dict[str, Tensor]],\n iou_type: Union[Literal[\"bbox\", \"segm\"], Tuple[Literal[\"bbox\", \"segm\"]]] = \"bbox\",\n ignore_score: bool = False,\n) -> None:\n \"\"\"Ensure the correct input format of `preds` and `targets`.\"\"\"\n if isinstance(iou_type, str):\n iou_type = (iou_type,)\n\n name_map = {\"bbox\": \"boxes\", \"segm\": \"masks\"}\n if any(tp not in name_map for tp in iou_type):\n raise Exception(f\"IOU type {iou_type} is not supported\")\n item_val_name = [name_map[tp] for tp in iou_type]\n\n if not isinstance(preds, Sequence):\n raise ValueError(f\"Expected argument `preds` to be of type Sequence, but got {preds}\")\n if not isinstance(targets, Sequence):\n raise ValueError(f\"Expected argument `target` to be of type Sequence, but got {targets}\")\n if len(preds) != len(targets):\n raise ValueError(\n f\"Expected argument `preds` and `target` to have the same length, but got {len(preds)} and {len(targets)}\"\n )\n\n for k in [*item_val_name, \"labels\"] + ([\"scores\"] if not ignore_score else []):\n if any(k not in p for p in preds):\n raise ValueError(f\"Expected all dicts in `preds` to contain the `{k}` key\")\n\n for k in [*item_val_name, \"labels\"]:\n if any(k not in p for p in targets):\n raise ValueError(f\"Expected all dicts in `target` to contain the `{k}` key\")\n\n for ivn in item_val_name:\n if any(type(pred[ivn]) is not Tensor for pred in preds):\n raise ValueError(f\"Expected all {ivn} in `preds` to be of type Tensor\")\n if not ignore_score and any(type(pred[\"scores\"]) is not Tensor for pred in preds):\n raise ValueError(\"Expected all scores in `preds` to be of type Tensor\")\n if any(type(pred[\"labels\"]) is not Tensor for pred in preds):\n raise ValueError(\"Expected all labels in `preds` to be of type Tensor\")\n for ivn in item_val_name:\n if any(type(target[ivn]) is not Tensor for target in targets):\n raise ValueError(f\"Expected all {ivn} in `target` to be of type Tensor\")\n if any(type(target[\"labels\"]) is not Tensor for target in targets):\n raise ValueError(\"Expected all labels in `target` to be of type Tensor\")\n\n for i, item in enumerate(targets):\n for ivn in item_val_name:\n if item[ivn].size(0) != item[\"labels\"].size(0):\n raise ValueError(\n f\"Input '{ivn}' and labels of sample {i} in targets have a\"\n f\" different length (expected {item[ivn].size(0)} labels, got {item['labels'].size(0)})\"\n )\n if ignore_score:\n return\n for i, item in enumerate(preds):\n for ivn in item_val_name:\n if not (item[ivn].size(0) == item[\"labels\"].size(0) == item[\"scores\"].size(0)):\n raise ValueError(\n f\"Input '{ivn}', labels and scores of sample {i} in predictions have a\"\n f\" different length (expected {item[ivn].size(0)} labels and scores,\"\n f\" got {item['labels'].size(0)} labels and {item['scores'].size(0)})\"\n )\n\n\ndef _fix_empty_tensors(boxes: Tensor) -> Tensor:\n \"\"\"Empty tensors can cause problems in DDP mode, this methods corrects them.\"\"\"\n if boxes.numel() == 0 and boxes.ndim == 1:\n return boxes.unsqueeze(0)\n return boxes\n\n\ndef _validate_iou_type_arg(iou_type: Union[Literal[\"bbox\", \"segm\"], Tuple[str]] = \"bbox\") -> Tuple[str]:\n allowed_iou_types = (\"segm\", \"bbox\")\n if isinstance(iou_type, str):\n iou_type = (iou_type,)\n if any(tp not in allowed_iou_types for tp in iou_type):\n raise ValueError(\n f\"Expected argument `iou_type` to be one of {allowed_iou_types} or a list of, but got {iou_type}\"\n )\n return iou_type\n", "path": "src/torchmetrics/detection/helpers.py"}]}
| 2,324 | 473 |
gh_patches_debug_7138
|
rasdani/github-patches
|
git_diff
|
e-valuation__EvaP-354
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Result detail pages need to show total grades and participation
The `results/course_detail` pages should again show the information that is already given on the overview page (average and medium grades and participation).
</issue>
<code>
[start of evap/results/views.py]
1 from django.conf import settings
2 from django.http import HttpResponse
3 from django.shortcuts import get_object_or_404, render_to_response
4 from django.template import RequestContext
5 from django.utils.translation import get_language
6
7 from evap.evaluation.auth import login_required, fsr_required
8 from evap.evaluation.models import Semester
9 from evap.evaluation.tools import calculate_results, calculate_average_and_medium_grades, TextResult, can_publish_grades
10
11 from evap.results.exporters import ExcelExporter
12
13
14 @login_required
15 def index(request):
16 semesters = Semester.get_all_with_published_courses()
17
18 return render_to_response(
19 "results_index.html",
20 dict(semesters=semesters),
21 context_instance=RequestContext(request))
22
23
24 @login_required
25 def semester_detail(request, semester_id):
26 semester = get_object_or_404(Semester, id=semester_id)
27 courses = list(semester.course_set.filter(state="published"))
28
29 # annotate each course object with its grades
30 for course in courses:
31 # first, make sure that there are no preexisting grade attributes
32 course.avg_grade, course.med_grade = calculate_average_and_medium_grades(course)
33 course.can_publish_grades = can_publish_grades(course, request.user.is_staff)
34
35 return render_to_response(
36 "results_semester_detail.html",
37 dict(
38 semester=semester,
39 courses=courses
40 ),
41 context_instance=RequestContext(request))
42
43
44 @fsr_required
45 def semester_export(request, semester_id):
46 semester = get_object_or_404(Semester, id=semester_id)
47
48 filename = "Evaluation-%s-%s.xls" % (semester.name, get_language())
49
50 response = HttpResponse(mimetype="application/vnd.ms-excel")
51 response["Content-Disposition"] = "attachment; filename=\"%s\"" % filename
52
53 exporter = ExcelExporter(semester)
54
55 if 'all' in request.GET:
56 exporter.export(response, True)
57 else:
58 exporter.export(response)
59
60 return response
61
62
63 @login_required
64 def course_detail(request, semester_id, course_id):
65 semester = get_object_or_404(Semester, id=semester_id)
66
67 # staff can see preview of results even when course is not published
68 if request.user.is_staff:
69 course = get_object_or_404(semester.course_set.filter(state__in=['inEvaluation', 'evaluated', 'reviewed', 'published']), id=course_id)
70 # everyone else can only see published results
71 else:
72 course = get_object_or_404(semester.course_set.filter(state="published"), id=course_id)
73
74 sections = calculate_results(course, request.user.is_staff)
75
76 if (request.user.is_staff == False): # if user is not a student representative
77 # remove TextResults if user is neither the evaluated person (or a delegate) nor responsible for the course (or a delegate)
78 for section in sections:
79 if not user_can_see_textresults(request.user, course, section):
80 for index, result in list(enumerate(section.results))[::-1]:
81 if isinstance(section.results[index], TextResult):
82 del section.results[index]
83
84 # remove empty sections
85 sections = [section for section in sections if section.results]
86
87 # show a warning if course is still in evaluation (for staff preview)
88 evaluation_warning = course.state != 'published'
89
90 # check whether course has a sufficient number of votes for publishing it
91 sufficient_votes = course.num_voters >= settings.MIN_ANSWER_COUNT and float(course.num_voters) / course.num_participants >= settings.MIN_ANSWER_PERCENTAGE
92
93 # results for a course might not be visible because there are not enough answers
94 # but it can still be "published" e.g. to show the comment results to lecturers
95 # the FSR can still see all results but gets a warning message
96 sufficient_votes_warning = (not sufficient_votes) and request.user.is_staff
97
98 return render_to_response(
99 "results_course_detail.html",
100 dict(
101 course=course,
102 sections=sections,
103 evaluation_warning=evaluation_warning,
104 sufficient_votes_warning=sufficient_votes_warning
105 ),
106 context_instance=RequestContext(request))
107
108
109 def user_can_see_textresults(user, course, section):
110 if section.contributor == user:
111 return True
112 if course.is_user_responsible_or_delegate(user):
113 return True
114
115 represented_userprofiles = user.represented_users.all()
116 represented_users = [profile.user for profile in represented_userprofiles]
117 if section.contributor in represented_users:
118 return True
119
120 return False
121
[end of evap/results/views.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/evap/results/views.py b/evap/results/views.py
--- a/evap/results/views.py
+++ b/evap/results/views.py
@@ -95,6 +95,9 @@
# the FSR can still see all results but gets a warning message
sufficient_votes_warning = (not sufficient_votes) and request.user.is_staff
+ course.avg_grade, course.med_grade = calculate_average_and_medium_grades(course)
+ course.can_publish_grades = can_publish_grades(course, request.user.is_staff)
+
return render_to_response(
"results_course_detail.html",
dict(
|
{"golden_diff": "diff --git a/evap/results/views.py b/evap/results/views.py\n--- a/evap/results/views.py\n+++ b/evap/results/views.py\n@@ -95,6 +95,9 @@\n # the FSR can still see all results but gets a warning message\n sufficient_votes_warning = (not sufficient_votes) and request.user.is_staff\n \n+ course.avg_grade, course.med_grade = calculate_average_and_medium_grades(course)\n+ course.can_publish_grades = can_publish_grades(course, request.user.is_staff)\n+\n return render_to_response(\n \"results_course_detail.html\",\n dict(\n", "issue": "Result detail pages need to show total grades and participation\nThe `results/course_detail` pages should again show the information that is already given on the overview page (average and medium grades and participation).\n\n", "before_files": [{"content": "from django.conf import settings\nfrom django.http import HttpResponse\nfrom django.shortcuts import get_object_or_404, render_to_response\nfrom django.template import RequestContext\nfrom django.utils.translation import get_language\n\nfrom evap.evaluation.auth import login_required, fsr_required\nfrom evap.evaluation.models import Semester\nfrom evap.evaluation.tools import calculate_results, calculate_average_and_medium_grades, TextResult, can_publish_grades\n\nfrom evap.results.exporters import ExcelExporter\n\n\n@login_required\ndef index(request):\n semesters = Semester.get_all_with_published_courses()\n\n return render_to_response(\n \"results_index.html\",\n dict(semesters=semesters),\n context_instance=RequestContext(request))\n\n\n@login_required\ndef semester_detail(request, semester_id):\n semester = get_object_or_404(Semester, id=semester_id)\n courses = list(semester.course_set.filter(state=\"published\"))\n\n # annotate each course object with its grades\n for course in courses:\n # first, make sure that there are no preexisting grade attributes\n course.avg_grade, course.med_grade = calculate_average_and_medium_grades(course)\n course.can_publish_grades = can_publish_grades(course, request.user.is_staff)\n\n return render_to_response(\n \"results_semester_detail.html\",\n dict(\n semester=semester,\n courses=courses\n ),\n context_instance=RequestContext(request))\n\n\n@fsr_required\ndef semester_export(request, semester_id):\n semester = get_object_or_404(Semester, id=semester_id)\n\n filename = \"Evaluation-%s-%s.xls\" % (semester.name, get_language())\n\n response = HttpResponse(mimetype=\"application/vnd.ms-excel\")\n response[\"Content-Disposition\"] = \"attachment; filename=\\\"%s\\\"\" % filename\n\n exporter = ExcelExporter(semester)\n\n if 'all' in request.GET:\n exporter.export(response, True)\n else:\n exporter.export(response)\n\n return response\n\n\n@login_required\ndef course_detail(request, semester_id, course_id):\n semester = get_object_or_404(Semester, id=semester_id)\n \n # staff can see preview of results even when course is not published\n if request.user.is_staff:\n course = get_object_or_404(semester.course_set.filter(state__in=['inEvaluation', 'evaluated', 'reviewed', 'published']), id=course_id)\n # everyone else can only see published results\n else:\n course = get_object_or_404(semester.course_set.filter(state=\"published\"), id=course_id)\n\n sections = calculate_results(course, request.user.is_staff)\n\n if (request.user.is_staff == False): # if user is not a student representative\n # remove TextResults if user is neither the evaluated person (or a delegate) nor responsible for the course (or a delegate)\n for section in sections:\n if not user_can_see_textresults(request.user, course, section):\n for index, result in list(enumerate(section.results))[::-1]:\n if isinstance(section.results[index], TextResult):\n del section.results[index]\n\n # remove empty sections\n sections = [section for section in sections if section.results]\n\n # show a warning if course is still in evaluation (for staff preview)\n evaluation_warning = course.state != 'published'\n\n # check whether course has a sufficient number of votes for publishing it\n sufficient_votes = course.num_voters >= settings.MIN_ANSWER_COUNT and float(course.num_voters) / course.num_participants >= settings.MIN_ANSWER_PERCENTAGE\n\n # results for a course might not be visible because there are not enough answers\n # but it can still be \"published\" e.g. to show the comment results to lecturers\n # the FSR can still see all results but gets a warning message\n sufficient_votes_warning = (not sufficient_votes) and request.user.is_staff\n\n return render_to_response(\n \"results_course_detail.html\",\n dict(\n course=course,\n sections=sections,\n evaluation_warning=evaluation_warning,\n sufficient_votes_warning=sufficient_votes_warning\n ),\n context_instance=RequestContext(request))\n\n\ndef user_can_see_textresults(user, course, section):\n if section.contributor == user:\n return True\n if course.is_user_responsible_or_delegate(user):\n return True\n\n represented_userprofiles = user.represented_users.all()\n represented_users = [profile.user for profile in represented_userprofiles]\n if section.contributor in represented_users:\n return True\n\n return False\n", "path": "evap/results/views.py"}]}
| 1,812 | 134 |
gh_patches_debug_22440
|
rasdani/github-patches
|
git_diff
|
dask__dask-7688
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Feature: add sizeof entry-points hook
I was recently thinking about how to add `sizeof` support to Dask for a particular library ([Awkward Array](https://github.com/scikit-hep/awkward-1.0)). Currently, either Dask needs to be extended to support the library in question, or the library itself needs to be manually invoked to register the custom `sizeof` implementation.
I know that Dask can default to `__sizeof__`, but I'm not sure whether that is the best decision here. `__sizeof__` should be the in-memory size of (just) the object, but in this particular case, an Awkward `Array` might not even own the data it refers to. I wouldn't expect `__sizeof__` to report that memory. From the `sys.getsizeof` documentation,
> Only the memory consumption directly attributed to the object is accounted for, not the memory consumption of objects it refers to.
I think that this would be a good candidate for `entry_points`. On startup, Dask can look for any registered entry-points that declare custom size-of functions, such that the user never needs to import the library explicitly on the worker, and the core of Dask can remain light-weight.
There are some performance concerns with `entry_points`, but projects like [entrypoints](https://github.com/takluyver/entrypoints) claim to ameliorate the issue.
</issue>
<code>
[start of dask/sizeof.py]
1 import itertools
2 import random
3 import sys
4 from array import array
5
6 from dask.utils import Dispatch
7
8 sizeof = Dispatch(name="sizeof")
9
10
11 @sizeof.register(object)
12 def sizeof_default(o):
13 return sys.getsizeof(o)
14
15
16 @sizeof.register(bytes)
17 @sizeof.register(bytearray)
18 def sizeof_bytes(o):
19 return len(o)
20
21
22 @sizeof.register(memoryview)
23 def sizeof_memoryview(o):
24 return o.nbytes
25
26
27 @sizeof.register(array)
28 def sizeof_array(o):
29 return o.itemsize * len(o)
30
31
32 @sizeof.register(list)
33 @sizeof.register(tuple)
34 @sizeof.register(set)
35 @sizeof.register(frozenset)
36 def sizeof_python_collection(seq):
37 num_items = len(seq)
38 num_samples = 10
39 if num_items > num_samples:
40 if isinstance(seq, (set, frozenset)):
41 # As of Python v3.9, it is deprecated to call random.sample() on
42 # sets but since sets are unordered anyways we can simply pick
43 # the first `num_samples` items.
44 samples = itertools.islice(seq, num_samples)
45 else:
46 samples = random.sample(seq, num_samples)
47 return sys.getsizeof(seq) + int(
48 num_items / num_samples * sum(map(sizeof, samples))
49 )
50 else:
51 return sys.getsizeof(seq) + sum(map(sizeof, seq))
52
53
54 class SimpleSizeof:
55 """Sentinel class to mark a class to be skipped by the dispatcher. This only
56 works if this sentinel mixin is first in the mro.
57
58 Examples
59 --------
60
61 >>> class TheAnswer(SimpleSizeof):
62 ... def __sizeof__(self):
63 ... # Sizeof always add overhead of an object for GC
64 ... return 42 - sizeof(object())
65
66 >>> sizeof(TheAnswer())
67 42
68
69 """
70
71
72 @sizeof.register(SimpleSizeof)
73 def sizeof_blocked(d):
74 return sys.getsizeof(d)
75
76
77 @sizeof.register(dict)
78 def sizeof_python_dict(d):
79 return (
80 sys.getsizeof(d)
81 + sizeof(list(d.keys()))
82 + sizeof(list(d.values()))
83 - 2 * sizeof(list())
84 )
85
86
87 @sizeof.register_lazy("cupy")
88 def register_cupy():
89 import cupy
90
91 @sizeof.register(cupy.ndarray)
92 def sizeof_cupy_ndarray(x):
93 return int(x.nbytes)
94
95
96 @sizeof.register_lazy("numba")
97 def register_numba():
98 import numba.cuda
99
100 @sizeof.register(numba.cuda.cudadrv.devicearray.DeviceNDArray)
101 def sizeof_numba_devicendarray(x):
102 return int(x.nbytes)
103
104
105 @sizeof.register_lazy("rmm")
106 def register_rmm():
107 import rmm
108
109 # Only included in 0.11.0+
110 if hasattr(rmm, "DeviceBuffer"):
111
112 @sizeof.register(rmm.DeviceBuffer)
113 def sizeof_rmm_devicebuffer(x):
114 return int(x.nbytes)
115
116
117 @sizeof.register_lazy("numpy")
118 def register_numpy():
119 import numpy as np
120
121 @sizeof.register(np.ndarray)
122 def sizeof_numpy_ndarray(x):
123 if 0 in x.strides:
124 xs = x[tuple(slice(None) if s != 0 else slice(1) for s in x.strides)]
125 return xs.nbytes
126 return int(x.nbytes)
127
128
129 @sizeof.register_lazy("pandas")
130 def register_pandas():
131 import numpy as np
132 import pandas as pd
133
134 def object_size(x):
135 if not len(x):
136 return 0
137 sample = np.random.choice(x, size=20, replace=True)
138 sample = list(map(sizeof, sample))
139 return sum(sample) / 20 * len(x)
140
141 @sizeof.register(pd.DataFrame)
142 def sizeof_pandas_dataframe(df):
143 p = sizeof(df.index)
144 for name, col in df.items():
145 p += col.memory_usage(index=False)
146 if col.dtype == object:
147 p += object_size(col._values)
148 return int(p) + 1000
149
150 @sizeof.register(pd.Series)
151 def sizeof_pandas_series(s):
152 p = int(s.memory_usage(index=True))
153 if s.dtype == object:
154 p += object_size(s._values)
155 if s.index.dtype == object:
156 p += object_size(s.index)
157 return int(p) + 1000
158
159 @sizeof.register(pd.Index)
160 def sizeof_pandas_index(i):
161 p = int(i.memory_usage())
162 if i.dtype == object:
163 p += object_size(i)
164 return int(p) + 1000
165
166 @sizeof.register(pd.MultiIndex)
167 def sizeof_pandas_multiindex(i):
168 p = int(sum(object_size(l) for l in i.levels))
169 for c in i.codes if hasattr(i, "codes") else i.labels:
170 p += c.nbytes
171 return int(p) + 1000
172
173
174 @sizeof.register_lazy("scipy")
175 def register_spmatrix():
176 from scipy import sparse
177
178 @sizeof.register(sparse.dok_matrix)
179 def sizeof_spmatrix_dok(s):
180 return s.__sizeof__()
181
182 @sizeof.register(sparse.spmatrix)
183 def sizeof_spmatrix(s):
184 return sum(sizeof(v) for v in s.__dict__.values())
185
186
187 @sizeof.register_lazy("pyarrow")
188 def register_pyarrow():
189 import pyarrow as pa
190
191 def _get_col_size(data):
192 p = 0
193 if not isinstance(data, pa.ChunkedArray):
194 data = data.data # pyarrow <0.15.0
195 for chunk in data.iterchunks():
196 for buffer in chunk.buffers():
197 if buffer:
198 p += buffer.size
199 return p
200
201 @sizeof.register(pa.Table)
202 def sizeof_pyarrow_table(table):
203 p = sizeof(table.schema.metadata)
204 for col in table.itercolumns():
205 p += _get_col_size(col)
206 return int(p) + 1000
207
208 @sizeof.register(pa.ChunkedArray)
209 def sizeof_pyarrow_chunked_array(data):
210 return int(_get_col_size(data)) + 1000
211
[end of dask/sizeof.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/dask/sizeof.py b/dask/sizeof.py
--- a/dask/sizeof.py
+++ b/dask/sizeof.py
@@ -1,4 +1,6 @@
+import importlib.metadata
import itertools
+import logging
import random
import sys
from array import array
@@ -7,6 +9,8 @@
sizeof = Dispatch(name="sizeof")
+logger = logging.getLogger(__name__)
+
@sizeof.register(object)
def sizeof_default(o):
@@ -208,3 +212,23 @@
@sizeof.register(pa.ChunkedArray)
def sizeof_pyarrow_chunked_array(data):
return int(_get_col_size(data)) + 1000
+
+
+def _register_entry_point_plugins():
+ """Register sizeof implementations exposed by the entry_point mechanism."""
+ if sys.version_info >= (3, 10):
+ sizeof_entry_points = importlib.metadata.entry_points(group="dask.sizeof")
+ else:
+ sizeof_entry_points = importlib.metadata.entry_points().get("dask.sizeof", [])
+
+ for entry_point in sizeof_entry_points:
+ registrar = entry_point.load()
+ try:
+ registrar(sizeof)
+ except Exception:
+ logger.exception(
+ f"Failed to register sizeof entry point {entry_point.name}"
+ )
+
+
+_register_entry_point_plugins()
|
{"golden_diff": "diff --git a/dask/sizeof.py b/dask/sizeof.py\n--- a/dask/sizeof.py\n+++ b/dask/sizeof.py\n@@ -1,4 +1,6 @@\n+import importlib.metadata\n import itertools\n+import logging\n import random\n import sys\n from array import array\n@@ -7,6 +9,8 @@\n \n sizeof = Dispatch(name=\"sizeof\")\n \n+logger = logging.getLogger(__name__)\n+\n \n @sizeof.register(object)\n def sizeof_default(o):\n@@ -208,3 +212,23 @@\n @sizeof.register(pa.ChunkedArray)\n def sizeof_pyarrow_chunked_array(data):\n return int(_get_col_size(data)) + 1000\n+\n+\n+def _register_entry_point_plugins():\n+ \"\"\"Register sizeof implementations exposed by the entry_point mechanism.\"\"\"\n+ if sys.version_info >= (3, 10):\n+ sizeof_entry_points = importlib.metadata.entry_points(group=\"dask.sizeof\")\n+ else:\n+ sizeof_entry_points = importlib.metadata.entry_points().get(\"dask.sizeof\", [])\n+\n+ for entry_point in sizeof_entry_points:\n+ registrar = entry_point.load()\n+ try:\n+ registrar(sizeof)\n+ except Exception:\n+ logger.exception(\n+ f\"Failed to register sizeof entry point {entry_point.name}\"\n+ )\n+\n+\n+_register_entry_point_plugins()\n", "issue": "Feature: add sizeof entry-points hook\nI was recently thinking about how to add `sizeof` support to Dask for a particular library ([Awkward Array](https://github.com/scikit-hep/awkward-1.0)). Currently, either Dask needs to be extended to support the library in question, or the library itself needs to be manually invoked to register the custom `sizeof` implementation.\r\n\r\nI know that Dask can default to `__sizeof__`, but I'm not sure whether that is the best decision here. `__sizeof__` should be the in-memory size of (just) the object, but in this particular case, an Awkward `Array` might not even own the data it refers to. I wouldn't expect `__sizeof__` to report that memory. From the `sys.getsizeof` documentation,\r\n> Only the memory consumption directly attributed to the object is accounted for, not the memory consumption of objects it refers to.\r\n\r\nI think that this would be a good candidate for `entry_points`. On startup, Dask can look for any registered entry-points that declare custom size-of functions, such that the user never needs to import the library explicitly on the worker, and the core of Dask can remain light-weight.\r\n\r\nThere are some performance concerns with `entry_points`, but projects like [entrypoints](https://github.com/takluyver/entrypoints) claim to ameliorate the issue.\n", "before_files": [{"content": "import itertools\nimport random\nimport sys\nfrom array import array\n\nfrom dask.utils import Dispatch\n\nsizeof = Dispatch(name=\"sizeof\")\n\n\[email protected](object)\ndef sizeof_default(o):\n return sys.getsizeof(o)\n\n\[email protected](bytes)\[email protected](bytearray)\ndef sizeof_bytes(o):\n return len(o)\n\n\[email protected](memoryview)\ndef sizeof_memoryview(o):\n return o.nbytes\n\n\[email protected](array)\ndef sizeof_array(o):\n return o.itemsize * len(o)\n\n\[email protected](list)\[email protected](tuple)\[email protected](set)\[email protected](frozenset)\ndef sizeof_python_collection(seq):\n num_items = len(seq)\n num_samples = 10\n if num_items > num_samples:\n if isinstance(seq, (set, frozenset)):\n # As of Python v3.9, it is deprecated to call random.sample() on\n # sets but since sets are unordered anyways we can simply pick\n # the first `num_samples` items.\n samples = itertools.islice(seq, num_samples)\n else:\n samples = random.sample(seq, num_samples)\n return sys.getsizeof(seq) + int(\n num_items / num_samples * sum(map(sizeof, samples))\n )\n else:\n return sys.getsizeof(seq) + sum(map(sizeof, seq))\n\n\nclass SimpleSizeof:\n \"\"\"Sentinel class to mark a class to be skipped by the dispatcher. This only\n works if this sentinel mixin is first in the mro.\n\n Examples\n --------\n\n >>> class TheAnswer(SimpleSizeof):\n ... def __sizeof__(self):\n ... # Sizeof always add overhead of an object for GC\n ... return 42 - sizeof(object())\n\n >>> sizeof(TheAnswer())\n 42\n\n \"\"\"\n\n\[email protected](SimpleSizeof)\ndef sizeof_blocked(d):\n return sys.getsizeof(d)\n\n\[email protected](dict)\ndef sizeof_python_dict(d):\n return (\n sys.getsizeof(d)\n + sizeof(list(d.keys()))\n + sizeof(list(d.values()))\n - 2 * sizeof(list())\n )\n\n\[email protected]_lazy(\"cupy\")\ndef register_cupy():\n import cupy\n\n @sizeof.register(cupy.ndarray)\n def sizeof_cupy_ndarray(x):\n return int(x.nbytes)\n\n\[email protected]_lazy(\"numba\")\ndef register_numba():\n import numba.cuda\n\n @sizeof.register(numba.cuda.cudadrv.devicearray.DeviceNDArray)\n def sizeof_numba_devicendarray(x):\n return int(x.nbytes)\n\n\[email protected]_lazy(\"rmm\")\ndef register_rmm():\n import rmm\n\n # Only included in 0.11.0+\n if hasattr(rmm, \"DeviceBuffer\"):\n\n @sizeof.register(rmm.DeviceBuffer)\n def sizeof_rmm_devicebuffer(x):\n return int(x.nbytes)\n\n\[email protected]_lazy(\"numpy\")\ndef register_numpy():\n import numpy as np\n\n @sizeof.register(np.ndarray)\n def sizeof_numpy_ndarray(x):\n if 0 in x.strides:\n xs = x[tuple(slice(None) if s != 0 else slice(1) for s in x.strides)]\n return xs.nbytes\n return int(x.nbytes)\n\n\[email protected]_lazy(\"pandas\")\ndef register_pandas():\n import numpy as np\n import pandas as pd\n\n def object_size(x):\n if not len(x):\n return 0\n sample = np.random.choice(x, size=20, replace=True)\n sample = list(map(sizeof, sample))\n return sum(sample) / 20 * len(x)\n\n @sizeof.register(pd.DataFrame)\n def sizeof_pandas_dataframe(df):\n p = sizeof(df.index)\n for name, col in df.items():\n p += col.memory_usage(index=False)\n if col.dtype == object:\n p += object_size(col._values)\n return int(p) + 1000\n\n @sizeof.register(pd.Series)\n def sizeof_pandas_series(s):\n p = int(s.memory_usage(index=True))\n if s.dtype == object:\n p += object_size(s._values)\n if s.index.dtype == object:\n p += object_size(s.index)\n return int(p) + 1000\n\n @sizeof.register(pd.Index)\n def sizeof_pandas_index(i):\n p = int(i.memory_usage())\n if i.dtype == object:\n p += object_size(i)\n return int(p) + 1000\n\n @sizeof.register(pd.MultiIndex)\n def sizeof_pandas_multiindex(i):\n p = int(sum(object_size(l) for l in i.levels))\n for c in i.codes if hasattr(i, \"codes\") else i.labels:\n p += c.nbytes\n return int(p) + 1000\n\n\[email protected]_lazy(\"scipy\")\ndef register_spmatrix():\n from scipy import sparse\n\n @sizeof.register(sparse.dok_matrix)\n def sizeof_spmatrix_dok(s):\n return s.__sizeof__()\n\n @sizeof.register(sparse.spmatrix)\n def sizeof_spmatrix(s):\n return sum(sizeof(v) for v in s.__dict__.values())\n\n\[email protected]_lazy(\"pyarrow\")\ndef register_pyarrow():\n import pyarrow as pa\n\n def _get_col_size(data):\n p = 0\n if not isinstance(data, pa.ChunkedArray):\n data = data.data # pyarrow <0.15.0\n for chunk in data.iterchunks():\n for buffer in chunk.buffers():\n if buffer:\n p += buffer.size\n return p\n\n @sizeof.register(pa.Table)\n def sizeof_pyarrow_table(table):\n p = sizeof(table.schema.metadata)\n for col in table.itercolumns():\n p += _get_col_size(col)\n return int(p) + 1000\n\n @sizeof.register(pa.ChunkedArray)\n def sizeof_pyarrow_chunked_array(data):\n return int(_get_col_size(data)) + 1000\n", "path": "dask/sizeof.py"}]}
| 2,683 | 299 |
gh_patches_debug_33712
|
rasdani/github-patches
|
git_diff
|
encode__uvicorn-1329
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
WSGI interface: reading request body is O(n^2) wrt payload size
Hello!
This is related to https://github.com/encode/uvicorn/issues/371 and potentially a duplicate/complementary information, feel free to close if it is deemed to be the case.
I was fooling around with different WSGI and ASGI servers while hacking on a web framework that would support both in the future.
As noted in https://github.com/encode/uvicorn/issues/371, this is indeed a very inefficient scenario, however, what is worse, I found out the time required to turn around the request is at least O(n^2) or worse wrt the payload size.
`POST`ing some files and multipart forms with `curl`:
```
Payload size: 94171344
real 0m5.763s
user 0m0.033s
sys 0m0.012s
```
```
Payload size: 186054864
real 0m24.183s
user 0m0.018s
sys 0m0.061s
```
```
Payload size: 372178858
real 1m37.760s
user 0m0.044s
sys 0m0.152s
```
So it is not just inefficient loading everything into memory, but something else is going on.
Test case used:
```python
def app(environ, start_response):
status = '200 OK' # HTTP Status
headers = [('Content-type', 'text/plain')] # HTTP Headers
start_response(status, headers)
stream = environ['wsgi.input']
length = 0
while True:
chunk = stream.read(8192)
if not chunk:
break
length += len(chunk)
resp = "Payload size: {}".format(length)
return [resp.encode()]
```
Running `uvicorn==0.11.5` as `uvicorn --interface wsgi simple_reader:app`.
</issue>
<code>
[start of uvicorn/middleware/wsgi.py]
1 import asyncio
2 import concurrent.futures
3 import io
4 import sys
5 from collections import deque
6 from typing import Deque, Iterable, Optional, Tuple
7
8 from asgiref.typing import (
9 ASGIReceiveCallable,
10 ASGIReceiveEvent,
11 ASGISendCallable,
12 ASGISendEvent,
13 HTTPRequestEvent,
14 HTTPResponseBodyEvent,
15 HTTPResponseStartEvent,
16 HTTPScope,
17 )
18
19 from uvicorn._types import Environ, ExcInfo, StartResponse, WSGIApp
20
21
22 def build_environ(scope: HTTPScope, message: ASGIReceiveEvent, body: bytes) -> Environ:
23 """
24 Builds a scope and request message into a WSGI environ object.
25 """
26 environ = {
27 "REQUEST_METHOD": scope["method"],
28 "SCRIPT_NAME": "",
29 "PATH_INFO": scope["path"].encode("utf8").decode("latin1"),
30 "QUERY_STRING": scope["query_string"].decode("ascii"),
31 "SERVER_PROTOCOL": "HTTP/%s" % scope["http_version"],
32 "wsgi.version": (1, 0),
33 "wsgi.url_scheme": scope.get("scheme", "http"),
34 "wsgi.input": io.BytesIO(body),
35 "wsgi.errors": sys.stdout,
36 "wsgi.multithread": True,
37 "wsgi.multiprocess": True,
38 "wsgi.run_once": False,
39 }
40
41 # Get server name and port - required in WSGI, not in ASGI
42 server = scope.get("server")
43 if server is None:
44 server = ("localhost", 80)
45 environ["SERVER_NAME"] = server[0]
46 environ["SERVER_PORT"] = server[1]
47
48 # Get client IP address
49 client = scope.get("client")
50 if client is not None:
51 environ["REMOTE_ADDR"] = client[0]
52
53 # Go through headers and make them into environ entries
54 for name, value in scope.get("headers", []):
55 name_str: str = name.decode("latin1")
56 if name_str == "content-length":
57 corrected_name = "CONTENT_LENGTH"
58 elif name_str == "content-type":
59 corrected_name = "CONTENT_TYPE"
60 else:
61 corrected_name = "HTTP_%s" % name_str.upper().replace("-", "_")
62 # HTTPbis say only ASCII chars are allowed in headers, but we latin1
63 # just in case
64 value_str: str = value.decode("latin1")
65 if corrected_name in environ:
66 corrected_name_environ = environ[corrected_name]
67 assert isinstance(corrected_name_environ, str)
68 value_str = corrected_name_environ + "," + value_str
69 environ[corrected_name] = value_str
70 return environ
71
72
73 class WSGIMiddleware:
74 def __init__(self, app: WSGIApp, workers: int = 10):
75 self.app = app
76 self.executor = concurrent.futures.ThreadPoolExecutor(max_workers=workers)
77
78 async def __call__(
79 self, scope: HTTPScope, receive: ASGIReceiveCallable, send: ASGISendCallable
80 ) -> None:
81 assert scope["type"] == "http"
82 instance = WSGIResponder(self.app, self.executor, scope)
83 await instance(receive, send)
84
85
86 class WSGIResponder:
87 def __init__(
88 self,
89 app: WSGIApp,
90 executor: concurrent.futures.ThreadPoolExecutor,
91 scope: HTTPScope,
92 ):
93 self.app = app
94 self.executor = executor
95 self.scope = scope
96 self.status = None
97 self.response_headers = None
98 self.send_event = asyncio.Event()
99 self.send_queue: Deque[Optional[ASGISendEvent]] = deque()
100 self.loop: asyncio.AbstractEventLoop = asyncio.get_event_loop()
101 self.response_started = False
102 self.exc_info: Optional[ExcInfo] = None
103
104 async def __call__(
105 self, receive: ASGIReceiveCallable, send: ASGISendCallable
106 ) -> None:
107 message: HTTPRequestEvent = await receive() # type: ignore[assignment]
108 body = message.get("body", b"")
109 more_body = message.get("more_body", False)
110 while more_body:
111 body_message: HTTPRequestEvent = await receive() # type: ignore[assignment]
112 body += body_message.get("body", b"")
113 more_body = body_message.get("more_body", False)
114 environ = build_environ(self.scope, message, body)
115 self.loop = asyncio.get_event_loop()
116 wsgi = self.loop.run_in_executor(
117 self.executor, self.wsgi, environ, self.start_response
118 )
119 sender = self.loop.create_task(self.sender(send))
120 try:
121 await asyncio.wait_for(wsgi, None)
122 finally:
123 self.send_queue.append(None)
124 self.send_event.set()
125 await asyncio.wait_for(sender, None)
126 if self.exc_info is not None:
127 raise self.exc_info[0].with_traceback(self.exc_info[1], self.exc_info[2])
128
129 async def sender(self, send: ASGISendCallable) -> None:
130 while True:
131 if self.send_queue:
132 message = self.send_queue.popleft()
133 if message is None:
134 return
135 await send(message)
136 else:
137 await self.send_event.wait()
138 self.send_event.clear()
139
140 def start_response(
141 self,
142 status: str,
143 response_headers: Iterable[Tuple[str, str]],
144 exc_info: Optional[ExcInfo] = None,
145 ) -> None:
146 self.exc_info = exc_info
147 if not self.response_started:
148 self.response_started = True
149 status_code_str, _ = status.split(" ", 1)
150 status_code = int(status_code_str)
151 headers = [
152 (name.encode("ascii"), value.encode("ascii"))
153 for name, value in response_headers
154 ]
155 http_response_start_event: HTTPResponseStartEvent = {
156 "type": "http.response.start",
157 "status": status_code,
158 "headers": headers,
159 }
160 self.send_queue.append(http_response_start_event)
161 self.loop.call_soon_threadsafe(self.send_event.set)
162
163 def wsgi(self, environ: Environ, start_response: StartResponse) -> None:
164 for chunk in self.app(environ, start_response): # type: ignore
165 response_body: HTTPResponseBodyEvent = {
166 "type": "http.response.body",
167 "body": chunk,
168 "more_body": True,
169 }
170 self.send_queue.append(response_body)
171 self.loop.call_soon_threadsafe(self.send_event.set)
172
173 empty_body: HTTPResponseBodyEvent = {
174 "type": "http.response.body",
175 "body": b"",
176 "more_body": False,
177 }
178 self.send_queue.append(empty_body)
179 self.loop.call_soon_threadsafe(self.send_event.set)
180
[end of uvicorn/middleware/wsgi.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/uvicorn/middleware/wsgi.py b/uvicorn/middleware/wsgi.py
--- a/uvicorn/middleware/wsgi.py
+++ b/uvicorn/middleware/wsgi.py
@@ -19,7 +19,9 @@
from uvicorn._types import Environ, ExcInfo, StartResponse, WSGIApp
-def build_environ(scope: HTTPScope, message: ASGIReceiveEvent, body: bytes) -> Environ:
+def build_environ(
+ scope: HTTPScope, message: ASGIReceiveEvent, body: io.BytesIO
+) -> Environ:
"""
Builds a scope and request message into a WSGI environ object.
"""
@@ -31,7 +33,7 @@
"SERVER_PROTOCOL": "HTTP/%s" % scope["http_version"],
"wsgi.version": (1, 0),
"wsgi.url_scheme": scope.get("scheme", "http"),
- "wsgi.input": io.BytesIO(body),
+ "wsgi.input": body,
"wsgi.errors": sys.stdout,
"wsgi.multithread": True,
"wsgi.multiprocess": True,
@@ -105,12 +107,17 @@
self, receive: ASGIReceiveCallable, send: ASGISendCallable
) -> None:
message: HTTPRequestEvent = await receive() # type: ignore[assignment]
- body = message.get("body", b"")
+ body = io.BytesIO(message.get("body", b""))
more_body = message.get("more_body", False)
- while more_body:
- body_message: HTTPRequestEvent = await receive() # type: ignore[assignment]
- body += body_message.get("body", b"")
- more_body = body_message.get("more_body", False)
+ if more_body:
+ body.seek(0, io.SEEK_END)
+ while more_body:
+ body_message: HTTPRequestEvent = (
+ await receive() # type: ignore[assignment]
+ )
+ body.write(body_message.get("body", b""))
+ more_body = body_message.get("more_body", False)
+ body.seek(0)
environ = build_environ(self.scope, message, body)
self.loop = asyncio.get_event_loop()
wsgi = self.loop.run_in_executor(
|
{"golden_diff": "diff --git a/uvicorn/middleware/wsgi.py b/uvicorn/middleware/wsgi.py\n--- a/uvicorn/middleware/wsgi.py\n+++ b/uvicorn/middleware/wsgi.py\n@@ -19,7 +19,9 @@\n from uvicorn._types import Environ, ExcInfo, StartResponse, WSGIApp\n \n \n-def build_environ(scope: HTTPScope, message: ASGIReceiveEvent, body: bytes) -> Environ:\n+def build_environ(\n+ scope: HTTPScope, message: ASGIReceiveEvent, body: io.BytesIO\n+) -> Environ:\n \"\"\"\n Builds a scope and request message into a WSGI environ object.\n \"\"\"\n@@ -31,7 +33,7 @@\n \"SERVER_PROTOCOL\": \"HTTP/%s\" % scope[\"http_version\"],\n \"wsgi.version\": (1, 0),\n \"wsgi.url_scheme\": scope.get(\"scheme\", \"http\"),\n- \"wsgi.input\": io.BytesIO(body),\n+ \"wsgi.input\": body,\n \"wsgi.errors\": sys.stdout,\n \"wsgi.multithread\": True,\n \"wsgi.multiprocess\": True,\n@@ -105,12 +107,17 @@\n self, receive: ASGIReceiveCallable, send: ASGISendCallable\n ) -> None:\n message: HTTPRequestEvent = await receive() # type: ignore[assignment]\n- body = message.get(\"body\", b\"\")\n+ body = io.BytesIO(message.get(\"body\", b\"\"))\n more_body = message.get(\"more_body\", False)\n- while more_body:\n- body_message: HTTPRequestEvent = await receive() # type: ignore[assignment]\n- body += body_message.get(\"body\", b\"\")\n- more_body = body_message.get(\"more_body\", False)\n+ if more_body:\n+ body.seek(0, io.SEEK_END)\n+ while more_body:\n+ body_message: HTTPRequestEvent = (\n+ await receive() # type: ignore[assignment]\n+ )\n+ body.write(body_message.get(\"body\", b\"\"))\n+ more_body = body_message.get(\"more_body\", False)\n+ body.seek(0)\n environ = build_environ(self.scope, message, body)\n self.loop = asyncio.get_event_loop()\n wsgi = self.loop.run_in_executor(\n", "issue": "WSGI interface: reading request body is O(n^2) wrt payload size\nHello!\r\nThis is related to https://github.com/encode/uvicorn/issues/371 and potentially a duplicate/complementary information, feel free to close if it is deemed to be the case.\r\n\r\nI was fooling around with different WSGI and ASGI servers while hacking on a web framework that would support both in the future.\r\n\r\nAs noted in https://github.com/encode/uvicorn/issues/371, this is indeed a very inefficient scenario, however, what is worse, I found out the time required to turn around the request is at least O(n^2) or worse wrt the payload size.\r\n\r\n`POST`ing some files and multipart forms with `curl`:\r\n```\r\nPayload size: 94171344\r\nreal\t0m5.763s\r\nuser\t0m0.033s\r\nsys\t0m0.012s\r\n```\r\n```\r\nPayload size: 186054864\r\nreal\t0m24.183s\r\nuser\t0m0.018s\r\nsys\t0m0.061s\r\n```\r\n```\r\nPayload size: 372178858\r\nreal\t1m37.760s\r\nuser\t0m0.044s\r\nsys\t0m0.152s\r\n```\r\n\r\nSo it is not just inefficient loading everything into memory, but something else is going on.\r\n\r\nTest case used:\r\n```python\r\ndef app(environ, start_response):\r\n status = '200 OK' # HTTP Status\r\n headers = [('Content-type', 'text/plain')] # HTTP Headers\r\n start_response(status, headers)\r\n\r\n stream = environ['wsgi.input']\r\n length = 0\r\n while True:\r\n chunk = stream.read(8192)\r\n if not chunk:\r\n break\r\n length += len(chunk)\r\n\r\n resp = \"Payload size: {}\".format(length)\r\n return [resp.encode()]\r\n```\r\n\r\nRunning `uvicorn==0.11.5` as `uvicorn --interface wsgi simple_reader:app`.\n", "before_files": [{"content": "import asyncio\nimport concurrent.futures\nimport io\nimport sys\nfrom collections import deque\nfrom typing import Deque, Iterable, Optional, Tuple\n\nfrom asgiref.typing import (\n ASGIReceiveCallable,\n ASGIReceiveEvent,\n ASGISendCallable,\n ASGISendEvent,\n HTTPRequestEvent,\n HTTPResponseBodyEvent,\n HTTPResponseStartEvent,\n HTTPScope,\n)\n\nfrom uvicorn._types import Environ, ExcInfo, StartResponse, WSGIApp\n\n\ndef build_environ(scope: HTTPScope, message: ASGIReceiveEvent, body: bytes) -> Environ:\n \"\"\"\n Builds a scope and request message into a WSGI environ object.\n \"\"\"\n environ = {\n \"REQUEST_METHOD\": scope[\"method\"],\n \"SCRIPT_NAME\": \"\",\n \"PATH_INFO\": scope[\"path\"].encode(\"utf8\").decode(\"latin1\"),\n \"QUERY_STRING\": scope[\"query_string\"].decode(\"ascii\"),\n \"SERVER_PROTOCOL\": \"HTTP/%s\" % scope[\"http_version\"],\n \"wsgi.version\": (1, 0),\n \"wsgi.url_scheme\": scope.get(\"scheme\", \"http\"),\n \"wsgi.input\": io.BytesIO(body),\n \"wsgi.errors\": sys.stdout,\n \"wsgi.multithread\": True,\n \"wsgi.multiprocess\": True,\n \"wsgi.run_once\": False,\n }\n\n # Get server name and port - required in WSGI, not in ASGI\n server = scope.get(\"server\")\n if server is None:\n server = (\"localhost\", 80)\n environ[\"SERVER_NAME\"] = server[0]\n environ[\"SERVER_PORT\"] = server[1]\n\n # Get client IP address\n client = scope.get(\"client\")\n if client is not None:\n environ[\"REMOTE_ADDR\"] = client[0]\n\n # Go through headers and make them into environ entries\n for name, value in scope.get(\"headers\", []):\n name_str: str = name.decode(\"latin1\")\n if name_str == \"content-length\":\n corrected_name = \"CONTENT_LENGTH\"\n elif name_str == \"content-type\":\n corrected_name = \"CONTENT_TYPE\"\n else:\n corrected_name = \"HTTP_%s\" % name_str.upper().replace(\"-\", \"_\")\n # HTTPbis say only ASCII chars are allowed in headers, but we latin1\n # just in case\n value_str: str = value.decode(\"latin1\")\n if corrected_name in environ:\n corrected_name_environ = environ[corrected_name]\n assert isinstance(corrected_name_environ, str)\n value_str = corrected_name_environ + \",\" + value_str\n environ[corrected_name] = value_str\n return environ\n\n\nclass WSGIMiddleware:\n def __init__(self, app: WSGIApp, workers: int = 10):\n self.app = app\n self.executor = concurrent.futures.ThreadPoolExecutor(max_workers=workers)\n\n async def __call__(\n self, scope: HTTPScope, receive: ASGIReceiveCallable, send: ASGISendCallable\n ) -> None:\n assert scope[\"type\"] == \"http\"\n instance = WSGIResponder(self.app, self.executor, scope)\n await instance(receive, send)\n\n\nclass WSGIResponder:\n def __init__(\n self,\n app: WSGIApp,\n executor: concurrent.futures.ThreadPoolExecutor,\n scope: HTTPScope,\n ):\n self.app = app\n self.executor = executor\n self.scope = scope\n self.status = None\n self.response_headers = None\n self.send_event = asyncio.Event()\n self.send_queue: Deque[Optional[ASGISendEvent]] = deque()\n self.loop: asyncio.AbstractEventLoop = asyncio.get_event_loop()\n self.response_started = False\n self.exc_info: Optional[ExcInfo] = None\n\n async def __call__(\n self, receive: ASGIReceiveCallable, send: ASGISendCallable\n ) -> None:\n message: HTTPRequestEvent = await receive() # type: ignore[assignment]\n body = message.get(\"body\", b\"\")\n more_body = message.get(\"more_body\", False)\n while more_body:\n body_message: HTTPRequestEvent = await receive() # type: ignore[assignment]\n body += body_message.get(\"body\", b\"\")\n more_body = body_message.get(\"more_body\", False)\n environ = build_environ(self.scope, message, body)\n self.loop = asyncio.get_event_loop()\n wsgi = self.loop.run_in_executor(\n self.executor, self.wsgi, environ, self.start_response\n )\n sender = self.loop.create_task(self.sender(send))\n try:\n await asyncio.wait_for(wsgi, None)\n finally:\n self.send_queue.append(None)\n self.send_event.set()\n await asyncio.wait_for(sender, None)\n if self.exc_info is not None:\n raise self.exc_info[0].with_traceback(self.exc_info[1], self.exc_info[2])\n\n async def sender(self, send: ASGISendCallable) -> None:\n while True:\n if self.send_queue:\n message = self.send_queue.popleft()\n if message is None:\n return\n await send(message)\n else:\n await self.send_event.wait()\n self.send_event.clear()\n\n def start_response(\n self,\n status: str,\n response_headers: Iterable[Tuple[str, str]],\n exc_info: Optional[ExcInfo] = None,\n ) -> None:\n self.exc_info = exc_info\n if not self.response_started:\n self.response_started = True\n status_code_str, _ = status.split(\" \", 1)\n status_code = int(status_code_str)\n headers = [\n (name.encode(\"ascii\"), value.encode(\"ascii\"))\n for name, value in response_headers\n ]\n http_response_start_event: HTTPResponseStartEvent = {\n \"type\": \"http.response.start\",\n \"status\": status_code,\n \"headers\": headers,\n }\n self.send_queue.append(http_response_start_event)\n self.loop.call_soon_threadsafe(self.send_event.set)\n\n def wsgi(self, environ: Environ, start_response: StartResponse) -> None:\n for chunk in self.app(environ, start_response): # type: ignore\n response_body: HTTPResponseBodyEvent = {\n \"type\": \"http.response.body\",\n \"body\": chunk,\n \"more_body\": True,\n }\n self.send_queue.append(response_body)\n self.loop.call_soon_threadsafe(self.send_event.set)\n\n empty_body: HTTPResponseBodyEvent = {\n \"type\": \"http.response.body\",\n \"body\": b\"\",\n \"more_body\": False,\n }\n self.send_queue.append(empty_body)\n self.loop.call_soon_threadsafe(self.send_event.set)\n", "path": "uvicorn/middleware/wsgi.py"}]}
| 2,916 | 520 |
gh_patches_debug_1765
|
rasdani/github-patches
|
git_diff
|
mne-tools__mne-bids-1193
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Q: Release?
It would be good to cut a MNE-BIDS release before the MNE-Python 1.6 release because it looks like the `mne.io`->`mne._fiff` stuff isn't in the latest release (e.g., see [circleci main failure in MNE](https://app.circleci.com/pipelines/github/mne-tools/mne-python/21889/workflows/b613fb80-7a0e-4c45-b2cc-02b8f0d9e589/jobs/61509)). Any chance to cut one in the next couple of days?
</issue>
<code>
[start of mne_bids/__init__.py]
1 """MNE software for easily interacting with BIDS compatible datasets."""
2
3 __version__ = "0.14.dev0"
4 from mne_bids import commands
5 from mne_bids.report import make_report
6 from mne_bids.path import (
7 BIDSPath,
8 get_datatypes,
9 get_entity_vals,
10 print_dir_tree,
11 get_entities_from_fname,
12 search_folder_for_text,
13 get_bids_path_from_fname,
14 find_matching_paths,
15 )
16 from mne_bids.read import get_head_mri_trans, read_raw_bids
17 from mne_bids.utils import get_anonymization_daysback
18 from mne_bids.write import (
19 make_dataset_description,
20 write_anat,
21 write_raw_bids,
22 mark_channels,
23 write_meg_calibration,
24 write_meg_crosstalk,
25 get_anat_landmarks,
26 anonymize_dataset,
27 )
28 from mne_bids.sidecar_updates import update_sidecar_json, update_anat_landmarks
29 from mne_bids.inspect import inspect_dataset
30 from mne_bids.dig import (
31 template_to_head,
32 convert_montage_to_ras,
33 convert_montage_to_mri,
34 )
35
[end of mne_bids/__init__.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/mne_bids/__init__.py b/mne_bids/__init__.py
--- a/mne_bids/__init__.py
+++ b/mne_bids/__init__.py
@@ -1,6 +1,6 @@
"""MNE software for easily interacting with BIDS compatible datasets."""
-__version__ = "0.14.dev0"
+__version__ = "0.14"
from mne_bids import commands
from mne_bids.report import make_report
from mne_bids.path import (
|
{"golden_diff": "diff --git a/mne_bids/__init__.py b/mne_bids/__init__.py\n--- a/mne_bids/__init__.py\n+++ b/mne_bids/__init__.py\n@@ -1,6 +1,6 @@\n \"\"\"MNE software for easily interacting with BIDS compatible datasets.\"\"\"\n \n-__version__ = \"0.14.dev0\"\n+__version__ = \"0.14\"\n from mne_bids import commands\n from mne_bids.report import make_report\n from mne_bids.path import (\n", "issue": "Q: Release?\nIt would be good to cut a MNE-BIDS release before the MNE-Python 1.6 release because it looks like the `mne.io`->`mne._fiff` stuff isn't in the latest release (e.g., see [circleci main failure in MNE](https://app.circleci.com/pipelines/github/mne-tools/mne-python/21889/workflows/b613fb80-7a0e-4c45-b2cc-02b8f0d9e589/jobs/61509)). Any chance to cut one in the next couple of days?\n", "before_files": [{"content": "\"\"\"MNE software for easily interacting with BIDS compatible datasets.\"\"\"\n\n__version__ = \"0.14.dev0\"\nfrom mne_bids import commands\nfrom mne_bids.report import make_report\nfrom mne_bids.path import (\n BIDSPath,\n get_datatypes,\n get_entity_vals,\n print_dir_tree,\n get_entities_from_fname,\n search_folder_for_text,\n get_bids_path_from_fname,\n find_matching_paths,\n)\nfrom mne_bids.read import get_head_mri_trans, read_raw_bids\nfrom mne_bids.utils import get_anonymization_daysback\nfrom mne_bids.write import (\n make_dataset_description,\n write_anat,\n write_raw_bids,\n mark_channels,\n write_meg_calibration,\n write_meg_crosstalk,\n get_anat_landmarks,\n anonymize_dataset,\n)\nfrom mne_bids.sidecar_updates import update_sidecar_json, update_anat_landmarks\nfrom mne_bids.inspect import inspect_dataset\nfrom mne_bids.dig import (\n template_to_head,\n convert_montage_to_ras,\n convert_montage_to_mri,\n)\n", "path": "mne_bids/__init__.py"}]}
| 993 | 118 |
gh_patches_debug_19875
|
rasdani/github-patches
|
git_diff
|
OpenNMT__OpenNMT-py-1143
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
The comment in onmt.modules.average_attn may be wrong
The comment in onmt.modules.average_attn.AverageAttention.forward says that it gets a input of size `[batch_size x input_len x model_dim]`, and outputs a gating_outputs and a average_outputs both with size `[batch_size x 1 x model_dim]`. However, in my test the two outputs are both with size [batch_size x input_len x model_dim].
```python
import torch
import onmt.modules.average_attn as Att
model = Att.AverageAttention(3)
a = torch.arange(24).reshape(2,4,3).float()
print("intput size:", a.size())
o1, o2 = model(a)
print("o1 size:", o1.size())
print("o2.size:", o2.size())
```
intput size: torch.Size([2, 4, 3])
o1 size: torch.Size([2, 4, 3])
o2 size: torch.Size([2, 4, 3])
</issue>
<code>
[start of onmt/modules/average_attn.py]
1 # -*- coding: utf-8 -*-
2 """ Average Attention module """
3
4 import torch
5 import torch.nn as nn
6
7 from onmt.modules.position_ffn import PositionwiseFeedForward
8
9
10 class AverageAttention(nn.Module):
11 """
12 Average Attention module from
13 "Accelerating Neural Transformer via an Average Attention Network"
14 :cite:`https://arxiv.org/abs/1805.00631`.
15
16 Args:
17 model_dim (int): the dimension of keys/values/queries,
18 must be divisible by head_count
19 dropout (float): dropout parameter
20 """
21
22 def __init__(self, model_dim, dropout=0.1):
23 self.model_dim = model_dim
24
25 super(AverageAttention, self).__init__()
26
27 self.average_layer = PositionwiseFeedForward(model_dim, model_dim,
28 dropout)
29 self.gating_layer = nn.Linear(model_dim * 2, model_dim * 2)
30
31 def cumulative_average_mask(self, batch_size, inputs_len):
32 """
33 Builds the mask to compute the cumulative average as described in
34 https://arxiv.org/abs/1805.00631 -- Figure 3
35
36 Args:
37 batch_size (int): batch size
38 inputs_len (int): length of the inputs
39
40 Returns:
41 (`FloatTensor`):
42
43 * A Tensor of shape `[batch_size x input_len x input_len]`
44 """
45
46 triangle = torch.tril(torch.ones(inputs_len, inputs_len))
47 weights = torch.ones(1, inputs_len) / torch.arange(
48 1, inputs_len + 1, dtype=torch.float)
49 mask = triangle * weights.transpose(0, 1)
50
51 return mask.unsqueeze(0).expand(batch_size, inputs_len, inputs_len)
52
53 def cumulative_average(self, inputs, mask_or_step,
54 layer_cache=None, step=None):
55 """
56 Computes the cumulative average as described in
57 https://arxiv.org/abs/1805.00631 -- Equations (1) (5) (6)
58
59 Args:
60 inputs (`FloatTensor`): sequence to average
61 `[batch_size x input_len x dimension]`
62 mask_or_step: if cache is set, this is assumed
63 to be the current step of the
64 dynamic decoding. Otherwise, it is the mask matrix
65 used to compute the cumulative average.
66 cache: a dictionary containing the cumulative average
67 of the previous step.
68 """
69 if layer_cache is not None:
70 step = mask_or_step
71 device = inputs.device
72 average_attention = (inputs + step *
73 layer_cache["prev_g"].to(device)) / (step + 1)
74 layer_cache["prev_g"] = average_attention
75 return average_attention
76 else:
77 mask = mask_or_step
78 return torch.matmul(mask, inputs)
79
80 def forward(self, inputs, mask=None, layer_cache=None, step=None):
81 """
82 Args:
83 inputs (`FloatTensor`): `[batch_size x input_len x model_dim]`
84
85 Returns:
86 (`FloatTensor`, `FloatTensor`):
87
88 * gating_outputs `[batch_size x 1 x model_dim]`
89 * average_outputs average attention `[batch_size x 1 x model_dim]`
90 """
91 batch_size = inputs.size(0)
92 inputs_len = inputs.size(1)
93
94 device = inputs.device
95 average_outputs = self.cumulative_average(
96 inputs, self.cumulative_average_mask(batch_size,
97 inputs_len).to(device).float()
98 if layer_cache is None else step, layer_cache=layer_cache)
99 average_outputs = self.average_layer(average_outputs)
100 gating_outputs = self.gating_layer(torch.cat((inputs,
101 average_outputs), -1))
102 input_gate, forget_gate = torch.chunk(gating_outputs, 2, dim=2)
103 gating_outputs = torch.sigmoid(input_gate) * inputs + \
104 torch.sigmoid(forget_gate) * average_outputs
105
106 return gating_outputs, average_outputs
107
[end of onmt/modules/average_attn.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/onmt/modules/average_attn.py b/onmt/modules/average_attn.py
--- a/onmt/modules/average_attn.py
+++ b/onmt/modules/average_attn.py
@@ -65,6 +65,9 @@
used to compute the cumulative average.
cache: a dictionary containing the cumulative average
of the previous step.
+
+ Returns:
+ a tensor of the same shape and type as :obj:`inputs`.
"""
if layer_cache is not None:
step = mask_or_step
@@ -85,8 +88,9 @@
Returns:
(`FloatTensor`, `FloatTensor`):
- * gating_outputs `[batch_size x 1 x model_dim]`
- * average_outputs average attention `[batch_size x 1 x model_dim]`
+ * gating_outputs `[batch_size x input_len x model_dim]`
+ * average_outputs average attention
+ `[batch_size x input_len x model_dim]`
"""
batch_size = inputs.size(0)
inputs_len = inputs.size(1)
|
{"golden_diff": "diff --git a/onmt/modules/average_attn.py b/onmt/modules/average_attn.py\n--- a/onmt/modules/average_attn.py\n+++ b/onmt/modules/average_attn.py\n@@ -65,6 +65,9 @@\n used to compute the cumulative average.\n cache: a dictionary containing the cumulative average\n of the previous step.\n+\n+ Returns:\n+ a tensor of the same shape and type as :obj:`inputs`.\n \"\"\"\n if layer_cache is not None:\n step = mask_or_step\n@@ -85,8 +88,9 @@\n Returns:\n (`FloatTensor`, `FloatTensor`):\n \n- * gating_outputs `[batch_size x 1 x model_dim]`\n- * average_outputs average attention `[batch_size x 1 x model_dim]`\n+ * gating_outputs `[batch_size x input_len x model_dim]`\n+ * average_outputs average attention\n+ `[batch_size x input_len x model_dim]`\n \"\"\"\n batch_size = inputs.size(0)\n inputs_len = inputs.size(1)\n", "issue": "The comment in onmt.modules.average_attn may be wrong\nThe comment in onmt.modules.average_attn.AverageAttention.forward says that it gets a input of size `[batch_size x input_len x model_dim]`, and outputs a gating_outputs and a average_outputs both with size `[batch_size x 1 x model_dim]`. However, in my test the two outputs are both with size [batch_size x input_len x model_dim].\r\n```python\r\nimport torch\r\nimport onmt.modules.average_attn as Att\r\nmodel = Att.AverageAttention(3)\r\na = torch.arange(24).reshape(2,4,3).float()\r\nprint(\"intput size:\", a.size())\r\no1, o2 = model(a)\r\nprint(\"o1 size:\", o1.size())\r\nprint(\"o2.size:\", o2.size())\r\n```\r\nintput size: torch.Size([2, 4, 3])\r\no1 size: torch.Size([2, 4, 3])\r\no2 size: torch.Size([2, 4, 3])\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n\"\"\" Average Attention module \"\"\"\n\nimport torch\nimport torch.nn as nn\n\nfrom onmt.modules.position_ffn import PositionwiseFeedForward\n\n\nclass AverageAttention(nn.Module):\n \"\"\"\n Average Attention module from\n \"Accelerating Neural Transformer via an Average Attention Network\"\n :cite:`https://arxiv.org/abs/1805.00631`.\n\n Args:\n model_dim (int): the dimension of keys/values/queries,\n must be divisible by head_count\n dropout (float): dropout parameter\n \"\"\"\n\n def __init__(self, model_dim, dropout=0.1):\n self.model_dim = model_dim\n\n super(AverageAttention, self).__init__()\n\n self.average_layer = PositionwiseFeedForward(model_dim, model_dim,\n dropout)\n self.gating_layer = nn.Linear(model_dim * 2, model_dim * 2)\n\n def cumulative_average_mask(self, batch_size, inputs_len):\n \"\"\"\n Builds the mask to compute the cumulative average as described in\n https://arxiv.org/abs/1805.00631 -- Figure 3\n\n Args:\n batch_size (int): batch size\n inputs_len (int): length of the inputs\n\n Returns:\n (`FloatTensor`):\n\n * A Tensor of shape `[batch_size x input_len x input_len]`\n \"\"\"\n\n triangle = torch.tril(torch.ones(inputs_len, inputs_len))\n weights = torch.ones(1, inputs_len) / torch.arange(\n 1, inputs_len + 1, dtype=torch.float)\n mask = triangle * weights.transpose(0, 1)\n\n return mask.unsqueeze(0).expand(batch_size, inputs_len, inputs_len)\n\n def cumulative_average(self, inputs, mask_or_step,\n layer_cache=None, step=None):\n \"\"\"\n Computes the cumulative average as described in\n https://arxiv.org/abs/1805.00631 -- Equations (1) (5) (6)\n\n Args:\n inputs (`FloatTensor`): sequence to average\n `[batch_size x input_len x dimension]`\n mask_or_step: if cache is set, this is assumed\n to be the current step of the\n dynamic decoding. Otherwise, it is the mask matrix\n used to compute the cumulative average.\n cache: a dictionary containing the cumulative average\n of the previous step.\n \"\"\"\n if layer_cache is not None:\n step = mask_or_step\n device = inputs.device\n average_attention = (inputs + step *\n layer_cache[\"prev_g\"].to(device)) / (step + 1)\n layer_cache[\"prev_g\"] = average_attention\n return average_attention\n else:\n mask = mask_or_step\n return torch.matmul(mask, inputs)\n\n def forward(self, inputs, mask=None, layer_cache=None, step=None):\n \"\"\"\n Args:\n inputs (`FloatTensor`): `[batch_size x input_len x model_dim]`\n\n Returns:\n (`FloatTensor`, `FloatTensor`):\n\n * gating_outputs `[batch_size x 1 x model_dim]`\n * average_outputs average attention `[batch_size x 1 x model_dim]`\n \"\"\"\n batch_size = inputs.size(0)\n inputs_len = inputs.size(1)\n\n device = inputs.device\n average_outputs = self.cumulative_average(\n inputs, self.cumulative_average_mask(batch_size,\n inputs_len).to(device).float()\n if layer_cache is None else step, layer_cache=layer_cache)\n average_outputs = self.average_layer(average_outputs)\n gating_outputs = self.gating_layer(torch.cat((inputs,\n average_outputs), -1))\n input_gate, forget_gate = torch.chunk(gating_outputs, 2, dim=2)\n gating_outputs = torch.sigmoid(input_gate) * inputs + \\\n torch.sigmoid(forget_gate) * average_outputs\n\n return gating_outputs, average_outputs\n", "path": "onmt/modules/average_attn.py"}]}
| 1,828 | 235 |
gh_patches_debug_25131
|
rasdani/github-patches
|
git_diff
|
lightly-ai__lightly-213
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Fix imports in __init__ and add tests
# Fix import errors
Closes #213
I fixed the import errors, e.g.
```
import lightly
lightly.data.LightlyDataset
```
should work now. I also added tests for all import that I found important.
Bumped the version number so we can quickly release this hotfix.
Added SimSiam to the list of models in the description.
</issue>
<code>
[start of lightly/__init__.py]
1 """Lightly is a computer vision framework for self-supervised learning.
2
3 With Lightly you can train deep learning models using
4 self-supervision. This means, that you don't require
5 any labels to train a model. Lightly has been built
6 to help you understand and work with large unlabeled datasets.
7 It is built on top of PyTorch and therefore fully compatible
8 with other frameworks such as Fast.ai.
9
10 The framework is structured into the following modules:
11
12 - **api**:
13
14 The lightly.api module handles communication with the Lightly web-app.
15
16 - **cli**:
17
18 The lightly.cli module provides a command-line interface for training
19 self-supervised models and embedding images. Furthermore, the command-line
20 tool can be used to upload and download images from/to the Lightly web-app.
21
22 - **core**:
23
24 The lightly.core module offers one-liners for simple self-supervised learning.
25
26 - **data**:
27
28 The lightly.data module provides a dataset wrapper and collate functions. The
29 collate functions are in charge of the data augmentations which are crucial for
30 self-supervised learning.
31
32 - **embedding**:
33
34 The lightly.embedding module combines the self-supervised models with a dataloader,
35 optimizer, and loss function to provide a simple pytorch-lightning trainable.
36
37 - **loss**:
38
39 The lightly.loss module contains implementations of popular self-supervised training
40 loss functions.
41
42 - **models**:
43
44 The lightly.models module holds the implementation of the ResNet as well as self-
45 supervised methods. Currently implements:
46
47 - SimCLR
48
49 - MoCo
50
51 - **transforms**:
52
53 The lightly.transforms module implements custom data transforms. Currently implements:
54
55 - Gaussian Blur
56
57 - Random Rotation
58
59 - **utils**:
60
61 The lightly.utils package provides global utility methods.
62 The io module contains utility to save and load embeddings in a format which is
63 understood by the Lightly library.
64
65 """
66
67 # Copyright (c) 2020. Lightly AG and its affiliates.
68 # All Rights Reserved
69
70 __name__ = 'lightly'
71 __version__ = '1.1.0'
72
73
74 try:
75 # See (https://github.com/PyTorchLightning/pytorch-lightning)
76 # This variable is injected in the __builtins__ by the build
77 # process. It used to enable importing subpackages of skimage when
78 # the binaries are not built
79 __LIGHTLY_SETUP__
80 except NameError:
81 __LIGHTLY_SETUP__ = False
82
83
84 if __LIGHTLY_SETUP__:
85 # setting up lightly
86 msg = f'Partial import of {__name__}=={__version__} during build process.'
87 print(msg)
88 else:
89 # see if prefetch_generator is available
90 try:
91 import prefetch_generator
92 except ImportError:
93 _prefetch_generator_available = False
94 else:
95 _prefetch_generator_available = True
96
97 def _is_prefetch_generator_available():
98 return _prefetch_generator_available
99
100 # check for latest version
101 from lightly.api.version_checking import get_latest_version, version_compare, pretty_print_latest_version
102
103 latest_version = get_latest_version(__version__)
104 if latest_version is not None:
105 if version_compare(__version__, latest_version) < 0:
106 # local version is behind latest version
107 pretty_print_latest_version(latest_version)
108
[end of lightly/__init__.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/lightly/__init__.py b/lightly/__init__.py
--- a/lightly/__init__.py
+++ b/lightly/__init__.py
@@ -48,6 +48,8 @@
- MoCo
+ - SimSiam
+
- **transforms**:
The lightly.transforms module implements custom data transforms. Currently implements:
@@ -68,7 +70,7 @@
# All Rights Reserved
__name__ = 'lightly'
-__version__ = '1.1.0'
+__version__ = '1.1.1'
try:
@@ -97,8 +99,22 @@
def _is_prefetch_generator_available():
return _prefetch_generator_available
+ from lightly.core import *
+ from lightly import active_learning
+ from lightly import api
+ from lightly import data
+ from lightly import embedding
+ from lightly import loss
+ from lightly import models
+ from lightly import openapi_generated
+ from lightly import transforms
+ from lightly import utils
+
+
# check for latest version
- from lightly.api.version_checking import get_latest_version, version_compare, pretty_print_latest_version
+ from lightly.api.version_checking import get_latest_version
+ from lightly.api.version_checking import version_compare
+ from lightly.api.version_checking import pretty_print_latest_version
latest_version = get_latest_version(__version__)
if latest_version is not None:
|
{"golden_diff": "diff --git a/lightly/__init__.py b/lightly/__init__.py\n--- a/lightly/__init__.py\n+++ b/lightly/__init__.py\n@@ -48,6 +48,8 @@\n \n - MoCo\n \n+ - SimSiam\n+\n - **transforms**:\n \n The lightly.transforms module implements custom data transforms. Currently implements:\n@@ -68,7 +70,7 @@\n # All Rights Reserved\n \n __name__ = 'lightly'\n-__version__ = '1.1.0'\n+__version__ = '1.1.1'\n \n \n try:\n@@ -97,8 +99,22 @@\n def _is_prefetch_generator_available():\n return _prefetch_generator_available\n \n+ from lightly.core import *\n+ from lightly import active_learning\n+ from lightly import api\n+ from lightly import data\n+ from lightly import embedding\n+ from lightly import loss\n+ from lightly import models\n+ from lightly import openapi_generated\n+ from lightly import transforms\n+ from lightly import utils\n+\n+\n # check for latest version\n- from lightly.api.version_checking import get_latest_version, version_compare, pretty_print_latest_version\n+ from lightly.api.version_checking import get_latest_version\n+ from lightly.api.version_checking import version_compare\n+ from lightly.api.version_checking import pretty_print_latest_version\n \n latest_version = get_latest_version(__version__)\n if latest_version is not None:\n", "issue": "Fix imports in __init__ and add tests\n# Fix import errors\r\n\r\nCloses #213 \r\n\r\nI fixed the import errors, e.g. \r\n```\r\nimport lightly\r\nlightly.data.LightlyDataset\r\n```\r\nshould work now. I also added tests for all import that I found important.\r\n\r\nBumped the version number so we can quickly release this hotfix.\r\n\r\nAdded SimSiam to the list of models in the description.\n", "before_files": [{"content": "\"\"\"Lightly is a computer vision framework for self-supervised learning.\n\nWith Lightly you can train deep learning models using\nself-supervision. This means, that you don't require\nany labels to train a model. Lightly has been built\nto help you understand and work with large unlabeled datasets.\nIt is built on top of PyTorch and therefore fully compatible \nwith other frameworks such as Fast.ai.\n\nThe framework is structured into the following modules:\n\n- **api**: \n\n The lightly.api module handles communication with the Lightly web-app.\n\n- **cli**:\n\n The lightly.cli module provides a command-line interface for training \n self-supervised models and embedding images. Furthermore, the command-line\n tool can be used to upload and download images from/to the Lightly web-app.\n\n- **core**:\n\n The lightly.core module offers one-liners for simple self-supervised learning.\n\n- **data**:\n\n The lightly.data module provides a dataset wrapper and collate functions. The\n collate functions are in charge of the data augmentations which are crucial for\n self-supervised learning.\n\n- **embedding**:\n\n The lightly.embedding module combines the self-supervised models with a dataloader,\n optimizer, and loss function to provide a simple pytorch-lightning trainable.\n\n- **loss**:\n\n The lightly.loss module contains implementations of popular self-supervised training\n loss functions.\n\n- **models**:\n\n The lightly.models module holds the implementation of the ResNet as well as self-\n supervised methods. Currently implements:\n\n - SimCLR\n\n - MoCo\n\n- **transforms**:\n\n The lightly.transforms module implements custom data transforms. Currently implements:\n\n - Gaussian Blur\n\n - Random Rotation\n\n- **utils**:\n\n The lightly.utils package provides global utility methods.\n The io module contains utility to save and load embeddings in a format which is\n understood by the Lightly library.\n\n\"\"\"\n\n# Copyright (c) 2020. Lightly AG and its affiliates.\n# All Rights Reserved\n\n__name__ = 'lightly'\n__version__ = '1.1.0'\n\n\ntry:\n # See (https://github.com/PyTorchLightning/pytorch-lightning)\n # This variable is injected in the __builtins__ by the build\n # process. It used to enable importing subpackages of skimage when\n # the binaries are not built\n __LIGHTLY_SETUP__\nexcept NameError:\n __LIGHTLY_SETUP__ = False\n\n\nif __LIGHTLY_SETUP__:\n #\u00a0setting up lightly\n msg = f'Partial import of {__name__}=={__version__} during build process.' \n print(msg)\nelse:\n #\u00a0see if prefetch_generator is available\n try:\n import prefetch_generator\n except ImportError:\n _prefetch_generator_available = False\n else:\n _prefetch_generator_available = True\n\n def _is_prefetch_generator_available():\n return _prefetch_generator_available\n\n # check for latest version\n from lightly.api.version_checking import get_latest_version, version_compare, pretty_print_latest_version\n\n latest_version = get_latest_version(__version__)\n if latest_version is not None:\n if version_compare(__version__, latest_version) < 0:\n # local version is behind latest version\n pretty_print_latest_version(latest_version)\n", "path": "lightly/__init__.py"}]}
| 1,573 | 322 |
gh_patches_debug_16925
|
rasdani/github-patches
|
git_diff
|
vispy__vispy-230
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
The Python process hangs after demos on Windows, Qt backend
If I run any demo, it works, then I close the window, and the process is still running. CTRL+C does not end the process, I have to kill it manually, which is kind of annoying.
</issue>
<code>
[start of vispy/app/backends/_qt.py]
1 # -*- coding: utf-8 -*-
2 # Copyright (c) 2014, Vispy Development Team.
3 # Distributed under the (new) BSD License. See LICENSE.txt for more info.
4
5 """
6 vispy backend for Qt (PySide and PyQt4).
7 """
8
9 from __future__ import division
10 from time import sleep, time
11
12 from ... import config
13 from ..base import BaseApplicationBackend, BaseCanvasBackend, BaseTimerBackend
14 from ...util import keys
15 from . import ATTEMPTED_BACKENDS
16 from ...util.six import text_type
17
18 # Get what qt lib to try
19 if len(ATTEMPTED_BACKENDS):
20 qt_lib = ATTEMPTED_BACKENDS[-1].lower()
21 if qt_lib.lower() == 'qt':
22 qt_lib = config['qt_lib'].lower()
23 # in case the last app we ran was something else (e.g., Pyglet)
24 if qt_lib not in ['pyqt', 'pyqt4', 'pyside', 'qt']:
25 qt_lib = 'any'
26 else:
27 qt_lib = 'any'
28
29 # Import PySide or PyQt4
30 if qt_lib in ('any', 'qt'):
31 try:
32 from PyQt4 import QtGui, QtCore, QtOpenGL
33 except ImportError:
34 from PySide import QtGui, QtCore, QtOpenGL
35 elif qt_lib in ('pyqt', 'pyqt4'):
36 from PyQt4 import QtGui, QtCore, QtOpenGL
37 elif qt_lib == 'pyside':
38 from PySide import QtGui, QtCore, QtOpenGL
39 else:
40 raise Exception("Do not recognize Qt library '%s'. Options are "
41 "'pyqt4', 'pyside', or 'qt'])." % str(qt_lib))
42
43 # todo: add support for distinguishing left and right shift/ctrl/alt keys.
44 # Linux scan codes: (left, right)
45 # Shift 50, 62
46 # Ctrl 37, 105
47 # Alt 64, 108
48 KEYMAP = {
49 QtCore.Qt.Key_Shift: keys.SHIFT,
50 QtCore.Qt.Key_Control: keys.CONTROL,
51 QtCore.Qt.Key_Alt: keys.ALT,
52 QtCore.Qt.Key_AltGr: keys.ALT,
53 QtCore.Qt.Key_Meta: keys.META,
54
55 QtCore.Qt.Key_Left: keys.LEFT,
56 QtCore.Qt.Key_Up: keys.UP,
57 QtCore.Qt.Key_Right: keys.RIGHT,
58 QtCore.Qt.Key_Down: keys.DOWN,
59 QtCore.Qt.Key_PageUp: keys.PAGEUP,
60 QtCore.Qt.Key_PageDown: keys.PAGEDOWN,
61
62 QtCore.Qt.Key_Insert: keys.INSERT,
63 QtCore.Qt.Key_Delete: keys.DELETE,
64 QtCore.Qt.Key_Home: keys.HOME,
65 QtCore.Qt.Key_End: keys.END,
66
67 QtCore.Qt.Key_Escape: keys.ESCAPE,
68 QtCore.Qt.Key_Backspace: keys.BACKSPACE,
69
70 QtCore.Qt.Key_F1: keys.F1,
71 QtCore.Qt.Key_F2: keys.F2,
72 QtCore.Qt.Key_F3: keys.F3,
73 QtCore.Qt.Key_F4: keys.F4,
74 QtCore.Qt.Key_F5: keys.F5,
75 QtCore.Qt.Key_F6: keys.F6,
76 QtCore.Qt.Key_F7: keys.F7,
77 QtCore.Qt.Key_F8: keys.F8,
78 QtCore.Qt.Key_F9: keys.F9,
79 QtCore.Qt.Key_F10: keys.F10,
80 QtCore.Qt.Key_F11: keys.F11,
81 QtCore.Qt.Key_F12: keys.F12,
82
83 QtCore.Qt.Key_Space: keys.SPACE,
84 QtCore.Qt.Key_Enter: keys.ENTER,
85 QtCore.Qt.Key_Return: keys.ENTER,
86 QtCore.Qt.Key_Tab: keys.TAB,
87 }
88
89 BUTTONMAP = {0: 0, 1: 1, 2: 2, 4: 3, 8: 4, 16: 5}
90
91
92 class ApplicationBackend(BaseApplicationBackend):
93
94 def __init__(self):
95 BaseApplicationBackend.__init__(self)
96
97 def _vispy_get_backend_name(self):
98 if 'pyside' in QtCore.__name__.lower():
99 return 'PySide (qt)'
100 else:
101 return 'PyQt4 (qt)'
102
103 def _vispy_process_events(self):
104 app = self._vispy_get_native_app()
105 app.flush()
106 app.processEvents()
107
108 def _vispy_run(self):
109 app = self._vispy_get_native_app()
110 if hasattr(app, '_in_event_loop') and app._in_event_loop:
111 pass # Already in event loop
112 else:
113 return app.exec_()
114
115 def _vispy_quit(self):
116 return self._vispy_get_native_app().quit()
117
118 def _vispy_get_native_app(self):
119 # Get native app in save way. Taken from guisupport.py
120 app = QtGui.QApplication.instance()
121 if app is None:
122 app = QtGui.QApplication([''])
123 # Store so it won't be deleted, but not on a vispy object,
124 # or an application may produce error when closed
125 QtGui._qApp = app
126 # Return
127 return app
128
129
130 class CanvasBackend(QtOpenGL.QGLWidget, BaseCanvasBackend):
131
132 """Qt backend for Canvas abstract class."""
133
134 def __init__(self, *args, **kwargs):
135 BaseCanvasBackend.__init__(self)
136 QtOpenGL.QGLWidget.__init__(self, *args, **kwargs)
137 self.setAutoBufferSwap(False) # to make consistent with other backends
138 self.setMouseTracking(True)
139
140 def _vispy_warmup(self):
141 etime = time() + 0.25
142 while time() < etime:
143 sleep(0.01)
144 self._vispy_set_current()
145 self._vispy_canvas.app.process_events()
146
147 def _vispy_set_current(self):
148 # Make this the current context
149 self.makeCurrent()
150
151 def _vispy_swap_buffers(self):
152 # Swap front and back buffer
153 self.swapBuffers()
154
155 def _vispy_set_title(self, title):
156 # Set the window title. Has no effect for widgets
157 self.setWindowTitle(title)
158
159 def _vispy_set_size(self, w, h):
160 # Set size of the widget or window
161 self.resize(w, h)
162
163 def _vispy_set_position(self, x, y):
164 # Set location of the widget or window. May have no effect for widgets
165 self.move(x, y)
166
167 def _vispy_set_visible(self, visible):
168 # Show or hide the window or widget
169 if visible:
170 self.show()
171 else:
172 self.hide()
173
174 def _vispy_update(self):
175 # Invoke a redraw
176 self.update()
177
178 def _vispy_close(self):
179 # Force the window or widget to shut down
180 self.close()
181
182 def _vispy_get_position(self):
183 g = self.geometry()
184 return g.x(), g.y()
185
186 def _vispy_get_size(self):
187 g = self.geometry()
188 return g.width(), g.height()
189
190 def initializeGL(self):
191 if self._vispy_canvas is None:
192 return
193 self._vispy_canvas.events.initialize()
194
195 def resizeGL(self, w, h):
196 if self._vispy_canvas is None:
197 return
198 self._vispy_canvas.events.resize(size=(w, h))
199
200 def paintGL(self):
201 if self._vispy_canvas is None:
202 return
203 # (0, 0, self.width(), self.height()))
204 self._vispy_set_current()
205 self._vispy_canvas.events.paint(region=None)
206
207 def closeEvent(self, ev):
208 if self._vispy_canvas is None:
209 return
210 self._vispy_canvas.events.close()
211 # Destroy if this is a toplevel widget
212 if self.parent() is None:
213 self.destroy()
214
215 def mousePressEvent(self, ev):
216 if self._vispy_canvas is None:
217 return
218 self._vispy_mouse_press(
219 native=ev,
220 pos=(ev.pos().x(), ev.pos().y()),
221 button=BUTTONMAP.get(ev.button(), 0),
222 modifiers = self._modifiers(ev),
223 )
224
225 def mouseReleaseEvent(self, ev):
226 if self._vispy_canvas is None:
227 return
228 self._vispy_mouse_release(
229 native=ev,
230 pos=(ev.pos().x(), ev.pos().y()),
231 button=BUTTONMAP[ev.button()],
232 modifiers = self._modifiers(ev),
233 )
234
235 def mouseMoveEvent(self, ev):
236 if self._vispy_canvas is None:
237 return
238 self._vispy_mouse_move(
239 native=ev,
240 pos=(ev.pos().x(), ev.pos().y()),
241 modifiers=self._modifiers(ev),
242 )
243
244 def wheelEvent(self, ev):
245 if self._vispy_canvas is None:
246 return
247 # Get scrolling
248 deltax, deltay = 0.0, 0.0
249 if ev.orientation == QtCore.Qt.Horizontal:
250 deltax = ev.delta() / 120.0
251 else:
252 deltay = ev.delta() / 120.0
253 # Emit event
254 self._vispy_canvas.events.mouse_wheel(
255 native=ev,
256 delta=(deltax, deltay),
257 pos=(ev.pos().x(), ev.pos().y()),
258 modifiers=self._modifiers(ev),
259 )
260
261 def keyPressEvent(self, ev):
262 self._vispy_canvas.events.key_press(
263 native=ev,
264 key=self._processKey(ev),
265 text=text_type(ev.text()),
266 modifiers=self._modifiers(ev),
267 )
268
269 def keyReleaseEvent(self, ev):
270 # if ev.isAutoRepeat():
271 # return # Skip release auto repeat events
272 self._vispy_canvas.events.key_release(
273 native=ev,
274 key=self._processKey(ev),
275 text=text_type(ev.text()),
276 modifiers=self._modifiers(ev),
277 )
278
279 def _processKey(self, event):
280 # evaluates the keycode of qt, and transform to vispy key.
281 key = int(event.key())
282 if key in KEYMAP:
283 return KEYMAP[key]
284 elif key >= 32 and key <= 127:
285 return keys.Key(chr(key))
286 else:
287 return None
288
289 def _modifiers(self, event):
290 # Convert the QT modifier state into a tuple of active modifier keys.
291 mod = ()
292 qtmod = event.modifiers()
293 if QtCore.Qt.ShiftModifier & qtmod:
294 mod += keys.SHIFT,
295 if QtCore.Qt.ControlModifier & qtmod:
296 mod += keys.CONTROL,
297 if QtCore.Qt.AltModifier & qtmod:
298 mod += keys.ALT,
299 if QtCore.Qt.MetaModifier & qtmod:
300 mod += keys.META,
301 return mod
302
303
304 # class QtMouseEvent(MouseEvent):
305 # special subclass of MouseEvent for propagating acceptance info back to Qt.
306 # @MouseEvent.handled.setter
307 # def handled(self, val):
308 # self._handled = val
309 # if val:
310 # self.qt_event.accept()
311 # else:
312 # self.qt_event.ignore()
313 class TimerBackend(BaseTimerBackend, QtCore.QTimer):
314
315 def __init__(self, vispy_timer):
316 if QtGui.QApplication.instance() is None:
317 global QAPP
318 QAPP = QtGui.QApplication([])
319 BaseTimerBackend.__init__(self, vispy_timer)
320 QtCore.QTimer.__init__(self)
321 self.timeout.connect(self._vispy_timeout)
322
323 def _vispy_start(self, interval):
324 self.start(interval * 1000.)
325
326 def _vispy_stop(self):
327 self.stop()
328
329 def _vispy_timeout(self):
330 self._vispy_timer._timeout()
331
[end of vispy/app/backends/_qt.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/vispy/app/backends/_qt.py b/vispy/app/backends/_qt.py
--- a/vispy/app/backends/_qt.py
+++ b/vispy/app/backends/_qt.py
@@ -208,9 +208,6 @@
if self._vispy_canvas is None:
return
self._vispy_canvas.events.close()
- # Destroy if this is a toplevel widget
- if self.parent() is None:
- self.destroy()
def mousePressEvent(self, ev):
if self._vispy_canvas is None:
@@ -300,6 +297,12 @@
mod += keys.META,
return mod
+ def __del__(self):
+ # Destroy if this is a toplevel widget
+ if self.parent() is None:
+ self.destroy()
+ QtOpenGL.QGLWidget.__del__(self)
+
# class QtMouseEvent(MouseEvent):
# special subclass of MouseEvent for propagating acceptance info back to Qt.
|
{"golden_diff": "diff --git a/vispy/app/backends/_qt.py b/vispy/app/backends/_qt.py\n--- a/vispy/app/backends/_qt.py\n+++ b/vispy/app/backends/_qt.py\n@@ -208,9 +208,6 @@\n if self._vispy_canvas is None:\n return\n self._vispy_canvas.events.close()\n- # Destroy if this is a toplevel widget\n- if self.parent() is None:\n- self.destroy()\n \n def mousePressEvent(self, ev):\n if self._vispy_canvas is None:\n@@ -300,6 +297,12 @@\n mod += keys.META,\n return mod\n \n+ def __del__(self):\n+ # Destroy if this is a toplevel widget\n+ if self.parent() is None:\n+ self.destroy()\n+ QtOpenGL.QGLWidget.__del__(self)\n+\n \n # class QtMouseEvent(MouseEvent):\n # special subclass of MouseEvent for propagating acceptance info back to Qt.\n", "issue": "The Python process hangs after demos on Windows, Qt backend\nIf I run any demo, it works, then I close the window, and the process is still running. CTRL+C does not end the process, I have to kill it manually, which is kind of annoying.\n\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n# Copyright (c) 2014, Vispy Development Team.\n# Distributed under the (new) BSD License. See LICENSE.txt for more info.\n\n\"\"\"\nvispy backend for Qt (PySide and PyQt4).\n\"\"\"\n\nfrom __future__ import division\nfrom time import sleep, time\n\nfrom ... import config\nfrom ..base import BaseApplicationBackend, BaseCanvasBackend, BaseTimerBackend\nfrom ...util import keys\nfrom . import ATTEMPTED_BACKENDS\nfrom ...util.six import text_type\n\n# Get what qt lib to try\nif len(ATTEMPTED_BACKENDS):\n qt_lib = ATTEMPTED_BACKENDS[-1].lower()\n if qt_lib.lower() == 'qt':\n qt_lib = config['qt_lib'].lower()\n # in case the last app we ran was something else (e.g., Pyglet)\n if qt_lib not in ['pyqt', 'pyqt4', 'pyside', 'qt']:\n qt_lib = 'any'\nelse:\n qt_lib = 'any'\n\n# Import PySide or PyQt4\nif qt_lib in ('any', 'qt'):\n try:\n from PyQt4 import QtGui, QtCore, QtOpenGL\n except ImportError:\n from PySide import QtGui, QtCore, QtOpenGL\nelif qt_lib in ('pyqt', 'pyqt4'):\n from PyQt4 import QtGui, QtCore, QtOpenGL\nelif qt_lib == 'pyside':\n from PySide import QtGui, QtCore, QtOpenGL\nelse:\n raise Exception(\"Do not recognize Qt library '%s'. Options are \"\n \"'pyqt4', 'pyside', or 'qt']).\" % str(qt_lib))\n\n# todo: add support for distinguishing left and right shift/ctrl/alt keys.\n# Linux scan codes: (left, right)\n# Shift 50, 62\n# Ctrl 37, 105\n# Alt 64, 108\nKEYMAP = {\n QtCore.Qt.Key_Shift: keys.SHIFT,\n QtCore.Qt.Key_Control: keys.CONTROL,\n QtCore.Qt.Key_Alt: keys.ALT,\n QtCore.Qt.Key_AltGr: keys.ALT,\n QtCore.Qt.Key_Meta: keys.META,\n\n QtCore.Qt.Key_Left: keys.LEFT,\n QtCore.Qt.Key_Up: keys.UP,\n QtCore.Qt.Key_Right: keys.RIGHT,\n QtCore.Qt.Key_Down: keys.DOWN,\n QtCore.Qt.Key_PageUp: keys.PAGEUP,\n QtCore.Qt.Key_PageDown: keys.PAGEDOWN,\n\n QtCore.Qt.Key_Insert: keys.INSERT,\n QtCore.Qt.Key_Delete: keys.DELETE,\n QtCore.Qt.Key_Home: keys.HOME,\n QtCore.Qt.Key_End: keys.END,\n\n QtCore.Qt.Key_Escape: keys.ESCAPE,\n QtCore.Qt.Key_Backspace: keys.BACKSPACE,\n\n QtCore.Qt.Key_F1: keys.F1,\n QtCore.Qt.Key_F2: keys.F2,\n QtCore.Qt.Key_F3: keys.F3,\n QtCore.Qt.Key_F4: keys.F4,\n QtCore.Qt.Key_F5: keys.F5,\n QtCore.Qt.Key_F6: keys.F6,\n QtCore.Qt.Key_F7: keys.F7,\n QtCore.Qt.Key_F8: keys.F8,\n QtCore.Qt.Key_F9: keys.F9,\n QtCore.Qt.Key_F10: keys.F10,\n QtCore.Qt.Key_F11: keys.F11,\n QtCore.Qt.Key_F12: keys.F12,\n\n QtCore.Qt.Key_Space: keys.SPACE,\n QtCore.Qt.Key_Enter: keys.ENTER,\n QtCore.Qt.Key_Return: keys.ENTER,\n QtCore.Qt.Key_Tab: keys.TAB,\n}\n\nBUTTONMAP = {0: 0, 1: 1, 2: 2, 4: 3, 8: 4, 16: 5}\n\n\nclass ApplicationBackend(BaseApplicationBackend):\n\n def __init__(self):\n BaseApplicationBackend.__init__(self)\n\n def _vispy_get_backend_name(self):\n if 'pyside' in QtCore.__name__.lower():\n return 'PySide (qt)'\n else:\n return 'PyQt4 (qt)'\n\n def _vispy_process_events(self):\n app = self._vispy_get_native_app()\n app.flush()\n app.processEvents()\n\n def _vispy_run(self):\n app = self._vispy_get_native_app()\n if hasattr(app, '_in_event_loop') and app._in_event_loop:\n pass # Already in event loop\n else:\n return app.exec_()\n\n def _vispy_quit(self):\n return self._vispy_get_native_app().quit()\n\n def _vispy_get_native_app(self):\n # Get native app in save way. Taken from guisupport.py\n app = QtGui.QApplication.instance()\n if app is None:\n app = QtGui.QApplication([''])\n # Store so it won't be deleted, but not on a vispy object,\n # or an application may produce error when closed\n QtGui._qApp = app\n # Return\n return app\n\n\nclass CanvasBackend(QtOpenGL.QGLWidget, BaseCanvasBackend):\n\n \"\"\"Qt backend for Canvas abstract class.\"\"\"\n\n def __init__(self, *args, **kwargs):\n BaseCanvasBackend.__init__(self)\n QtOpenGL.QGLWidget.__init__(self, *args, **kwargs)\n self.setAutoBufferSwap(False) # to make consistent with other backends\n self.setMouseTracking(True)\n\n def _vispy_warmup(self):\n etime = time() + 0.25\n while time() < etime:\n sleep(0.01)\n self._vispy_set_current()\n self._vispy_canvas.app.process_events()\n\n def _vispy_set_current(self):\n # Make this the current context\n self.makeCurrent()\n\n def _vispy_swap_buffers(self):\n # Swap front and back buffer\n self.swapBuffers()\n\n def _vispy_set_title(self, title):\n # Set the window title. Has no effect for widgets\n self.setWindowTitle(title)\n\n def _vispy_set_size(self, w, h):\n # Set size of the widget or window\n self.resize(w, h)\n\n def _vispy_set_position(self, x, y):\n # Set location of the widget or window. May have no effect for widgets\n self.move(x, y)\n\n def _vispy_set_visible(self, visible):\n # Show or hide the window or widget\n if visible:\n self.show()\n else:\n self.hide()\n\n def _vispy_update(self):\n # Invoke a redraw\n self.update()\n\n def _vispy_close(self):\n # Force the window or widget to shut down\n self.close()\n\n def _vispy_get_position(self):\n g = self.geometry()\n return g.x(), g.y()\n\n def _vispy_get_size(self):\n g = self.geometry()\n return g.width(), g.height()\n\n def initializeGL(self):\n if self._vispy_canvas is None:\n return\n self._vispy_canvas.events.initialize()\n\n def resizeGL(self, w, h):\n if self._vispy_canvas is None:\n return\n self._vispy_canvas.events.resize(size=(w, h))\n\n def paintGL(self):\n if self._vispy_canvas is None:\n return\n # (0, 0, self.width(), self.height()))\n self._vispy_set_current()\n self._vispy_canvas.events.paint(region=None)\n\n def closeEvent(self, ev):\n if self._vispy_canvas is None:\n return\n self._vispy_canvas.events.close()\n # Destroy if this is a toplevel widget\n if self.parent() is None:\n self.destroy()\n\n def mousePressEvent(self, ev):\n if self._vispy_canvas is None:\n return\n self._vispy_mouse_press(\n native=ev,\n pos=(ev.pos().x(), ev.pos().y()),\n button=BUTTONMAP.get(ev.button(), 0),\n modifiers = self._modifiers(ev),\n )\n\n def mouseReleaseEvent(self, ev):\n if self._vispy_canvas is None:\n return\n self._vispy_mouse_release(\n native=ev,\n pos=(ev.pos().x(), ev.pos().y()),\n button=BUTTONMAP[ev.button()],\n modifiers = self._modifiers(ev),\n )\n\n def mouseMoveEvent(self, ev):\n if self._vispy_canvas is None:\n return\n self._vispy_mouse_move(\n native=ev,\n pos=(ev.pos().x(), ev.pos().y()),\n modifiers=self._modifiers(ev),\n )\n\n def wheelEvent(self, ev):\n if self._vispy_canvas is None:\n return\n # Get scrolling\n deltax, deltay = 0.0, 0.0\n if ev.orientation == QtCore.Qt.Horizontal:\n deltax = ev.delta() / 120.0\n else:\n deltay = ev.delta() / 120.0\n # Emit event\n self._vispy_canvas.events.mouse_wheel(\n native=ev,\n delta=(deltax, deltay),\n pos=(ev.pos().x(), ev.pos().y()),\n modifiers=self._modifiers(ev),\n )\n\n def keyPressEvent(self, ev):\n self._vispy_canvas.events.key_press(\n native=ev,\n key=self._processKey(ev),\n text=text_type(ev.text()),\n modifiers=self._modifiers(ev),\n )\n\n def keyReleaseEvent(self, ev):\n # if ev.isAutoRepeat():\n # return # Skip release auto repeat events\n self._vispy_canvas.events.key_release(\n native=ev,\n key=self._processKey(ev),\n text=text_type(ev.text()),\n modifiers=self._modifiers(ev),\n )\n\n def _processKey(self, event):\n # evaluates the keycode of qt, and transform to vispy key.\n key = int(event.key())\n if key in KEYMAP:\n return KEYMAP[key]\n elif key >= 32 and key <= 127:\n return keys.Key(chr(key))\n else:\n return None\n\n def _modifiers(self, event):\n # Convert the QT modifier state into a tuple of active modifier keys.\n mod = ()\n qtmod = event.modifiers()\n if QtCore.Qt.ShiftModifier & qtmod:\n mod += keys.SHIFT,\n if QtCore.Qt.ControlModifier & qtmod:\n mod += keys.CONTROL,\n if QtCore.Qt.AltModifier & qtmod:\n mod += keys.ALT,\n if QtCore.Qt.MetaModifier & qtmod:\n mod += keys.META,\n return mod\n\n\n# class QtMouseEvent(MouseEvent):\n# special subclass of MouseEvent for propagating acceptance info back to Qt.\n# @MouseEvent.handled.setter\n# def handled(self, val):\n# self._handled = val\n# if val:\n# self.qt_event.accept()\n# else:\n# self.qt_event.ignore()\nclass TimerBackend(BaseTimerBackend, QtCore.QTimer):\n\n def __init__(self, vispy_timer):\n if QtGui.QApplication.instance() is None:\n global QAPP\n QAPP = QtGui.QApplication([])\n BaseTimerBackend.__init__(self, vispy_timer)\n QtCore.QTimer.__init__(self)\n self.timeout.connect(self._vispy_timeout)\n\n def _vispy_start(self, interval):\n self.start(interval * 1000.)\n\n def _vispy_stop(self):\n self.stop()\n\n def _vispy_timeout(self):\n self._vispy_timer._timeout()\n", "path": "vispy/app/backends/_qt.py"}]}
| 4,016 | 223 |
gh_patches_debug_40962
|
rasdani/github-patches
|
git_diff
|
aws__aws-cli-2899
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Add support for high resolution metrics in CloudWatch
Cloudwatch API supports high-resolution metrics, AWS CLI does not.
https://aws.amazon.com/blogs/aws/new-high-resolution-custom-metrics-and-alarms-for-amazon-cloudwatch/
</issue>
<code>
[start of awscli/customizations/putmetricdata.py]
1 # Copyright 2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2 #
3 # Licensed under the Apache License, Version 2.0 (the "License"). You
4 # may not use this file except in compliance with the License. A copy of
5 # the License is located at
6 #
7 # http://aws.amazon.com/apache2.0/
8 #
9 # or in the "license" file accompanying this file. This file is
10 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
11 # ANY KIND, either express or implied. See the License for the specific
12 # language governing permissions and limitations under the License.
13 """
14 This customization adds the following scalar parameters to the
15 cloudwatch put-metric-data operation:
16
17 * --metric-name
18 * --dimensions
19 * --timestamp
20 * --value
21 * --statistic-values
22 * --unit
23
24 """
25 import decimal
26
27 from awscli.arguments import CustomArgument
28 from awscli.utils import split_on_commas
29 from awscli.customizations.utils import validate_mutually_exclusive_handler
30
31
32 def register_put_metric_data(event_handler):
33 event_handler.register('building-argument-table.cloudwatch.put-metric-data',
34 _promote_args)
35 event_handler.register(
36 'operation-args-parsed.cloudwatch.put-metric-data',
37 validate_mutually_exclusive_handler(
38 ['metric_data'], ['metric_name', 'timestamp', 'unit', 'value',
39 'dimensions', 'statistic_values']))
40
41
42 def _promote_args(argument_table, **kwargs):
43 # We're providing top level params for metric-data. This means
44 # that metric-data is now longer a required arg. We do need
45 # to check that either metric-data or the complex args we've added
46 # have been provided.
47 argument_table['metric-data'].required = False
48
49 argument_table['metric-name'] = PutMetricArgument(
50 'metric-name', help_text='The name of the metric.')
51 argument_table['timestamp'] = PutMetricArgument(
52 'timestamp', help_text='The time stamp used for the metric. '
53 'If not specified, the default value is '
54 'set to the time the metric data was '
55 'received.')
56 argument_table['unit'] = PutMetricArgument(
57 'unit', help_text='The unit of metric.')
58 argument_table['value'] = PutMetricArgument(
59 'value', help_text='The value for the metric. Although the --value '
60 'parameter accepts numbers of type Double, '
61 'Amazon CloudWatch truncates values with very '
62 'large exponents. Values with base-10 exponents '
63 'greater than 126 (1 x 10^126) are truncated. '
64 'Likewise, values with base-10 exponents less '
65 'than -130 (1 x 10^-130) are also truncated.')
66
67 argument_table['dimensions'] = PutMetricArgument(
68 'dimensions', help_text=(
69 'The --dimensions argument further expands '
70 'on the identity of a metric using a Name=Value '
71 'pair, separated by commas, for example: '
72 '<code>--dimensions InstanceID=1-23456789 InstanceType=m1.small</code>. '
73 'Note that the <code>--dimensions</code> argument has a different '
74 'format when used in <code>get-metric-data</code>, where for the same example you would '
75 'use the format <code>--dimensions Name=InstanceID,Value=i-aaba32d4 Name=InstanceType,value=m1.small </code>.'))
76 argument_table['statistic-values'] = PutMetricArgument(
77 'statistic-values', help_text='A set of statistical values describing '
78 'the metric.')
79
80
81 def insert_first_element(name):
82 def _wrap_add_to_params(func):
83 def _add_to_params(self, parameters, value):
84 if value is None:
85 return
86 if name not in parameters:
87 # We're taking a shortcut here and assuming that the first
88 # element is a struct type, hence the default value of
89 # a dict. If this was going to be more general we'd need
90 # to have this paramterized, i.e. you pass in some sort of
91 # factory function that creates the initial starting value.
92 parameters[name] = [{}]
93 first_element = parameters[name][0]
94 return func(self, first_element, value)
95 return _add_to_params
96 return _wrap_add_to_params
97
98
99 class PutMetricArgument(CustomArgument):
100 def add_to_params(self, parameters, value):
101 method_name = '_add_param_%s' % self.name.replace('-', '_')
102 return getattr(self, method_name)(parameters, value)
103
104 @insert_first_element('MetricData')
105 def _add_param_metric_name(self, first_element, value):
106 first_element['MetricName'] = value
107
108 @insert_first_element('MetricData')
109 def _add_param_unit(self, first_element, value):
110 first_element['Unit'] = value
111
112 @insert_first_element('MetricData')
113 def _add_param_timestamp(self, first_element, value):
114 first_element['Timestamp'] = value
115
116 @insert_first_element('MetricData')
117 def _add_param_value(self, first_element, value):
118 # Use a Decimal to avoid loss in precision.
119 first_element['Value'] = decimal.Decimal(value)
120
121 @insert_first_element('MetricData')
122 def _add_param_dimensions(self, first_element, value):
123 # Dimensions needs a little more processing. We support
124 # the key=value,key2=value syntax so we need to parse
125 # that.
126 dimensions = []
127 for pair in split_on_commas(value):
128 key, value = pair.split('=')
129 dimensions.append({'Name': key, 'Value': value})
130 first_element['Dimensions'] = dimensions
131
132 @insert_first_element('MetricData')
133 def _add_param_statistic_values(self, first_element, value):
134 # StatisticValues is a struct type so we are parsing
135 # a csv keyval list into a dict.
136 statistics = {}
137 for pair in split_on_commas(value):
138 key, value = pair.split('=')
139 # There are four supported values: Maximum, Minimum, SampleCount,
140 # and Sum. All of them are documented as a type double so we can
141 # convert these to a decimal value to preserve precision.
142 statistics[key] = decimal.Decimal(value)
143 first_element['StatisticValues'] = statistics
144
[end of awscli/customizations/putmetricdata.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/awscli/customizations/putmetricdata.py b/awscli/customizations/putmetricdata.py
--- a/awscli/customizations/putmetricdata.py
+++ b/awscli/customizations/putmetricdata.py
@@ -20,6 +20,7 @@
* --value
* --statistic-values
* --unit
+* --storage-resolution
"""
import decimal
@@ -30,8 +31,8 @@
def register_put_metric_data(event_handler):
- event_handler.register('building-argument-table.cloudwatch.put-metric-data',
- _promote_args)
+ event_handler.register(
+ 'building-argument-table.cloudwatch.put-metric-data', _promote_args)
event_handler.register(
'operation-args-parsed.cloudwatch.put-metric-data',
validate_mutually_exclusive_handler(
@@ -39,7 +40,7 @@
'dimensions', 'statistic_values']))
-def _promote_args(argument_table, **kwargs):
+def _promote_args(argument_table, operation_model, **kwargs):
# We're providing top level params for metric-data. This means
# that metric-data is now longer a required arg. We do need
# to check that either metric-data or the complex args we've added
@@ -69,14 +70,25 @@
'The --dimensions argument further expands '
'on the identity of a metric using a Name=Value '
'pair, separated by commas, for example: '
- '<code>--dimensions InstanceID=1-23456789 InstanceType=m1.small</code>. '
- 'Note that the <code>--dimensions</code> argument has a different '
- 'format when used in <code>get-metric-data</code>, where for the same example you would '
- 'use the format <code>--dimensions Name=InstanceID,Value=i-aaba32d4 Name=InstanceType,value=m1.small </code>.'))
+ '<code>--dimensions InstanceID=1-23456789 '
+ 'InstanceType=m1.small</code>. Note that the '
+ '<code>--dimensions</code> argument has a different format when '
+ 'used in <code>get-metric-data</code>, where for the same example '
+ 'you would use the format <code>--dimensions '
+ 'Name=InstanceID,Value=i-aaba32d4 '
+ 'Name=InstanceType,value=m1.small </code>.'
+ )
+ )
argument_table['statistic-values'] = PutMetricArgument(
'statistic-values', help_text='A set of statistical values describing '
'the metric.')
+ metric_data = operation_model.input_shape.members['MetricData'].member
+ storage_resolution = metric_data.members['StorageResolution']
+ argument_table['storage-resolution'] = PutMetricArgument(
+ 'storage-resolution', help_text=storage_resolution.documentation
+ )
+
def insert_first_element(name):
def _wrap_add_to_params(func):
@@ -141,3 +153,7 @@
# convert these to a decimal value to preserve precision.
statistics[key] = decimal.Decimal(value)
first_element['StatisticValues'] = statistics
+
+ @insert_first_element('MetricData')
+ def _add_param_storage_resolution(self, first_element, value):
+ first_element['StorageResolution'] = int(value)
|
{"golden_diff": "diff --git a/awscli/customizations/putmetricdata.py b/awscli/customizations/putmetricdata.py\n--- a/awscli/customizations/putmetricdata.py\n+++ b/awscli/customizations/putmetricdata.py\n@@ -20,6 +20,7 @@\n * --value\n * --statistic-values\n * --unit\n+* --storage-resolution\n \n \"\"\"\n import decimal\n@@ -30,8 +31,8 @@\n \n \n def register_put_metric_data(event_handler):\n- event_handler.register('building-argument-table.cloudwatch.put-metric-data',\n- _promote_args)\n+ event_handler.register(\n+ 'building-argument-table.cloudwatch.put-metric-data', _promote_args)\n event_handler.register(\n 'operation-args-parsed.cloudwatch.put-metric-data',\n validate_mutually_exclusive_handler(\n@@ -39,7 +40,7 @@\n 'dimensions', 'statistic_values']))\n \n \n-def _promote_args(argument_table, **kwargs):\n+def _promote_args(argument_table, operation_model, **kwargs):\n # We're providing top level params for metric-data. This means\n # that metric-data is now longer a required arg. We do need\n # to check that either metric-data or the complex args we've added\n@@ -69,14 +70,25 @@\n 'The --dimensions argument further expands '\n 'on the identity of a metric using a Name=Value '\n 'pair, separated by commas, for example: '\n- '<code>--dimensions InstanceID=1-23456789 InstanceType=m1.small</code>. '\n- 'Note that the <code>--dimensions</code> argument has a different '\n- 'format when used in <code>get-metric-data</code>, where for the same example you would '\n- 'use the format <code>--dimensions Name=InstanceID,Value=i-aaba32d4 Name=InstanceType,value=m1.small </code>.'))\n+ '<code>--dimensions InstanceID=1-23456789 '\n+ 'InstanceType=m1.small</code>. Note that the '\n+ '<code>--dimensions</code> argument has a different format when '\n+ 'used in <code>get-metric-data</code>, where for the same example '\n+ 'you would use the format <code>--dimensions '\n+ 'Name=InstanceID,Value=i-aaba32d4 '\n+ 'Name=InstanceType,value=m1.small </code>.'\n+ )\n+ )\n argument_table['statistic-values'] = PutMetricArgument(\n 'statistic-values', help_text='A set of statistical values describing '\n 'the metric.')\n \n+ metric_data = operation_model.input_shape.members['MetricData'].member\n+ storage_resolution = metric_data.members['StorageResolution']\n+ argument_table['storage-resolution'] = PutMetricArgument(\n+ 'storage-resolution', help_text=storage_resolution.documentation\n+ )\n+\n \n def insert_first_element(name):\n def _wrap_add_to_params(func):\n@@ -141,3 +153,7 @@\n # convert these to a decimal value to preserve precision.\n statistics[key] = decimal.Decimal(value)\n first_element['StatisticValues'] = statistics\n+\n+ @insert_first_element('MetricData')\n+ def _add_param_storage_resolution(self, first_element, value):\n+ first_element['StorageResolution'] = int(value)\n", "issue": "Add support for high resolution metrics in CloudWatch\nCloudwatch API supports high-resolution metrics, AWS CLI does not.\r\n\r\nhttps://aws.amazon.com/blogs/aws/new-high-resolution-custom-metrics-and-alarms-for-amazon-cloudwatch/\n", "before_files": [{"content": "# Copyright 2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\"). You\n# may not use this file except in compliance with the License. A copy of\n# the License is located at\n#\n# http://aws.amazon.com/apache2.0/\n#\n# or in the \"license\" file accompanying this file. This file is\n# distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF\n# ANY KIND, either express or implied. See the License for the specific\n# language governing permissions and limitations under the License.\n\"\"\"\nThis customization adds the following scalar parameters to the\ncloudwatch put-metric-data operation:\n\n* --metric-name\n* --dimensions\n* --timestamp\n* --value\n* --statistic-values\n* --unit\n\n\"\"\"\nimport decimal\n\nfrom awscli.arguments import CustomArgument\nfrom awscli.utils import split_on_commas\nfrom awscli.customizations.utils import validate_mutually_exclusive_handler\n\n\ndef register_put_metric_data(event_handler):\n event_handler.register('building-argument-table.cloudwatch.put-metric-data',\n _promote_args)\n event_handler.register(\n 'operation-args-parsed.cloudwatch.put-metric-data',\n validate_mutually_exclusive_handler(\n ['metric_data'], ['metric_name', 'timestamp', 'unit', 'value',\n 'dimensions', 'statistic_values']))\n\n\ndef _promote_args(argument_table, **kwargs):\n # We're providing top level params for metric-data. This means\n # that metric-data is now longer a required arg. We do need\n # to check that either metric-data or the complex args we've added\n # have been provided.\n argument_table['metric-data'].required = False\n\n argument_table['metric-name'] = PutMetricArgument(\n 'metric-name', help_text='The name of the metric.')\n argument_table['timestamp'] = PutMetricArgument(\n 'timestamp', help_text='The time stamp used for the metric. '\n 'If not specified, the default value is '\n 'set to the time the metric data was '\n 'received.')\n argument_table['unit'] = PutMetricArgument(\n 'unit', help_text='The unit of metric.')\n argument_table['value'] = PutMetricArgument(\n 'value', help_text='The value for the metric. Although the --value '\n 'parameter accepts numbers of type Double, '\n 'Amazon CloudWatch truncates values with very '\n 'large exponents. Values with base-10 exponents '\n 'greater than 126 (1 x 10^126) are truncated. '\n 'Likewise, values with base-10 exponents less '\n 'than -130 (1 x 10^-130) are also truncated.')\n\n argument_table['dimensions'] = PutMetricArgument(\n 'dimensions', help_text=(\n 'The --dimensions argument further expands '\n 'on the identity of a metric using a Name=Value '\n 'pair, separated by commas, for example: '\n '<code>--dimensions InstanceID=1-23456789 InstanceType=m1.small</code>. '\n 'Note that the <code>--dimensions</code> argument has a different '\n 'format when used in <code>get-metric-data</code>, where for the same example you would '\n 'use the format <code>--dimensions Name=InstanceID,Value=i-aaba32d4 Name=InstanceType,value=m1.small </code>.'))\n argument_table['statistic-values'] = PutMetricArgument(\n 'statistic-values', help_text='A set of statistical values describing '\n 'the metric.')\n\n\ndef insert_first_element(name):\n def _wrap_add_to_params(func):\n def _add_to_params(self, parameters, value):\n if value is None:\n return\n if name not in parameters:\n # We're taking a shortcut here and assuming that the first\n # element is a struct type, hence the default value of\n # a dict. If this was going to be more general we'd need\n # to have this paramterized, i.e. you pass in some sort of\n # factory function that creates the initial starting value.\n parameters[name] = [{}]\n first_element = parameters[name][0]\n return func(self, first_element, value)\n return _add_to_params\n return _wrap_add_to_params\n\n\nclass PutMetricArgument(CustomArgument):\n def add_to_params(self, parameters, value):\n method_name = '_add_param_%s' % self.name.replace('-', '_')\n return getattr(self, method_name)(parameters, value)\n\n @insert_first_element('MetricData')\n def _add_param_metric_name(self, first_element, value):\n first_element['MetricName'] = value\n\n @insert_first_element('MetricData')\n def _add_param_unit(self, first_element, value):\n first_element['Unit'] = value\n\n @insert_first_element('MetricData')\n def _add_param_timestamp(self, first_element, value):\n first_element['Timestamp'] = value\n\n @insert_first_element('MetricData')\n def _add_param_value(self, first_element, value):\n # Use a Decimal to avoid loss in precision.\n first_element['Value'] = decimal.Decimal(value)\n\n @insert_first_element('MetricData')\n def _add_param_dimensions(self, first_element, value):\n # Dimensions needs a little more processing. We support\n # the key=value,key2=value syntax so we need to parse\n # that.\n dimensions = []\n for pair in split_on_commas(value):\n key, value = pair.split('=')\n dimensions.append({'Name': key, 'Value': value})\n first_element['Dimensions'] = dimensions\n\n @insert_first_element('MetricData')\n def _add_param_statistic_values(self, first_element, value):\n # StatisticValues is a struct type so we are parsing\n # a csv keyval list into a dict.\n statistics = {}\n for pair in split_on_commas(value):\n key, value = pair.split('=')\n # There are four supported values: Maximum, Minimum, SampleCount,\n # and Sum. All of them are documented as a type double so we can\n # convert these to a decimal value to preserve precision.\n statistics[key] = decimal.Decimal(value)\n first_element['StatisticValues'] = statistics\n", "path": "awscli/customizations/putmetricdata.py"}]}
| 2,315 | 747 |
gh_patches_debug_304
|
rasdani/github-patches
|
git_diff
|
statsmodels__statsmodels-507
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
numdifftools dependency
Original Launchpad bug 653902: https://bugs.launchpad.net/statsmodels/+bug/653902
Reported by: vincent-vincentdavis (Vincent Davis).
statsmodels/_init_.py imports tsa
Which then returns an exception from statsmodels/tsa/var.py "raise Warning("You need to install numdifftools to try out the AR model")"
Should numdifftools be a dependency for all of statsmodels ?
</issue>
<code>
[start of statsmodels/tsa/mlemodel.py]
1 """Base Classes for Likelihood Models in time series analysis
2
3 Warning: imports numdifftools
4
5
6
7 Created on Sun Oct 10 15:00:47 2010
8
9 Author: josef-pktd
10 License: BSD
11
12 """
13
14 import numpy as np
15
16 import numdifftools as ndt
17
18 from statsmodels.base.model import LikelihoodModel
19
20 #copied from sandbox/regression/mle.py
21 #TODO: I take it this is only a stub and should be included in another
22 # model class?
23 class TSMLEModel(LikelihoodModel):
24 """
25 univariate time series model for estimation with maximum likelihood
26
27 Note: This is not working yet
28 """
29
30 def __init__(self, endog, exog=None):
31 #need to override p,q (nar,nma) correctly
32 super(TSMLEModel, self).__init__(endog, exog)
33 #set default arma(1,1)
34 self.nar = 1
35 self.nma = 1
36 #self.initialize()
37
38 def geterrors(self, params):
39 raise NotImplementedError
40
41 def loglike(self, params):
42 """
43 Loglikelihood for timeseries model
44
45 Notes
46 -----
47 needs to be overwritten by subclass
48 """
49 raise NotImplementedError
50
51
52 def score(self, params):
53 """
54 Score vector for Arma model
55 """
56 #return None
57 #print params
58 jac = ndt.Jacobian(self.loglike, stepMax=1e-4)
59 return jac(params)[-1]
60
61 def hessian(self, params):
62 """
63 Hessian of arma model. Currently uses numdifftools
64 """
65 #return None
66 Hfun = ndt.Jacobian(self.score, stepMax=1e-4)
67 return Hfun(params)[-1]
68
69
70 def fit(self, start_params=None, maxiter=5000, method='fmin', tol=1e-08):
71 '''estimate model by minimizing negative loglikelihood
72
73 does this need to be overwritten ?
74 '''
75 if start_params is None and hasattr(self, '_start_params'):
76 start_params = self._start_params
77 #start_params = np.concatenate((0.05*np.ones(self.nar + self.nma), [1]))
78 mlefit = super(TSMLEModel, self).fit(start_params=start_params,
79 maxiter=maxiter, method=method, tol=tol)
80 return mlefit
81
[end of statsmodels/tsa/mlemodel.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/statsmodels/tsa/mlemodel.py b/statsmodels/tsa/mlemodel.py
--- a/statsmodels/tsa/mlemodel.py
+++ b/statsmodels/tsa/mlemodel.py
@@ -13,7 +13,10 @@
import numpy as np
-import numdifftools as ndt
+try:
+ import numdifftools as ndt
+except:
+ pass
from statsmodels.base.model import LikelihoodModel
|
{"golden_diff": "diff --git a/statsmodels/tsa/mlemodel.py b/statsmodels/tsa/mlemodel.py\n--- a/statsmodels/tsa/mlemodel.py\n+++ b/statsmodels/tsa/mlemodel.py\n@@ -13,7 +13,10 @@\n \n import numpy as np\n \n-import numdifftools as ndt\n+try:\n+ import numdifftools as ndt\n+except:\n+ pass\n \n from statsmodels.base.model import LikelihoodModel\n", "issue": "numdifftools dependency\nOriginal Launchpad bug 653902: https://bugs.launchpad.net/statsmodels/+bug/653902\nReported by: vincent-vincentdavis (Vincent Davis).\n\nstatsmodels/_init_.py imports tsa\nWhich then returns an exception from statsmodels/tsa/var.py \"raise Warning(\"You need to install numdifftools to try out the AR model\")\"\nShould numdifftools be a dependency for all of statsmodels ?\n\n", "before_files": [{"content": "\"\"\"Base Classes for Likelihood Models in time series analysis\n\nWarning: imports numdifftools\n\n\n\nCreated on Sun Oct 10 15:00:47 2010\n\nAuthor: josef-pktd\nLicense: BSD\n\n\"\"\"\n\nimport numpy as np\n\nimport numdifftools as ndt\n\nfrom statsmodels.base.model import LikelihoodModel\n\n#copied from sandbox/regression/mle.py\n#TODO: I take it this is only a stub and should be included in another\n# model class?\nclass TSMLEModel(LikelihoodModel):\n \"\"\"\n univariate time series model for estimation with maximum likelihood\n\n Note: This is not working yet\n \"\"\"\n\n def __init__(self, endog, exog=None):\n #need to override p,q (nar,nma) correctly\n super(TSMLEModel, self).__init__(endog, exog)\n #set default arma(1,1)\n self.nar = 1\n self.nma = 1\n #self.initialize()\n\n def geterrors(self, params):\n raise NotImplementedError\n\n def loglike(self, params):\n \"\"\"\n Loglikelihood for timeseries model\n\n Notes\n -----\n needs to be overwritten by subclass\n \"\"\"\n raise NotImplementedError\n\n\n def score(self, params):\n \"\"\"\n Score vector for Arma model\n \"\"\"\n #return None\n #print params\n jac = ndt.Jacobian(self.loglike, stepMax=1e-4)\n return jac(params)[-1]\n\n def hessian(self, params):\n \"\"\"\n Hessian of arma model. Currently uses numdifftools\n \"\"\"\n #return None\n Hfun = ndt.Jacobian(self.score, stepMax=1e-4)\n return Hfun(params)[-1]\n\n\n def fit(self, start_params=None, maxiter=5000, method='fmin', tol=1e-08):\n '''estimate model by minimizing negative loglikelihood\n\n does this need to be overwritten ?\n '''\n if start_params is None and hasattr(self, '_start_params'):\n start_params = self._start_params\n #start_params = np.concatenate((0.05*np.ones(self.nar + self.nma), [1]))\n mlefit = super(TSMLEModel, self).fit(start_params=start_params,\n maxiter=maxiter, method=method, tol=tol)\n return mlefit\n", "path": "statsmodels/tsa/mlemodel.py"}]}
| 1,347 | 103 |
gh_patches_debug_32783
|
rasdani/github-patches
|
git_diff
|
unionai-oss__pandera-1547
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Concise typing.List type annotation throws error in DataFrameModel.to_schema()
**Describe the bug**
The [Using Data Types directly for Column Type Annotations](https://pandera.readthedocs.io/en/stable/dataframe_models.html#using-data-types-directly-for-column-type-annotations) feature doesn't work for a `typing.List` type as described in [Support for the python typing module](https://pandera.readthedocs.io/en/latest/dtype_validation.html?highlight=typing.List#support-for-the-python-typing-module)
#### Code Sample, a copy-pastable example
```python
from typing import List
import pandera as pa
from pandera.typing import Series
class TodoList(pa.DataFrameModel):
items: List[str] = pa.Field(description="The scan IDs")
TodoList.to_schema() # throws error
```
This throws the error:
```py
Invalid annotation 'items: typing.List[str]'
```
#### Expected behavior
Should behave exactly the same as having an explicit `Series` data type:
```py
class TodoList(pa.DataFrameModel):
# here, I wrap it in pa.typing.Series and it works
items: pa.typing.Series[List[str]] = pa.Field(description="The scan IDs")
```
#### Desktop (please complete the following information):
- OS: MacOS
- Version: 14.1
</issue>
<code>
[start of pandera/api/pandas/model.py]
1 """Class-based api for pandas models."""
2
3 from typing import (
4 Any,
5 Dict,
6 List,
7 Optional,
8 Tuple,
9 Type,
10 Union,
11 )
12
13 import pandas as pd
14 from pandera.api.checks import Check
15 from pandera.api.dataframe.model import (
16 DataFrameModel as _DataFrameModel,
17 get_dtype_kwargs,
18 )
19 from pandera.api.dataframe.model_components import FieldInfo
20 from pandera.api.pandas.container import DataFrameSchema
21 from pandera.api.pandas.components import Column, Index, MultiIndex
22 from pandera.api.pandas.model_config import BaseConfig
23 from pandera.errors import SchemaInitError
24 from pandera.typing import AnnotationInfo, INDEX_TYPES, SERIES_TYPES
25
26
27 SchemaIndex = Union[Index, MultiIndex]
28
29
30 class DataFrameModel(_DataFrameModel[pd.DataFrame, DataFrameSchema]):
31 """Model of a pandas :class:`~pandera.api.pandas.container.DataFrameSchema`.
32
33 *new in 0.5.0*
34
35 .. important::
36
37 This class is the new name for ``SchemaModel``, which will be deprecated
38 in pandera version ``0.20.0``.
39
40 See the :ref:`User Guide <dataframe-models>` for more.
41 """
42
43 Config: Type[BaseConfig] = BaseConfig
44
45 @classmethod
46 def build_schema_(cls, **kwargs) -> DataFrameSchema:
47 multiindex_kwargs = {
48 name[len("multiindex_") :]: value
49 for name, value in vars(cls.__config__).items()
50 if name.startswith("multiindex_")
51 }
52 columns, index = cls._build_columns_index(
53 cls.__fields__, cls.__checks__, **multiindex_kwargs
54 )
55 return DataFrameSchema(
56 columns,
57 index=index,
58 checks=cls.__root_checks__,
59 **kwargs,
60 )
61
62 @classmethod
63 def _build_columns_index( # pylint:disable=too-many-locals
64 cls,
65 fields: Dict[str, Tuple[AnnotationInfo, FieldInfo]],
66 checks: Dict[str, List[Check]],
67 **multiindex_kwargs: Any,
68 ) -> Tuple[Dict[str, Column], Optional[Union[Index, MultiIndex]],]:
69 index_count = sum(
70 annotation.origin in INDEX_TYPES
71 for annotation, _ in fields.values()
72 )
73
74 columns: Dict[str, Column] = {}
75 indices: List[Index] = []
76 for field_name, (annotation, field) in fields.items():
77 field_checks = checks.get(field_name, [])
78 field_name = field.name
79 check_name = getattr(field, "check_name", None)
80
81 if annotation.metadata:
82 if field.dtype_kwargs:
83 raise TypeError(
84 "Cannot specify redundant 'dtype_kwargs' "
85 + f"for {annotation.raw_annotation}."
86 + "\n Usage Tip: Drop 'typing.Annotated'."
87 )
88 dtype_kwargs = get_dtype_kwargs(annotation)
89 dtype = annotation.arg(**dtype_kwargs) # type: ignore
90 elif annotation.default_dtype:
91 dtype = annotation.default_dtype
92 else:
93 dtype = annotation.arg
94
95 dtype = None if dtype is Any else dtype
96
97 if (
98 annotation.is_annotated_type
99 or annotation.origin is None
100 or annotation.origin in SERIES_TYPES
101 or annotation.raw_annotation in SERIES_TYPES
102 ):
103 if check_name is False:
104 raise SchemaInitError(
105 f"'check_name' is not supported for {field_name}."
106 )
107
108 column_kwargs = (
109 field.column_properties(
110 dtype,
111 required=not annotation.optional,
112 checks=field_checks,
113 name=field_name,
114 )
115 if field
116 else {}
117 )
118 columns[field_name] = Column(**column_kwargs)
119
120 elif (
121 annotation.origin in INDEX_TYPES
122 or annotation.raw_annotation in INDEX_TYPES
123 ):
124 if annotation.optional:
125 raise SchemaInitError(
126 f"Index '{field_name}' cannot be Optional."
127 )
128
129 if check_name is False or (
130 # default single index
131 check_name is None
132 and index_count == 1
133 ):
134 field_name = None # type:ignore
135
136 index_kwargs = (
137 field.index_properties(
138 dtype,
139 checks=field_checks,
140 name=field_name,
141 )
142 if field
143 else {}
144 )
145 index = Index(**index_kwargs)
146 indices.append(index)
147 else:
148 raise SchemaInitError(
149 f"Invalid annotation '{field_name}: "
150 f"{annotation.raw_annotation}'"
151 )
152
153 return columns, _build_schema_index(indices, **multiindex_kwargs)
154
155 @classmethod
156 def to_json_schema(cls):
157 """Serialize schema metadata into json-schema format.
158
159 :param dataframe_schema: schema to write to json-schema format.
160
161 .. note::
162
163 This function is currently does not fully specify a pandera schema,
164 and is primarily used internally to render OpenAPI docs via the
165 FastAPI integration.
166 """
167 schema = cls.to_schema()
168 empty = pd.DataFrame(columns=schema.columns.keys()).astype(
169 {k: v.type for k, v in schema.dtypes.items()}
170 )
171 table_schema = pd.io.json.build_table_schema(empty)
172
173 def _field_json_schema(field):
174 return {
175 "type": "array",
176 "items": {"type": field["type"]},
177 }
178
179 return {
180 "title": schema.name or "pandera.DataFrameSchema",
181 "type": "object",
182 "properties": {
183 field["name"]: _field_json_schema(field)
184 for field in table_schema["fields"]
185 },
186 }
187
188
189 SchemaModel = DataFrameModel
190 """
191 Alias for DataFrameModel.
192
193 .. warning::
194
195 This subclass is necessary for backwards compatibility, and will be
196 deprecated in pandera version ``0.20.0`` in favor of
197 :py:class:`~pandera.api.pandas.model.DataFrameModel`
198 """
199
200
201 def _build_schema_index(
202 indices: List[Index], **multiindex_kwargs: Any
203 ) -> Optional[SchemaIndex]:
204 index: Optional[SchemaIndex] = None
205 if indices:
206 if len(indices) == 1:
207 index = indices[0]
208 else:
209 index = MultiIndex(indices, **multiindex_kwargs)
210 return index
211
[end of pandera/api/pandas/model.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/pandera/api/pandas/model.py b/pandera/api/pandas/model.py
--- a/pandera/api/pandas/model.py
+++ b/pandera/api/pandas/model.py
@@ -20,6 +20,7 @@
from pandera.api.pandas.container import DataFrameSchema
from pandera.api.pandas.components import Column, Index, MultiIndex
from pandera.api.pandas.model_config import BaseConfig
+from pandera.engines.pandas_engine import Engine
from pandera.errors import SchemaInitError
from pandera.typing import AnnotationInfo, INDEX_TYPES, SERIES_TYPES
@@ -78,6 +79,7 @@
field_name = field.name
check_name = getattr(field, "check_name", None)
+ use_raw_annotation = False
if annotation.metadata:
if field.dtype_kwargs:
raise TypeError(
@@ -90,13 +92,21 @@
elif annotation.default_dtype:
dtype = annotation.default_dtype
else:
- dtype = annotation.arg
+ try:
+ # if the raw annotation is accepted by the engine, use it as
+ # the dtype
+ Engine.dtype(annotation.raw_annotation)
+ dtype = annotation.raw_annotation
+ use_raw_annotation = True
+ except TypeError:
+ dtype = annotation.arg
dtype = None if dtype is Any else dtype
if (
annotation.is_annotated_type
or annotation.origin is None
+ or use_raw_annotation
or annotation.origin in SERIES_TYPES
or annotation.raw_annotation in SERIES_TYPES
):
|
{"golden_diff": "diff --git a/pandera/api/pandas/model.py b/pandera/api/pandas/model.py\n--- a/pandera/api/pandas/model.py\n+++ b/pandera/api/pandas/model.py\n@@ -20,6 +20,7 @@\n from pandera.api.pandas.container import DataFrameSchema\n from pandera.api.pandas.components import Column, Index, MultiIndex\n from pandera.api.pandas.model_config import BaseConfig\n+from pandera.engines.pandas_engine import Engine\n from pandera.errors import SchemaInitError\n from pandera.typing import AnnotationInfo, INDEX_TYPES, SERIES_TYPES\n \n@@ -78,6 +79,7 @@\n field_name = field.name\n check_name = getattr(field, \"check_name\", None)\n \n+ use_raw_annotation = False\n if annotation.metadata:\n if field.dtype_kwargs:\n raise TypeError(\n@@ -90,13 +92,21 @@\n elif annotation.default_dtype:\n dtype = annotation.default_dtype\n else:\n- dtype = annotation.arg\n+ try:\n+ # if the raw annotation is accepted by the engine, use it as\n+ # the dtype\n+ Engine.dtype(annotation.raw_annotation)\n+ dtype = annotation.raw_annotation\n+ use_raw_annotation = True\n+ except TypeError:\n+ dtype = annotation.arg\n \n dtype = None if dtype is Any else dtype\n \n if (\n annotation.is_annotated_type\n or annotation.origin is None\n+ or use_raw_annotation\n or annotation.origin in SERIES_TYPES\n or annotation.raw_annotation in SERIES_TYPES\n ):\n", "issue": "Concise typing.List type annotation throws error in DataFrameModel.to_schema()\n**Describe the bug**\r\n\r\nThe [Using Data Types directly for Column Type Annotations](https://pandera.readthedocs.io/en/stable/dataframe_models.html#using-data-types-directly-for-column-type-annotations) feature doesn't work for a `typing.List` type as described in [Support for the python typing module](https://pandera.readthedocs.io/en/latest/dtype_validation.html?highlight=typing.List#support-for-the-python-typing-module)\r\n\r\n#### Code Sample, a copy-pastable example\r\n\r\n```python\r\nfrom typing import List\r\nimport pandera as pa\r\nfrom pandera.typing import Series\r\n\r\nclass TodoList(pa.DataFrameModel):\r\n items: List[str] = pa.Field(description=\"The scan IDs\")\r\n\r\nTodoList.to_schema() # throws error\r\n```\r\n\r\nThis throws the error:\r\n```py\r\nInvalid annotation 'items: typing.List[str]'\r\n```\r\n\r\n#### Expected behavior\r\nShould behave exactly the same as having an explicit `Series` data type:\r\n```py\r\nclass TodoList(pa.DataFrameModel):\r\n # here, I wrap it in pa.typing.Series and it works\r\n items: pa.typing.Series[List[str]] = pa.Field(description=\"The scan IDs\")\r\n```\r\n\r\n#### Desktop (please complete the following information):\r\n\r\n - OS: MacOS\r\n - Version: 14.1\r\n\r\n\n", "before_files": [{"content": "\"\"\"Class-based api for pandas models.\"\"\"\n\nfrom typing import (\n Any,\n Dict,\n List,\n Optional,\n Tuple,\n Type,\n Union,\n)\n\nimport pandas as pd\nfrom pandera.api.checks import Check\nfrom pandera.api.dataframe.model import (\n DataFrameModel as _DataFrameModel,\n get_dtype_kwargs,\n)\nfrom pandera.api.dataframe.model_components import FieldInfo\nfrom pandera.api.pandas.container import DataFrameSchema\nfrom pandera.api.pandas.components import Column, Index, MultiIndex\nfrom pandera.api.pandas.model_config import BaseConfig\nfrom pandera.errors import SchemaInitError\nfrom pandera.typing import AnnotationInfo, INDEX_TYPES, SERIES_TYPES\n\n\nSchemaIndex = Union[Index, MultiIndex]\n\n\nclass DataFrameModel(_DataFrameModel[pd.DataFrame, DataFrameSchema]):\n \"\"\"Model of a pandas :class:`~pandera.api.pandas.container.DataFrameSchema`.\n\n *new in 0.5.0*\n\n .. important::\n\n This class is the new name for ``SchemaModel``, which will be deprecated\n in pandera version ``0.20.0``.\n\n See the :ref:`User Guide <dataframe-models>` for more.\n \"\"\"\n\n Config: Type[BaseConfig] = BaseConfig\n\n @classmethod\n def build_schema_(cls, **kwargs) -> DataFrameSchema:\n multiindex_kwargs = {\n name[len(\"multiindex_\") :]: value\n for name, value in vars(cls.__config__).items()\n if name.startswith(\"multiindex_\")\n }\n columns, index = cls._build_columns_index(\n cls.__fields__, cls.__checks__, **multiindex_kwargs\n )\n return DataFrameSchema(\n columns,\n index=index,\n checks=cls.__root_checks__,\n **kwargs,\n )\n\n @classmethod\n def _build_columns_index( # pylint:disable=too-many-locals\n cls,\n fields: Dict[str, Tuple[AnnotationInfo, FieldInfo]],\n checks: Dict[str, List[Check]],\n **multiindex_kwargs: Any,\n ) -> Tuple[Dict[str, Column], Optional[Union[Index, MultiIndex]],]:\n index_count = sum(\n annotation.origin in INDEX_TYPES\n for annotation, _ in fields.values()\n )\n\n columns: Dict[str, Column] = {}\n indices: List[Index] = []\n for field_name, (annotation, field) in fields.items():\n field_checks = checks.get(field_name, [])\n field_name = field.name\n check_name = getattr(field, \"check_name\", None)\n\n if annotation.metadata:\n if field.dtype_kwargs:\n raise TypeError(\n \"Cannot specify redundant 'dtype_kwargs' \"\n + f\"for {annotation.raw_annotation}.\"\n + \"\\n Usage Tip: Drop 'typing.Annotated'.\"\n )\n dtype_kwargs = get_dtype_kwargs(annotation)\n dtype = annotation.arg(**dtype_kwargs) # type: ignore\n elif annotation.default_dtype:\n dtype = annotation.default_dtype\n else:\n dtype = annotation.arg\n\n dtype = None if dtype is Any else dtype\n\n if (\n annotation.is_annotated_type\n or annotation.origin is None\n or annotation.origin in SERIES_TYPES\n or annotation.raw_annotation in SERIES_TYPES\n ):\n if check_name is False:\n raise SchemaInitError(\n f\"'check_name' is not supported for {field_name}.\"\n )\n\n column_kwargs = (\n field.column_properties(\n dtype,\n required=not annotation.optional,\n checks=field_checks,\n name=field_name,\n )\n if field\n else {}\n )\n columns[field_name] = Column(**column_kwargs)\n\n elif (\n annotation.origin in INDEX_TYPES\n or annotation.raw_annotation in INDEX_TYPES\n ):\n if annotation.optional:\n raise SchemaInitError(\n f\"Index '{field_name}' cannot be Optional.\"\n )\n\n if check_name is False or (\n # default single index\n check_name is None\n and index_count == 1\n ):\n field_name = None # type:ignore\n\n index_kwargs = (\n field.index_properties(\n dtype,\n checks=field_checks,\n name=field_name,\n )\n if field\n else {}\n )\n index = Index(**index_kwargs)\n indices.append(index)\n else:\n raise SchemaInitError(\n f\"Invalid annotation '{field_name}: \"\n f\"{annotation.raw_annotation}'\"\n )\n\n return columns, _build_schema_index(indices, **multiindex_kwargs)\n\n @classmethod\n def to_json_schema(cls):\n \"\"\"Serialize schema metadata into json-schema format.\n\n :param dataframe_schema: schema to write to json-schema format.\n\n .. note::\n\n This function is currently does not fully specify a pandera schema,\n and is primarily used internally to render OpenAPI docs via the\n FastAPI integration.\n \"\"\"\n schema = cls.to_schema()\n empty = pd.DataFrame(columns=schema.columns.keys()).astype(\n {k: v.type for k, v in schema.dtypes.items()}\n )\n table_schema = pd.io.json.build_table_schema(empty)\n\n def _field_json_schema(field):\n return {\n \"type\": \"array\",\n \"items\": {\"type\": field[\"type\"]},\n }\n\n return {\n \"title\": schema.name or \"pandera.DataFrameSchema\",\n \"type\": \"object\",\n \"properties\": {\n field[\"name\"]: _field_json_schema(field)\n for field in table_schema[\"fields\"]\n },\n }\n\n\nSchemaModel = DataFrameModel\n\"\"\"\nAlias for DataFrameModel.\n\n.. warning::\n\n This subclass is necessary for backwards compatibility, and will be\n deprecated in pandera version ``0.20.0`` in favor of\n :py:class:`~pandera.api.pandas.model.DataFrameModel`\n\"\"\"\n\n\ndef _build_schema_index(\n indices: List[Index], **multiindex_kwargs: Any\n) -> Optional[SchemaIndex]:\n index: Optional[SchemaIndex] = None\n if indices:\n if len(indices) == 1:\n index = indices[0]\n else:\n index = MultiIndex(indices, **multiindex_kwargs)\n return index\n", "path": "pandera/api/pandas/model.py"}]}
| 2,681 | 341 |
gh_patches_debug_5341
|
rasdani/github-patches
|
git_diff
|
statsmodels__statsmodels-6290
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
is sm.open_help ever defined?
Near the end of `statsmodels.api`:
```
chmpath = os.path.join(os.path.dirname(__file__), 'statsmodelsdoc.chm')
if os.path.exists(chmpath):
def open_help(chmpath=chmpath):
from subprocess import Popen
p = Popen(chmpath, shell=True)
```
I'm not familiar with "statsmodelsdoc.chm". Under what conditions does that exist?
</issue>
<code>
[start of statsmodels/api.py]
1 # -*- coding: utf-8 -*-
2 # flake8: noqa
3 import os
4
5 from . import iolib
6 from . import datasets
7 from . import tools
8 from .tools.tools import add_constant, categorical
9 from . import regression
10 from .regression.linear_model import OLS, GLS, WLS, GLSAR
11 from .regression.recursive_ls import RecursiveLS
12 from .regression.quantile_regression import QuantReg
13 from .regression.mixed_linear_model import MixedLM
14 from .genmod import api as genmod
15 from .genmod.api import (GLM, GEE, OrdinalGEE, NominalGEE, families,
16 cov_struct,
17 BinomialBayesMixedGLM, PoissonBayesMixedGLM)
18 from . import robust
19 from .robust.robust_linear_model import RLM
20 from .discrete.discrete_model import (Poisson, Logit, Probit,
21 MNLogit, NegativeBinomial,
22 GeneralizedPoisson,
23 NegativeBinomialP)
24 from .discrete.count_model import (ZeroInflatedPoisson,
25 ZeroInflatedGeneralizedPoisson,
26 ZeroInflatedNegativeBinomialP)
27 from .tsa import api as tsa
28 from .duration.survfunc import SurvfuncRight
29 from .duration.hazard_regression import PHReg
30 from .imputation.mice import MICE, MICEData
31 from .imputation.bayes_mi import BayesGaussMI, MI
32 from .nonparametric import api as nonparametric
33 from . import distributions
34 from .__init__ import test
35
36 from .gam.generalized_additive_model import GLMGam
37 from .gam import api as gam
38 from .graphics.gofplots import qqplot, qqplot_2samples, qqline, ProbPlot
39 from .graphics import api as graphics
40 from .stats import api as stats
41 from .emplike import api as emplike
42 from .duration import api as duration
43 from .multivariate.pca import PCA
44 from .multivariate.manova import MANOVA
45 from .multivariate.factor import Factor
46 from .multivariate import api as multivariate
47
48 from .formula import api as formula
49
50 from .iolib.smpickle import load_pickle
51
52 from .tools.print_version import show_versions
53 from .tools.web import webdoc
54
55 load = load_pickle
56
57 chmpath = os.path.join(os.path.dirname(__file__), 'statsmodelsdoc.chm')
58 if os.path.exists(chmpath):
59 # As of 0.10.0, this is not reached. See GH#5134
60
61 def open_help(chmpath=chmpath):
62 from subprocess import Popen
63
64 p = Popen(chmpath, shell=True)
65
66 del os
67 del chmpath
68
69 from ._version import get_versions
70 __version__ = get_versions()['version']
71 del get_versions
72
[end of statsmodels/api.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/statsmodels/api.py b/statsmodels/api.py
--- a/statsmodels/api.py
+++ b/statsmodels/api.py
@@ -54,18 +54,6 @@
load = load_pickle
-chmpath = os.path.join(os.path.dirname(__file__), 'statsmodelsdoc.chm')
-if os.path.exists(chmpath):
- # As of 0.10.0, this is not reached. See GH#5134
-
- def open_help(chmpath=chmpath):
- from subprocess import Popen
-
- p = Popen(chmpath, shell=True)
-
-del os
-del chmpath
-
from ._version import get_versions
__version__ = get_versions()['version']
del get_versions
|
{"golden_diff": "diff --git a/statsmodels/api.py b/statsmodels/api.py\n--- a/statsmodels/api.py\n+++ b/statsmodels/api.py\n@@ -54,18 +54,6 @@\n \n load = load_pickle\n \n-chmpath = os.path.join(os.path.dirname(__file__), 'statsmodelsdoc.chm')\n-if os.path.exists(chmpath):\n- # As of 0.10.0, this is not reached. See GH#5134\n-\n- def open_help(chmpath=chmpath):\n- from subprocess import Popen\n-\n- p = Popen(chmpath, shell=True)\n-\n-del os\n-del chmpath\n-\n from ._version import get_versions\n __version__ = get_versions()['version']\n del get_versions\n", "issue": "is sm.open_help ever defined?\nNear the end of `statsmodels.api`:\r\n\r\n```\r\nchmpath = os.path.join(os.path.dirname(__file__), 'statsmodelsdoc.chm')\r\nif os.path.exists(chmpath):\r\n def open_help(chmpath=chmpath):\r\n from subprocess import Popen\r\n\r\n p = Popen(chmpath, shell=True)\r\n```\r\n\r\nI'm not familiar with \"statsmodelsdoc.chm\". Under what conditions does that exist?\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n# flake8: noqa\nimport os\n\nfrom . import iolib\nfrom . import datasets\nfrom . import tools\nfrom .tools.tools import add_constant, categorical\nfrom . import regression\nfrom .regression.linear_model import OLS, GLS, WLS, GLSAR\nfrom .regression.recursive_ls import RecursiveLS\nfrom .regression.quantile_regression import QuantReg\nfrom .regression.mixed_linear_model import MixedLM\nfrom .genmod import api as genmod\nfrom .genmod.api import (GLM, GEE, OrdinalGEE, NominalGEE, families,\n cov_struct,\n BinomialBayesMixedGLM, PoissonBayesMixedGLM)\nfrom . import robust\nfrom .robust.robust_linear_model import RLM\nfrom .discrete.discrete_model import (Poisson, Logit, Probit,\n MNLogit, NegativeBinomial,\n GeneralizedPoisson,\n NegativeBinomialP)\nfrom .discrete.count_model import (ZeroInflatedPoisson,\n ZeroInflatedGeneralizedPoisson,\n ZeroInflatedNegativeBinomialP)\nfrom .tsa import api as tsa\nfrom .duration.survfunc import SurvfuncRight\nfrom .duration.hazard_regression import PHReg\nfrom .imputation.mice import MICE, MICEData\nfrom .imputation.bayes_mi import BayesGaussMI, MI\nfrom .nonparametric import api as nonparametric\nfrom . import distributions\nfrom .__init__ import test\n\nfrom .gam.generalized_additive_model import GLMGam\nfrom .gam import api as gam\nfrom .graphics.gofplots import qqplot, qqplot_2samples, qqline, ProbPlot\nfrom .graphics import api as graphics\nfrom .stats import api as stats\nfrom .emplike import api as emplike\nfrom .duration import api as duration\nfrom .multivariate.pca import PCA\nfrom .multivariate.manova import MANOVA\nfrom .multivariate.factor import Factor\nfrom .multivariate import api as multivariate\n\nfrom .formula import api as formula\n\nfrom .iolib.smpickle import load_pickle\n\nfrom .tools.print_version import show_versions\nfrom .tools.web import webdoc\n\nload = load_pickle\n\nchmpath = os.path.join(os.path.dirname(__file__), 'statsmodelsdoc.chm')\nif os.path.exists(chmpath):\n # As of 0.10.0, this is not reached. See GH#5134\n\n def open_help(chmpath=chmpath):\n from subprocess import Popen\n\n p = Popen(chmpath, shell=True)\n\ndel os\ndel chmpath\n\nfrom ._version import get_versions\n__version__ = get_versions()['version']\ndel get_versions\n", "path": "statsmodels/api.py"}]}
| 1,391 | 168 |
gh_patches_debug_31738
|
rasdani/github-patches
|
git_diff
|
vllm-project__vllm-132
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Bug in LLaMA fast tokenizer
In my environment, using the LLaMA fast tokenizer raises an error about protobuf:
```
File "/opt/conda/envs/dev/lib/python3.9/site-packages/transformers/convert_slow_tokenizer.py", line 445, in __init__
from .utils import sentencepiece_model_pb2 as model_pb2
File "/opt/conda/envs/dev/lib/python3.9/site-packages/transformers/utils/sentencepiece_model_pb2.py", line 91, in <module>
_descriptor.EnumValueDescriptor(
File "/opt/conda/envs/dev/lib/python3.9/site-packages/google/protobuf/descriptor.py", line 796, in __new__
_message.Message._CheckCalledFromGeneratedFile()
TypeError: Descriptors cannot not be created directly.
If this call came from a _pb2.py file, your generated code is out of date and must be regenerated with protoc >= 3.19.0.
If you cannot immediately regenerate your protos, some other possible workarounds are:
1. Downgrade the protobuf package to 3.20.x or lower.
2. Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python (but this will use pure-Python parsing and will be much slower).
```
While downgrading the protobuf version removed the error, it slowed down the initialization time by ~8x.
* Initialization with fast tokenizer & protobuf==3.20.3
```
real 4m18.476s
user 3m52.706s
sys 0m27.644s
```
* Initialization with slow tokenizer
```
real 0m27.620s
user 0m8.011s
sys 0m19.237s
```
</issue>
<code>
[start of cacheflow/sampling_params.py]
1 """Sampling parameters for text generation."""
2 from typing import List, Optional, Union
3
4
5 class SamplingParams:
6 """Sampling parameters for text generation.
7
8 Overall, we follow the sampling parameters from the OpenAI text completion
9 API (https://platform.openai.com/docs/api-reference/completions/create).
10 In addition, we support beam search, which is not supported by OpenAI.
11
12 Args:
13 n: Number of output sequences to return for the given prompt.
14 best_of: Number of output sequences that are generated from the prompt.
15 From these `best_of` sequences, the top `n` sequences are returned.
16 `best_of` must be greater than or equal to `n`. This is treated as
17 the beam width when `use_beam_search` is True. By default, `best_of`
18 is set to `n`.
19 presence_penalty: Float that penalizes new tokens based on whether they
20 appear in the generated text so far. Values > 0 encourage the model
21 to use new tokens, while values < 0 encourage the model to repeat
22 tokens.
23 frequency_penalty: Float that penalizes new tokens based on their
24 frequency in the generated text so far. Values > 0 encourage the
25 model to use new tokens, while values < 0 encourage the model to
26 repeat tokens.
27 temperature: Float that controls the randomness of the sampling. Lower
28 values make the model more deterministic, while higher values make
29 the model more random. Zero means greedy sampling.
30 top_p: Float that controls the cumulative probability of the top tokens
31 to consider. Must be in (0, 1]. Set to 1 to consider all tokens.
32 top_k: Integer that controls the number of top tokens to consider. Set
33 to -1 to consider all tokens.
34 use_beam_search: Whether to use beam search instead of sampling.
35 stop: List of strings that stop the generation when they are generated.
36 The returned output will not contain the stop strings.
37 ignore_eos: Whether to ignore the EOS token and continue generating
38 tokens after the EOS token is generated.
39 max_tokens: Maximum number of tokens to generate per output sequence.
40 logprobs: Number of log probabilities to return per output token.
41 """
42
43 def __init__(
44 self,
45 n: int = 1,
46 best_of: Optional[int] = None,
47 presence_penalty: float = 0.0,
48 frequency_penalty: float = 0.0,
49 temperature: float = 1.0,
50 top_p: float = 1.0,
51 top_k: int = -1,
52 use_beam_search: bool = False,
53 stop: Union[str, List[str]] = [],
54 ignore_eos: bool = False,
55 max_tokens: int = 16,
56 logprobs: Optional[int] = None,
57 ) -> None:
58 self.n = n
59 self.best_of = best_of if best_of is not None else n
60 self.presence_penalty = presence_penalty
61 self.frequency_penalty = frequency_penalty
62 self.temperature = temperature
63 self.top_p = top_p
64 self.top_k = top_k
65 self.use_beam_search = use_beam_search
66 self.stop = [stop] if isinstance(stop, str) else list(stop)
67 self.ignore_eos = ignore_eos
68 self.max_tokens = max_tokens
69 self.logprobs = logprobs
70
71 self._verify_args()
72 if self.use_beam_search:
73 self._verity_beam_search()
74 elif self.temperature == 0.0:
75 # Zero temperature means greedy sampling.
76 self._verify_greedy_sampling()
77
78 def _verify_args(self) -> None:
79 if self.n < 1:
80 raise ValueError(f"n must be at least 1, got {self.n}.")
81 if self.best_of < self.n:
82 raise ValueError(f"best_of must be greater than or equal to n, "
83 f"got n={self.n} and best_of={self.best_of}.")
84 if not -2.0 <= self.presence_penalty <= 2.0:
85 raise ValueError("presence_penalty must be in [-2, 2], got "
86 f"{self.presence_penalty}.")
87 if not -2.0 <= self.frequency_penalty <= 2.0:
88 raise ValueError("frequency_penalty must be in [-2, 2], got "
89 f"{self.frequency_penalty}.")
90 if self.temperature < 0.0:
91 raise ValueError(
92 f"temperature must be non-negative, got {self.temperature}.")
93 if not 0.0 < self.top_p <= 1.0:
94 raise ValueError(f"top_p must be in (0, 1], got {self.top_p}.")
95 if self.top_k < -1 or self.top_k == 0:
96 raise ValueError(f"top_k must be -1 (disable), or at least 1, "
97 f"got {self.top_k}.")
98 if self.max_tokens < 1:
99 raise ValueError(
100 f"max_tokens must be at least 1, got {self.max_tokens}.")
101 if self.logprobs is not None and self.logprobs < 0:
102 raise ValueError(
103 f"logprobs must be non-negative, got {self.logprobs}.")
104
105 def _verity_beam_search(self) -> None:
106 if self.best_of == 1:
107 raise ValueError("best_of must be greater than 1 when using beam "
108 f"search. Got {self.best_of}.")
109 if self.temperature > 0.0:
110 raise ValueError("temperature must be 0 when using beam search.")
111 if self.top_p < 1.0:
112 raise ValueError("top_p must be 1 when using beam search.")
113 if self.top_k != -1:
114 raise ValueError("top_k must be -1 when using beam search.")
115
116 def _verify_greedy_sampling(self) -> None:
117 if self.best_of > 1:
118 raise ValueError("best_of must be 1 when using greedy sampling."
119 f"Got {self.best_of}.")
120 if self.top_p < 1.0:
121 raise ValueError("top_p must be 1 when using greedy sampling.")
122 if self.top_k != -1:
123 raise ValueError("top_k must be -1 when using greedy sampling.")
124
125 def __repr__(self) -> str:
126 return (f"SamplingParams(n={self.n}, "
127 f"best_of={self.best_of}, "
128 f"presence_penalty={self.presence_penalty}, "
129 f"frequency_penalty={self.frequency_penalty}, "
130 f"temperature={self.temperature}, "
131 f"top_p={self.top_p}, "
132 f"top_k={self.top_k},"
133 f"use_beam_search={self.use_beam_search}, "
134 f"stop={self.stop}, "
135 f"ignore_eos={self.ignore_eos}, "
136 f"max_tokens={self.max_tokens}, "
137 f"logprobs={self.logprobs})")
138
[end of cacheflow/sampling_params.py]
[start of cacheflow/server/tokenizer_utils.py]
1 from typing import List, Tuple, Union
2
3 from transformers import (AutoConfig, AutoTokenizer, PreTrainedTokenizer,
4 PreTrainedTokenizerFast)
5
6 from cacheflow.logger import init_logger
7
8 logger = init_logger(__name__)
9
10 _MODEL_TYPES_WITH_SLOW_TOKENIZER = [
11 # LLaMA fast tokenizer has a bug related to protobuf.
12 # See https://github.com/WoosukKwon/cacheflow/issues/80#issue-1698550554
13 "llama",
14 ]
15
16
17 def get_tokenizer(
18 model_name: str,
19 *args,
20 **kwargs,
21 ) -> Union[PreTrainedTokenizer, PreTrainedTokenizerFast]:
22 config = AutoConfig.from_pretrained(model_name)
23 if config.model_type in _MODEL_TYPES_WITH_SLOW_TOKENIZER:
24 if getattr(kwargs, "use_fast", False) == True:
25 raise ValueError(
26 f"Cannot use the fast tokenizer for {config.model_type} due to "
27 "bugs in the fast tokenizer.")
28 logger.info(
29 f"Using the slow tokenizer for {config.model_type} due to bugs in "
30 "the fast tokenizer. This could potentially lead to performance "
31 "degradation.")
32 kwargs["use_fast"] = False
33 return AutoTokenizer.from_pretrained(model_name, *args, **kwargs)
34
35
36 def detokenize_incrementally(
37 tokenizer: Union[PreTrainedTokenizer, PreTrainedTokenizerFast],
38 prev_output_tokens: List[str],
39 new_token_id: int,
40 skip_special_tokens: bool,
41 ) -> Tuple[str, str]:
42 """Detokenizes the new token in conjuction with the previous output tokens.
43
44 NOTE: This function does not update prev_output_tokens.
45
46 Returns:
47 new_token: The new token as a string.
48 output_text: The new output text as a string.
49 """
50 new_token = tokenizer.convert_ids_to_tokens(
51 new_token_id, skip_special_tokens=skip_special_tokens)
52 output_tokens = prev_output_tokens + [new_token]
53
54 # Convert the tokens to a string.
55 # Optimization: If the tokenizer does not have `added_tokens_encoder`,
56 # then we can directly use `convert_tokens_to_string`.
57 if not getattr(tokenizer, "added_tokens_encoder", {}):
58 output_text = tokenizer.convert_tokens_to_string(output_tokens)
59 return new_token, output_text
60
61 # Adapted from https://github.com/huggingface/transformers/blob/v4.28.0/src/transformers/tokenization_utils.py#L921
62 # NOTE(woosuk): The following code is slow because it runs a for loop over
63 # the output_tokens. In Python, running a for loop over a list can be slow
64 # even when the loop body is very simple.
65 sub_texts = []
66 current_sub_text = []
67 for token in output_tokens:
68 if skip_special_tokens and token in tokenizer.all_special_ids:
69 continue
70 if token in tokenizer.added_tokens_encoder:
71 if current_sub_text:
72 sub_text = tokenizer.convert_tokens_to_string(current_sub_text)
73 sub_texts.append(sub_text)
74 current_sub_text = []
75 sub_texts.append(token)
76 else:
77 current_sub_text.append(token)
78 if current_sub_text:
79 sub_text = tokenizer.convert_tokens_to_string(current_sub_text)
80 sub_texts.append(sub_text)
81 output_text = " ".join(sub_texts)
82 return new_token, output_text
83
[end of cacheflow/server/tokenizer_utils.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/cacheflow/sampling_params.py b/cacheflow/sampling_params.py
--- a/cacheflow/sampling_params.py
+++ b/cacheflow/sampling_params.py
@@ -129,7 +129,7 @@
f"frequency_penalty={self.frequency_penalty}, "
f"temperature={self.temperature}, "
f"top_p={self.top_p}, "
- f"top_k={self.top_k},"
+ f"top_k={self.top_k}, "
f"use_beam_search={self.use_beam_search}, "
f"stop={self.stop}, "
f"ignore_eos={self.ignore_eos}, "
diff --git a/cacheflow/server/tokenizer_utils.py b/cacheflow/server/tokenizer_utils.py
--- a/cacheflow/server/tokenizer_utils.py
+++ b/cacheflow/server/tokenizer_utils.py
@@ -7,11 +7,7 @@
logger = init_logger(__name__)
-_MODEL_TYPES_WITH_SLOW_TOKENIZER = [
- # LLaMA fast tokenizer has a bug related to protobuf.
- # See https://github.com/WoosukKwon/cacheflow/issues/80#issue-1698550554
- "llama",
-]
+_MODEL_TYPES_WITH_SLOW_TOKENIZER = []
def get_tokenizer(
@@ -20,7 +16,15 @@
**kwargs,
) -> Union[PreTrainedTokenizer, PreTrainedTokenizerFast]:
config = AutoConfig.from_pretrained(model_name)
- if config.model_type in _MODEL_TYPES_WITH_SLOW_TOKENIZER:
+ if config.model_type == "llama" and getattr(kwargs, "use_fast", True):
+ # LLaMA fast tokenizer causes protobuf errors in some environments.
+ # However, we found that the below LLaMA fast tokenizer works well in
+ # most environments.
+ model_name = "hf-internal-testing/llama-tokenizer"
+ logger.info(
+ f"Using the LLaMA fast tokenizer in '{model_name}' to avoid "
+ "potential protobuf errors.")
+ elif config.model_type in _MODEL_TYPES_WITH_SLOW_TOKENIZER:
if getattr(kwargs, "use_fast", False) == True:
raise ValueError(
f"Cannot use the fast tokenizer for {config.model_type} due to "
|
{"golden_diff": "diff --git a/cacheflow/sampling_params.py b/cacheflow/sampling_params.py\n--- a/cacheflow/sampling_params.py\n+++ b/cacheflow/sampling_params.py\n@@ -129,7 +129,7 @@\n f\"frequency_penalty={self.frequency_penalty}, \"\n f\"temperature={self.temperature}, \"\n f\"top_p={self.top_p}, \"\n- f\"top_k={self.top_k},\"\n+ f\"top_k={self.top_k}, \"\n f\"use_beam_search={self.use_beam_search}, \"\n f\"stop={self.stop}, \"\n f\"ignore_eos={self.ignore_eos}, \"\ndiff --git a/cacheflow/server/tokenizer_utils.py b/cacheflow/server/tokenizer_utils.py\n--- a/cacheflow/server/tokenizer_utils.py\n+++ b/cacheflow/server/tokenizer_utils.py\n@@ -7,11 +7,7 @@\n \n logger = init_logger(__name__)\n \n-_MODEL_TYPES_WITH_SLOW_TOKENIZER = [\n- # LLaMA fast tokenizer has a bug related to protobuf.\n- # See https://github.com/WoosukKwon/cacheflow/issues/80#issue-1698550554\n- \"llama\",\n-]\n+_MODEL_TYPES_WITH_SLOW_TOKENIZER = []\n \n \n def get_tokenizer(\n@@ -20,7 +16,15 @@\n **kwargs,\n ) -> Union[PreTrainedTokenizer, PreTrainedTokenizerFast]:\n config = AutoConfig.from_pretrained(model_name)\n- if config.model_type in _MODEL_TYPES_WITH_SLOW_TOKENIZER:\n+ if config.model_type == \"llama\" and getattr(kwargs, \"use_fast\", True):\n+ # LLaMA fast tokenizer causes protobuf errors in some environments.\n+ # However, we found that the below LLaMA fast tokenizer works well in\n+ # most environments.\n+ model_name = \"hf-internal-testing/llama-tokenizer\"\n+ logger.info(\n+ f\"Using the LLaMA fast tokenizer in '{model_name}' to avoid \"\n+ \"potential protobuf errors.\")\n+ elif config.model_type in _MODEL_TYPES_WITH_SLOW_TOKENIZER:\n if getattr(kwargs, \"use_fast\", False) == True:\n raise ValueError(\n f\"Cannot use the fast tokenizer for {config.model_type} due to \"\n", "issue": "Bug in LLaMA fast tokenizer\nIn my environment, using the LLaMA fast tokenizer raises an error about protobuf:\r\n```\r\n File \"/opt/conda/envs/dev/lib/python3.9/site-packages/transformers/convert_slow_tokenizer.py\", line 445, in __init__\r\n from .utils import sentencepiece_model_pb2 as model_pb2\r\n File \"/opt/conda/envs/dev/lib/python3.9/site-packages/transformers/utils/sentencepiece_model_pb2.py\", line 91, in <module>\r\n _descriptor.EnumValueDescriptor(\r\n File \"/opt/conda/envs/dev/lib/python3.9/site-packages/google/protobuf/descriptor.py\", line 796, in __new__\r\n _message.Message._CheckCalledFromGeneratedFile()\r\nTypeError: Descriptors cannot not be created directly.\r\nIf this call came from a _pb2.py file, your generated code is out of date and must be regenerated with protoc >= 3.19.0.\r\nIf you cannot immediately regenerate your protos, some other possible workarounds are:\r\n 1. Downgrade the protobuf package to 3.20.x or lower.\r\n 2. Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python (but this will use pure-Python parsing and will be much slower).\r\n```\r\n\r\nWhile downgrading the protobuf version removed the error, it slowed down the initialization time by ~8x.\r\n* Initialization with fast tokenizer & protobuf==3.20.3 \r\n```\r\nreal 4m18.476s\r\nuser 3m52.706s\r\nsys 0m27.644s\r\n```\r\n* Initialization with slow tokenizer\r\n```\r\nreal 0m27.620s\r\nuser 0m8.011s\r\nsys 0m19.237s\r\n```\r\n\n", "before_files": [{"content": "\"\"\"Sampling parameters for text generation.\"\"\"\nfrom typing import List, Optional, Union\n\n\nclass SamplingParams:\n \"\"\"Sampling parameters for text generation.\n\n Overall, we follow the sampling parameters from the OpenAI text completion\n API (https://platform.openai.com/docs/api-reference/completions/create).\n In addition, we support beam search, which is not supported by OpenAI.\n\n Args:\n n: Number of output sequences to return for the given prompt.\n best_of: Number of output sequences that are generated from the prompt.\n From these `best_of` sequences, the top `n` sequences are returned.\n `best_of` must be greater than or equal to `n`. This is treated as\n the beam width when `use_beam_search` is True. By default, `best_of`\n is set to `n`.\n presence_penalty: Float that penalizes new tokens based on whether they\n appear in the generated text so far. Values > 0 encourage the model\n to use new tokens, while values < 0 encourage the model to repeat\n tokens.\n frequency_penalty: Float that penalizes new tokens based on their\n frequency in the generated text so far. Values > 0 encourage the\n model to use new tokens, while values < 0 encourage the model to\n repeat tokens.\n temperature: Float that controls the randomness of the sampling. Lower\n values make the model more deterministic, while higher values make\n the model more random. Zero means greedy sampling.\n top_p: Float that controls the cumulative probability of the top tokens\n to consider. Must be in (0, 1]. Set to 1 to consider all tokens.\n top_k: Integer that controls the number of top tokens to consider. Set\n to -1 to consider all tokens.\n use_beam_search: Whether to use beam search instead of sampling.\n stop: List of strings that stop the generation when they are generated.\n The returned output will not contain the stop strings.\n ignore_eos: Whether to ignore the EOS token and continue generating\n tokens after the EOS token is generated.\n max_tokens: Maximum number of tokens to generate per output sequence.\n logprobs: Number of log probabilities to return per output token.\n \"\"\"\n\n def __init__(\n self,\n n: int = 1,\n best_of: Optional[int] = None,\n presence_penalty: float = 0.0,\n frequency_penalty: float = 0.0,\n temperature: float = 1.0,\n top_p: float = 1.0,\n top_k: int = -1,\n use_beam_search: bool = False,\n stop: Union[str, List[str]] = [],\n ignore_eos: bool = False,\n max_tokens: int = 16,\n logprobs: Optional[int] = None,\n ) -> None:\n self.n = n\n self.best_of = best_of if best_of is not None else n\n self.presence_penalty = presence_penalty\n self.frequency_penalty = frequency_penalty\n self.temperature = temperature\n self.top_p = top_p\n self.top_k = top_k\n self.use_beam_search = use_beam_search\n self.stop = [stop] if isinstance(stop, str) else list(stop)\n self.ignore_eos = ignore_eos\n self.max_tokens = max_tokens\n self.logprobs = logprobs\n\n self._verify_args()\n if self.use_beam_search:\n self._verity_beam_search()\n elif self.temperature == 0.0:\n # Zero temperature means greedy sampling.\n self._verify_greedy_sampling()\n\n def _verify_args(self) -> None:\n if self.n < 1:\n raise ValueError(f\"n must be at least 1, got {self.n}.\")\n if self.best_of < self.n:\n raise ValueError(f\"best_of must be greater than or equal to n, \"\n f\"got n={self.n} and best_of={self.best_of}.\")\n if not -2.0 <= self.presence_penalty <= 2.0:\n raise ValueError(\"presence_penalty must be in [-2, 2], got \"\n f\"{self.presence_penalty}.\")\n if not -2.0 <= self.frequency_penalty <= 2.0:\n raise ValueError(\"frequency_penalty must be in [-2, 2], got \"\n f\"{self.frequency_penalty}.\")\n if self.temperature < 0.0:\n raise ValueError(\n f\"temperature must be non-negative, got {self.temperature}.\")\n if not 0.0 < self.top_p <= 1.0:\n raise ValueError(f\"top_p must be in (0, 1], got {self.top_p}.\")\n if self.top_k < -1 or self.top_k == 0:\n raise ValueError(f\"top_k must be -1 (disable), or at least 1, \"\n f\"got {self.top_k}.\")\n if self.max_tokens < 1:\n raise ValueError(\n f\"max_tokens must be at least 1, got {self.max_tokens}.\")\n if self.logprobs is not None and self.logprobs < 0:\n raise ValueError(\n f\"logprobs must be non-negative, got {self.logprobs}.\")\n\n def _verity_beam_search(self) -> None:\n if self.best_of == 1:\n raise ValueError(\"best_of must be greater than 1 when using beam \"\n f\"search. Got {self.best_of}.\")\n if self.temperature > 0.0:\n raise ValueError(\"temperature must be 0 when using beam search.\")\n if self.top_p < 1.0:\n raise ValueError(\"top_p must be 1 when using beam search.\")\n if self.top_k != -1:\n raise ValueError(\"top_k must be -1 when using beam search.\")\n\n def _verify_greedy_sampling(self) -> None:\n if self.best_of > 1:\n raise ValueError(\"best_of must be 1 when using greedy sampling.\"\n f\"Got {self.best_of}.\")\n if self.top_p < 1.0:\n raise ValueError(\"top_p must be 1 when using greedy sampling.\")\n if self.top_k != -1:\n raise ValueError(\"top_k must be -1 when using greedy sampling.\")\n\n def __repr__(self) -> str:\n return (f\"SamplingParams(n={self.n}, \"\n f\"best_of={self.best_of}, \"\n f\"presence_penalty={self.presence_penalty}, \"\n f\"frequency_penalty={self.frequency_penalty}, \"\n f\"temperature={self.temperature}, \"\n f\"top_p={self.top_p}, \"\n f\"top_k={self.top_k},\"\n f\"use_beam_search={self.use_beam_search}, \"\n f\"stop={self.stop}, \"\n f\"ignore_eos={self.ignore_eos}, \"\n f\"max_tokens={self.max_tokens}, \"\n f\"logprobs={self.logprobs})\")\n", "path": "cacheflow/sampling_params.py"}, {"content": "from typing import List, Tuple, Union\n\nfrom transformers import (AutoConfig, AutoTokenizer, PreTrainedTokenizer,\n PreTrainedTokenizerFast)\n\nfrom cacheflow.logger import init_logger\n\nlogger = init_logger(__name__)\n\n_MODEL_TYPES_WITH_SLOW_TOKENIZER = [\n # LLaMA fast tokenizer has a bug related to protobuf.\n # See https://github.com/WoosukKwon/cacheflow/issues/80#issue-1698550554\n \"llama\",\n]\n\n\ndef get_tokenizer(\n model_name: str,\n *args,\n **kwargs,\n) -> Union[PreTrainedTokenizer, PreTrainedTokenizerFast]:\n config = AutoConfig.from_pretrained(model_name)\n if config.model_type in _MODEL_TYPES_WITH_SLOW_TOKENIZER:\n if getattr(kwargs, \"use_fast\", False) == True:\n raise ValueError(\n f\"Cannot use the fast tokenizer for {config.model_type} due to \"\n \"bugs in the fast tokenizer.\")\n logger.info(\n f\"Using the slow tokenizer for {config.model_type} due to bugs in \"\n \"the fast tokenizer. This could potentially lead to performance \"\n \"degradation.\")\n kwargs[\"use_fast\"] = False\n return AutoTokenizer.from_pretrained(model_name, *args, **kwargs)\n\n\ndef detokenize_incrementally(\n tokenizer: Union[PreTrainedTokenizer, PreTrainedTokenizerFast],\n prev_output_tokens: List[str],\n new_token_id: int,\n skip_special_tokens: bool,\n) -> Tuple[str, str]:\n \"\"\"Detokenizes the new token in conjuction with the previous output tokens.\n\n NOTE: This function does not update prev_output_tokens.\n\n Returns:\n new_token: The new token as a string.\n output_text: The new output text as a string.\n \"\"\"\n new_token = tokenizer.convert_ids_to_tokens(\n new_token_id, skip_special_tokens=skip_special_tokens)\n output_tokens = prev_output_tokens + [new_token]\n\n # Convert the tokens to a string.\n # Optimization: If the tokenizer does not have `added_tokens_encoder`,\n # then we can directly use `convert_tokens_to_string`.\n if not getattr(tokenizer, \"added_tokens_encoder\", {}):\n output_text = tokenizer.convert_tokens_to_string(output_tokens)\n return new_token, output_text\n\n # Adapted from https://github.com/huggingface/transformers/blob/v4.28.0/src/transformers/tokenization_utils.py#L921\n # NOTE(woosuk): The following code is slow because it runs a for loop over\n # the output_tokens. In Python, running a for loop over a list can be slow\n # even when the loop body is very simple.\n sub_texts = []\n current_sub_text = []\n for token in output_tokens:\n if skip_special_tokens and token in tokenizer.all_special_ids:\n continue\n if token in tokenizer.added_tokens_encoder:\n if current_sub_text:\n sub_text = tokenizer.convert_tokens_to_string(current_sub_text)\n sub_texts.append(sub_text)\n current_sub_text = []\n sub_texts.append(token)\n else:\n current_sub_text.append(token)\n if current_sub_text:\n sub_text = tokenizer.convert_tokens_to_string(current_sub_text)\n sub_texts.append(sub_text)\n output_text = \" \".join(sub_texts)\n return new_token, output_text\n", "path": "cacheflow/server/tokenizer_utils.py"}]}
| 3,661 | 518 |
gh_patches_debug_33676
|
rasdani/github-patches
|
git_diff
|
mdn__kuma-7801
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Let's CDN cache most site-search queries
I downloaded the 1,000 most frequent URLs when people do a site-search in `en-US`.
In en-US alone we have 7,586 searches per day. And that's based only on the top 1,000 search terms. Remember, this only counts people who have GA tracking not blocked.
And I estimate that roughly 59% of all our `/$locale/docs/` traffic is `en-US`. That means that **we get 13.5k site-searches per day**. And remember, this is just for the top 1,000 search terms. And since site-searches today is never cached by the CDN, that's how many times Kuma has to process 13.5k Elasticsearch queries per day (and equally all the Django code that wraps Elasticsearch into a request/(JSON)response). Perhaps roughly 20k site-searches per when you include all search terms and the people who don't let GA track.
Also, each request that goes into Django also triggers the rate limiter which means it has to use Redis too.
As of today, site-search triggers a full Django+React SSR render and this accounts for 18% of the most time-consuming work our EC2 has to do:
<img width="443" alt="Screen Shot 2021-02-25 at 4 41 05 PM" src="https://user-images.githubusercontent.com/26739/109223288-647b6c80-7788-11eb-911c-d44582735c5e.png">
That number will shrink by itself once Yari takes over the search and it's just a `/api/v1/search` XHR request.
I speculate that we can leverage the CDN to:
- **Make users get faster search results**
- **Reduce the stress on our Kubernetes cluster and be able to use a lot less EC2 power and save money and electricity**
Many searches are a single word (i.e. 0 spaces)
```
0 spaces: 91.3%
1 spaces: 8.5%
2 spaces: 0.2%
```
Most searches are short single words. A complete list of the [top 1,000 most common searches are here](https://gist.github.com/peterbe/7cc2c8fa1cc72e976b9ac0caa0852055)
If you analyze the length of the search terms you get:
```
0-10 85.1%
11-20 14.6%
21+ 0.3%
```
Since all traffic always goes through the CDN anyway, we can set a `Cache-Control` on these. Say, 24h. I don't think it's expected that a search for `splice` should get documents that have recently changed within the last day.
We could potentially make the setting of the `Cache-Control` only on short and simple searches without any advanced filtering (e.g `?locale=ja&locale=en-us&slug_prefix=Web/CSS`). That way our CDN won't have to store too many things that aren't worth caching.
</issue>
<code>
[start of kuma/api/v1/search/__init__.py]
1 from django import http
2 from django.conf import settings
3 from elasticsearch import exceptions
4 from elasticsearch_dsl import Q, query, Search
5 from redo import retrying
6
7 from kuma.api.v1.decorators import allow_CORS_GET
8
9 from .forms import SearchForm
10
11
12 class JsonResponse(http.JsonResponse):
13 """The only reason this exists is so that other Django views can call
14 views that return instances of this and then get to the data before it
15 gets JSON serialized.
16 This is something that rest_framework's JsonResponse supports.
17 Ultimately, the only view that cares is the (old) Kuma search view page
18 that calls the view function here in this file. Now it can do something like:
19
20 response = kuma.api.v1.search.search(request)
21 found = response.data
22
23 """
24
25 def __init__(self, data, *args, **kwargs):
26 self.data = data
27 super().__init__(data, *args, **kwargs)
28
29
30 def legacy(request, locale=None):
31 raise NotImplementedError("work harder")
32
33
34 @allow_CORS_GET
35 def search(request, locale=None):
36 initial = {"size": 10, "page": 1, "archive": SearchForm.ARCHIVE_CHOICES[0]}
37 if locale:
38 initial["locale"] = locale
39 form = SearchForm(request.GET, initial=initial)
40 if not form.is_valid():
41 return JsonResponse({"errors": form.errors.get_json_data()}, status=400)
42
43 locales = form.cleaned_data["locale"] or [settings.LANGUAGE_CODE]
44 assert isinstance(locales, list)
45
46 params = {
47 "locales": [x.lower() for x in locales],
48 "archive": form.cleaned_data["archive"],
49 "query": form.cleaned_data["q"],
50 "size": form.cleaned_data["size"],
51 "page": form.cleaned_data["page"],
52 "sort": form.cleaned_data["sort"],
53 # The `slug` is always stored, as a Keyword index, in lowercase.
54 "slug_prefixes": [x.lower() for x in form.cleaned_data["slug_prefix"]],
55 }
56
57 # By default, assume that we will try to make suggestions.
58 make_suggestions = True
59 if len(params["query"]) > 100 or max(len(x) for x in params["query"].split()) > 30:
60 # For example, if it's a really long query, or a specific word is just too
61 # long, you can get those tricky
62 # TransportError(500, 'search_phase_execution_exception', 'Term too complex:
63 # errors which are hard to prevent against.
64 make_suggestions = False
65
66 results = _find(
67 params,
68 make_suggestions=make_suggestions,
69 )
70 return JsonResponse(results)
71
72
73 def _find(params, total_only=False, make_suggestions=False, min_suggestion_score=0.8):
74 search_query = Search(
75 index=settings.SEARCH_INDEX_NAME,
76 )
77 if make_suggestions:
78 # XXX research if it it's better to use phrase suggesters and if
79 # that works
80 # https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters.html#phrase-suggester
81 search_query = search_query.suggest(
82 "title_suggestions", params["query"], term={"field": "title"}
83 )
84 search_query = search_query.suggest(
85 "body_suggestions", params["query"], term={"field": "body"}
86 )
87
88 sub_queries = []
89 sub_queries.append(Q("match", title={"query": params["query"], "boost": 2.0}))
90 sub_queries.append(Q("match", body={"query": params["query"], "boost": 1.0}))
91 if " " in params["query"]:
92 sub_queries.append(
93 Q("match_phrase", title={"query": params["query"], "boost": 10.0})
94 )
95 sub_queries.append(
96 Q("match_phrase", body={"query": params["query"], "boost": 5.0})
97 )
98
99 sub_query = query.Bool(should=sub_queries)
100
101 if params["locales"]:
102 search_query = search_query.filter("terms", locale=params["locales"])
103 if params["archive"] == "exclude":
104 search_query = search_query.filter("term", archived=False)
105 elif params["archive"] == "only":
106 search_query = search_query.filter("term", archived=True)
107
108 if params["slug_prefixes"]:
109 sub_queries = [Q("prefix", slug=x) for x in params["slug_prefixes"]]
110 search_query = search_query.query(query.Bool(should=sub_queries))
111
112 search_query = search_query.highlight_options(
113 pre_tags=["<mark>"],
114 post_tags=["</mark>"],
115 number_of_fragments=3,
116 fragment_size=120,
117 encoder="html",
118 )
119 search_query = search_query.highlight("title", "body")
120
121 if params["sort"] == "relevance":
122 search_query = search_query.sort("_score", "-popularity")
123 search_query = search_query.query(sub_query)
124 elif params["sort"] == "popularity":
125 search_query = search_query.sort("-popularity", "_score")
126 search_query = search_query.query(sub_query)
127 else:
128 popularity_factor = 10.0
129 boost_mode = "sum"
130 score_mode = "max"
131 search_query = search_query.query(
132 "function_score",
133 query=sub_query,
134 functions=[
135 query.SF(
136 "field_value_factor",
137 field="popularity",
138 factor=popularity_factor,
139 missing=0.0,
140 )
141 ],
142 boost_mode=boost_mode,
143 score_mode=score_mode,
144 )
145
146 search_query = search_query.source(excludes=["body"])
147
148 search_query = search_query[
149 params["size"] * (params["page"] - 1) : params["size"] * params["page"]
150 ]
151
152 retry_options = {
153 "retry_exceptions": (
154 # This is the standard operational exception.
155 exceptions.ConnectionError,
156 # This can happen if the search happened right as the index had
157 # just been deleted due to a fresh re-indexing happening in Yari.
158 exceptions.NotFoundError,
159 # This can happen when the index simply isn't ready yet.
160 exceptions.TransportError,
161 ),
162 # The default in redo is 60 seconds. Let's tone that down.
163 "sleeptime": settings.ES_RETRY_SLEEPTIME,
164 "attempts": settings.ES_RETRY_ATTEMPTS,
165 "jitter": settings.ES_RETRY_JITTER,
166 }
167 with retrying(search_query.execute, **retry_options) as retrying_function:
168 response = retrying_function()
169
170 if total_only:
171 return response.hits.total
172
173 metadata = {
174 "took_ms": response.took,
175 "total": {
176 # The `response.hits.total` is a `elasticsearch_dsl.utils.AttrDict`
177 # instance. Pluck only the exact data needed.
178 "value": response.hits.total.value,
179 "relation": response.hits.total.relation,
180 },
181 "size": params["size"],
182 "page": params["page"],
183 }
184 documents = []
185 for hit in response:
186 try:
187 body_highlight = list(hit.meta.highlight.body)
188 except AttributeError:
189 body_highlight = []
190 try:
191 title_highlight = list(hit.meta.highlight.title)
192 except AttributeError:
193 title_highlight = []
194
195 d = {
196 "mdn_url": hit.meta.id,
197 "score": hit.meta.score,
198 "title": hit.title,
199 "locale": hit.locale,
200 "slug": hit.slug,
201 "popularity": hit.popularity,
202 "archived": hit.archived,
203 "summary": hit.summary,
204 "highlight": {
205 "body": body_highlight,
206 "title": title_highlight,
207 },
208 }
209 documents.append(d)
210
211 try:
212 suggest = getattr(response, "suggest")
213 except AttributeError:
214 suggest = None
215
216 suggestions = []
217 if suggest:
218 suggestion_strings = _unpack_suggestions(
219 params["query"],
220 response.suggest,
221 ("body_suggestions", "title_suggestions"),
222 )
223
224 for score, string in suggestion_strings:
225 if score > min_suggestion_score or 1:
226 # Sure, this is different way to spell, but what will it yield
227 # if you actually search it?
228 total = _find(dict(params, query=string), total_only=True)
229 if total["value"] > 0:
230 suggestions.append(
231 {
232 "text": string,
233 "total": {
234 # This 'total' is an `AttrDict` instance.
235 "value": total.value,
236 "relation": total.relation,
237 },
238 }
239 )
240 # Since they're sorted by score, it's usually never useful
241 # to suggestion more than exactly 1 good suggestion.
242 break
243
244 return {
245 "documents": documents,
246 "metadata": metadata,
247 "suggestions": suggestions,
248 }
249
250
251 def _unpack_suggestions(query, suggest, keys):
252 alternatives = []
253 for key in keys:
254 for suggestion in getattr(suggest, key, []):
255 for option in suggestion.options:
256 alternatives.append(
257 (
258 option.score,
259 query[0 : suggestion.offset]
260 + option.text
261 + query[suggestion.offset + suggestion.length :],
262 )
263 )
264 alternatives.sort(reverse=True) # highest score first
265 return alternatives
266
[end of kuma/api/v1/search/__init__.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/kuma/api/v1/search/__init__.py b/kuma/api/v1/search/__init__.py
--- a/kuma/api/v1/search/__init__.py
+++ b/kuma/api/v1/search/__init__.py
@@ -1,5 +1,6 @@
from django import http
from django.conf import settings
+from django.utils.cache import patch_cache_control
from elasticsearch import exceptions
from elasticsearch_dsl import Q, query, Search
from redo import retrying
@@ -8,6 +9,12 @@
from .forms import SearchForm
+# This is the number of seconds to be put into the Cache-Control max-age header
+# if the search is successful.
+# We can increase the number as we feel more and more comfortable with how
+# the `/api/v1/search` works.
+SEARCH_CACHE_CONTROL_MAX_AGE = 60 * 60 * 12
+
class JsonResponse(http.JsonResponse):
"""The only reason this exists is so that other Django views can call
@@ -67,7 +74,25 @@
params,
make_suggestions=make_suggestions,
)
- return JsonResponse(results)
+ response = JsonResponse(results)
+
+ # The reason for caching is that most of the time, the searches people make
+ # are short and often stand a high chance of being reused by other users
+ # in the CDN.
+ # The worst that can happen is that we fill up the CDN with cached responses
+ # that end up being stored there and never reused by another user.
+ # We could consider only bothering with this based on looking at the parameters.
+ # For example, if someone made a search with "complex parameters" we could skip
+ # cache-control because it'll just be a waste to store it (CDN and client).
+ # The reason for not using a "shared" cache-control, i.e. `s-max-age` is
+ # because the cache-control seconds we intend to set are appropriate for both
+ # the client and the CDN. If the value set is 3600 seconds, that means that
+ # clients might potentially re-use their own browser cache if they trigger
+ # a repeated search. And it's an appropriate number for the CDN too.
+ # For more info about how our search patterns behave,
+ # see https://github.com/mdn/kuma/issues/7799
+ patch_cache_control(response, public=True, max_age=SEARCH_CACHE_CONTROL_MAX_AGE)
+ return response
def _find(params, total_only=False, make_suggestions=False, min_suggestion_score=0.8):
|
{"golden_diff": "diff --git a/kuma/api/v1/search/__init__.py b/kuma/api/v1/search/__init__.py\n--- a/kuma/api/v1/search/__init__.py\n+++ b/kuma/api/v1/search/__init__.py\n@@ -1,5 +1,6 @@\n from django import http\n from django.conf import settings\n+from django.utils.cache import patch_cache_control\n from elasticsearch import exceptions\n from elasticsearch_dsl import Q, query, Search\n from redo import retrying\n@@ -8,6 +9,12 @@\n \n from .forms import SearchForm\n \n+# This is the number of seconds to be put into the Cache-Control max-age header\n+# if the search is successful.\n+# We can increase the number as we feel more and more comfortable with how\n+# the `/api/v1/search` works.\n+SEARCH_CACHE_CONTROL_MAX_AGE = 60 * 60 * 12\n+\n \n class JsonResponse(http.JsonResponse):\n \"\"\"The only reason this exists is so that other Django views can call\n@@ -67,7 +74,25 @@\n params,\n make_suggestions=make_suggestions,\n )\n- return JsonResponse(results)\n+ response = JsonResponse(results)\n+\n+ # The reason for caching is that most of the time, the searches people make\n+ # are short and often stand a high chance of being reused by other users\n+ # in the CDN.\n+ # The worst that can happen is that we fill up the CDN with cached responses\n+ # that end up being stored there and never reused by another user.\n+ # We could consider only bothering with this based on looking at the parameters.\n+ # For example, if someone made a search with \"complex parameters\" we could skip\n+ # cache-control because it'll just be a waste to store it (CDN and client).\n+ # The reason for not using a \"shared\" cache-control, i.e. `s-max-age` is\n+ # because the cache-control seconds we intend to set are appropriate for both\n+ # the client and the CDN. If the value set is 3600 seconds, that means that\n+ # clients might potentially re-use their own browser cache if they trigger\n+ # a repeated search. And it's an appropriate number for the CDN too.\n+ # For more info about how our search patterns behave,\n+ # see https://github.com/mdn/kuma/issues/7799\n+ patch_cache_control(response, public=True, max_age=SEARCH_CACHE_CONTROL_MAX_AGE)\n+ return response\n \n \n def _find(params, total_only=False, make_suggestions=False, min_suggestion_score=0.8):\n", "issue": "Let's CDN cache most site-search queries\nI downloaded the 1,000 most frequent URLs when people do a site-search in `en-US`. \r\nIn en-US alone we have 7,586 searches per day. And that's based only on the top 1,000 search terms. Remember, this only counts people who have GA tracking not blocked. \r\n\r\nAnd I estimate that roughly 59% of all our `/$locale/docs/` traffic is `en-US`. That means that **we get 13.5k site-searches per day**. And remember, this is just for the top 1,000 search terms. And since site-searches today is never cached by the CDN, that's how many times Kuma has to process 13.5k Elasticsearch queries per day (and equally all the Django code that wraps Elasticsearch into a request/(JSON)response). Perhaps roughly 20k site-searches per when you include all search terms and the people who don't let GA track.\r\nAlso, each request that goes into Django also triggers the rate limiter which means it has to use Redis too. \r\n\r\nAs of today, site-search triggers a full Django+React SSR render and this accounts for 18% of the most time-consuming work our EC2 has to do:\r\n<img width=\"443\" alt=\"Screen Shot 2021-02-25 at 4 41 05 PM\" src=\"https://user-images.githubusercontent.com/26739/109223288-647b6c80-7788-11eb-911c-d44582735c5e.png\">\r\nThat number will shrink by itself once Yari takes over the search and it's just a `/api/v1/search` XHR request.\r\n\r\nI speculate that we can leverage the CDN to:\r\n\r\n- **Make users get faster search results**\r\n- **Reduce the stress on our Kubernetes cluster and be able to use a lot less EC2 power and save money and electricity**\r\n\r\nMany searches are a single word (i.e. 0 spaces)\r\n```\r\n0 spaces: 91.3%\r\n1 spaces: 8.5%\r\n2 spaces: 0.2%\r\n```\r\n\r\nMost searches are short single words. A complete list of the [top 1,000 most common searches are here](https://gist.github.com/peterbe/7cc2c8fa1cc72e976b9ac0caa0852055)\r\n\r\nIf you analyze the length of the search terms you get:\r\n```\r\n0-10 85.1%\r\n11-20 14.6%\r\n21+ 0.3%\r\n```\r\n\r\nSince all traffic always goes through the CDN anyway, we can set a `Cache-Control` on these. Say, 24h. I don't think it's expected that a search for `splice` should get documents that have recently changed within the last day. \r\n\r\nWe could potentially make the setting of the `Cache-Control` only on short and simple searches without any advanced filtering (e.g `?locale=ja&locale=en-us&slug_prefix=Web/CSS`). That way our CDN won't have to store too many things that aren't worth caching.\n", "before_files": [{"content": "from django import http\nfrom django.conf import settings\nfrom elasticsearch import exceptions\nfrom elasticsearch_dsl import Q, query, Search\nfrom redo import retrying\n\nfrom kuma.api.v1.decorators import allow_CORS_GET\n\nfrom .forms import SearchForm\n\n\nclass JsonResponse(http.JsonResponse):\n \"\"\"The only reason this exists is so that other Django views can call\n views that return instances of this and then get to the data before it\n gets JSON serialized.\n This is something that rest_framework's JsonResponse supports.\n Ultimately, the only view that cares is the (old) Kuma search view page\n that calls the view function here in this file. Now it can do something like:\n\n response = kuma.api.v1.search.search(request)\n found = response.data\n\n \"\"\"\n\n def __init__(self, data, *args, **kwargs):\n self.data = data\n super().__init__(data, *args, **kwargs)\n\n\ndef legacy(request, locale=None):\n raise NotImplementedError(\"work harder\")\n\n\n@allow_CORS_GET\ndef search(request, locale=None):\n initial = {\"size\": 10, \"page\": 1, \"archive\": SearchForm.ARCHIVE_CHOICES[0]}\n if locale:\n initial[\"locale\"] = locale\n form = SearchForm(request.GET, initial=initial)\n if not form.is_valid():\n return JsonResponse({\"errors\": form.errors.get_json_data()}, status=400)\n\n locales = form.cleaned_data[\"locale\"] or [settings.LANGUAGE_CODE]\n assert isinstance(locales, list)\n\n params = {\n \"locales\": [x.lower() for x in locales],\n \"archive\": form.cleaned_data[\"archive\"],\n \"query\": form.cleaned_data[\"q\"],\n \"size\": form.cleaned_data[\"size\"],\n \"page\": form.cleaned_data[\"page\"],\n \"sort\": form.cleaned_data[\"sort\"],\n # The `slug` is always stored, as a Keyword index, in lowercase.\n \"slug_prefixes\": [x.lower() for x in form.cleaned_data[\"slug_prefix\"]],\n }\n\n # By default, assume that we will try to make suggestions.\n make_suggestions = True\n if len(params[\"query\"]) > 100 or max(len(x) for x in params[\"query\"].split()) > 30:\n # For example, if it's a really long query, or a specific word is just too\n # long, you can get those tricky\n # TransportError(500, 'search_phase_execution_exception', 'Term too complex:\n # errors which are hard to prevent against.\n make_suggestions = False\n\n results = _find(\n params,\n make_suggestions=make_suggestions,\n )\n return JsonResponse(results)\n\n\ndef _find(params, total_only=False, make_suggestions=False, min_suggestion_score=0.8):\n search_query = Search(\n index=settings.SEARCH_INDEX_NAME,\n )\n if make_suggestions:\n # XXX research if it it's better to use phrase suggesters and if\n # that works\n # https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters.html#phrase-suggester\n search_query = search_query.suggest(\n \"title_suggestions\", params[\"query\"], term={\"field\": \"title\"}\n )\n search_query = search_query.suggest(\n \"body_suggestions\", params[\"query\"], term={\"field\": \"body\"}\n )\n\n sub_queries = []\n sub_queries.append(Q(\"match\", title={\"query\": params[\"query\"], \"boost\": 2.0}))\n sub_queries.append(Q(\"match\", body={\"query\": params[\"query\"], \"boost\": 1.0}))\n if \" \" in params[\"query\"]:\n sub_queries.append(\n Q(\"match_phrase\", title={\"query\": params[\"query\"], \"boost\": 10.0})\n )\n sub_queries.append(\n Q(\"match_phrase\", body={\"query\": params[\"query\"], \"boost\": 5.0})\n )\n\n sub_query = query.Bool(should=sub_queries)\n\n if params[\"locales\"]:\n search_query = search_query.filter(\"terms\", locale=params[\"locales\"])\n if params[\"archive\"] == \"exclude\":\n search_query = search_query.filter(\"term\", archived=False)\n elif params[\"archive\"] == \"only\":\n search_query = search_query.filter(\"term\", archived=True)\n\n if params[\"slug_prefixes\"]:\n sub_queries = [Q(\"prefix\", slug=x) for x in params[\"slug_prefixes\"]]\n search_query = search_query.query(query.Bool(should=sub_queries))\n\n search_query = search_query.highlight_options(\n pre_tags=[\"<mark>\"],\n post_tags=[\"</mark>\"],\n number_of_fragments=3,\n fragment_size=120,\n encoder=\"html\",\n )\n search_query = search_query.highlight(\"title\", \"body\")\n\n if params[\"sort\"] == \"relevance\":\n search_query = search_query.sort(\"_score\", \"-popularity\")\n search_query = search_query.query(sub_query)\n elif params[\"sort\"] == \"popularity\":\n search_query = search_query.sort(\"-popularity\", \"_score\")\n search_query = search_query.query(sub_query)\n else:\n popularity_factor = 10.0\n boost_mode = \"sum\"\n score_mode = \"max\"\n search_query = search_query.query(\n \"function_score\",\n query=sub_query,\n functions=[\n query.SF(\n \"field_value_factor\",\n field=\"popularity\",\n factor=popularity_factor,\n missing=0.0,\n )\n ],\n boost_mode=boost_mode,\n score_mode=score_mode,\n )\n\n search_query = search_query.source(excludes=[\"body\"])\n\n search_query = search_query[\n params[\"size\"] * (params[\"page\"] - 1) : params[\"size\"] * params[\"page\"]\n ]\n\n retry_options = {\n \"retry_exceptions\": (\n # This is the standard operational exception.\n exceptions.ConnectionError,\n # This can happen if the search happened right as the index had\n # just been deleted due to a fresh re-indexing happening in Yari.\n exceptions.NotFoundError,\n # This can happen when the index simply isn't ready yet.\n exceptions.TransportError,\n ),\n # The default in redo is 60 seconds. Let's tone that down.\n \"sleeptime\": settings.ES_RETRY_SLEEPTIME,\n \"attempts\": settings.ES_RETRY_ATTEMPTS,\n \"jitter\": settings.ES_RETRY_JITTER,\n }\n with retrying(search_query.execute, **retry_options) as retrying_function:\n response = retrying_function()\n\n if total_only:\n return response.hits.total\n\n metadata = {\n \"took_ms\": response.took,\n \"total\": {\n # The `response.hits.total` is a `elasticsearch_dsl.utils.AttrDict`\n # instance. Pluck only the exact data needed.\n \"value\": response.hits.total.value,\n \"relation\": response.hits.total.relation,\n },\n \"size\": params[\"size\"],\n \"page\": params[\"page\"],\n }\n documents = []\n for hit in response:\n try:\n body_highlight = list(hit.meta.highlight.body)\n except AttributeError:\n body_highlight = []\n try:\n title_highlight = list(hit.meta.highlight.title)\n except AttributeError:\n title_highlight = []\n\n d = {\n \"mdn_url\": hit.meta.id,\n \"score\": hit.meta.score,\n \"title\": hit.title,\n \"locale\": hit.locale,\n \"slug\": hit.slug,\n \"popularity\": hit.popularity,\n \"archived\": hit.archived,\n \"summary\": hit.summary,\n \"highlight\": {\n \"body\": body_highlight,\n \"title\": title_highlight,\n },\n }\n documents.append(d)\n\n try:\n suggest = getattr(response, \"suggest\")\n except AttributeError:\n suggest = None\n\n suggestions = []\n if suggest:\n suggestion_strings = _unpack_suggestions(\n params[\"query\"],\n response.suggest,\n (\"body_suggestions\", \"title_suggestions\"),\n )\n\n for score, string in suggestion_strings:\n if score > min_suggestion_score or 1:\n # Sure, this is different way to spell, but what will it yield\n # if you actually search it?\n total = _find(dict(params, query=string), total_only=True)\n if total[\"value\"] > 0:\n suggestions.append(\n {\n \"text\": string,\n \"total\": {\n # This 'total' is an `AttrDict` instance.\n \"value\": total.value,\n \"relation\": total.relation,\n },\n }\n )\n # Since they're sorted by score, it's usually never useful\n # to suggestion more than exactly 1 good suggestion.\n break\n\n return {\n \"documents\": documents,\n \"metadata\": metadata,\n \"suggestions\": suggestions,\n }\n\n\ndef _unpack_suggestions(query, suggest, keys):\n alternatives = []\n for key in keys:\n for suggestion in getattr(suggest, key, []):\n for option in suggestion.options:\n alternatives.append(\n (\n option.score,\n query[0 : suggestion.offset]\n + option.text\n + query[suggestion.offset + suggestion.length :],\n )\n )\n alternatives.sort(reverse=True) # highest score first\n return alternatives\n", "path": "kuma/api/v1/search/__init__.py"}]}
| 3,980 | 581 |
gh_patches_debug_36992
|
rasdani/github-patches
|
git_diff
|
spotify__luigi-2404
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Lets use Text type for value column of TaskParameter table
## Description
Change `value` column type from `string(256)` to `text` because of the issues on insert to task parameters table.
[error](https://gist.github.com/oivoodoo/0fb78f5a041bb08939f30f4af10c00c6)
## Motivation and Context
Found this issue from the log file in our production system.
## Have you tested this? If so, how?
Going to test on 17.10.2016 in the next our deploy.
luigi parameter value column is set to limit size of 256
<!---
We use GitHub issues mainly for tracking bugs and feature requests.
Questions for how to use luigi can be sent to the mailing list.
Currently, there are no strict procedures or guidelines for submitting issues.
In short, please just use common sense.
Common sense includes this at bare-minimum:
* search for similar issues posted before creating a new issue.
* Use markdown to format all code/logs. Issues which are hard to read
when rendered on GitHub might be closed with a friendly reminder of this.
* If applicable, reading relevant parts of the documentation.
Also, add steps to reproduce the bug, if applicable. Sample code would be nice too :)
For more information on how to submit valuable contributions,
see https://opensource.guide/how-to-contribute/#how-to-submit-a-contribution
-->
But we need values longer than that. Can the limit be raised? In postgres this can just be `TEXT` type.
</issue>
<code>
[start of luigi/db_task_history.py]
1 # -*- coding: utf-8 -*-
2 #
3 # Copyright 2012-2015 Spotify AB
4 #
5 # Licensed under the Apache License, Version 2.0 (the "License");
6 # you may not use this file except in compliance with the License.
7 # You may obtain a copy of the License at
8 #
9 # http://www.apache.org/licenses/LICENSE-2.0
10 #
11 # Unless required by applicable law or agreed to in writing, software
12 # distributed under the License is distributed on an "AS IS" BASIS,
13 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 # See the License for the specific language governing permissions and
15 # limitations under the License.
16 #
17
18 """
19 Provides a database backend to the central scheduler. This lets you see historical runs.
20 See :ref:`TaskHistory` for information about how to turn out the task history feature.
21 """
22 #
23 # Description: Added codes for visualization of how long each task takes
24 # running-time until it reaches the next status (failed or done)
25 # At "{base_url}/tasklist", all completed(failed or done) tasks are shown.
26 # At "{base_url}/tasklist", a user can select one specific task to see
27 # how its running-time has changed over time.
28 # At "{base_url}/tasklist/{task_name}", it visualizes a multi-bar graph
29 # that represents the changes of the running-time for a selected task
30 # up to the next status (failed or done).
31 # This visualization let us know how the running-time of the specific task
32 # has changed over time.
33 #
34 # Copyright 2015 Naver Corp.
35 # Author Yeseul Park ([email protected])
36 #
37
38 import datetime
39 import logging
40 from contextlib import contextmanager
41
42 from luigi import six
43
44 from luigi import configuration
45 from luigi import task_history
46 from luigi.task_status import DONE, FAILED, PENDING, RUNNING
47
48 import sqlalchemy
49 import sqlalchemy.ext.declarative
50 import sqlalchemy.orm
51 import sqlalchemy.orm.collections
52 from sqlalchemy.engine import reflection
53 Base = sqlalchemy.ext.declarative.declarative_base()
54
55 logger = logging.getLogger('luigi-interface')
56
57
58 class DbTaskHistory(task_history.TaskHistory):
59 """
60 Task History that writes to a database using sqlalchemy.
61 Also has methods for useful db queries.
62 """
63 CURRENT_SOURCE_VERSION = 1
64
65 @contextmanager
66 def _session(self, session=None):
67 if session:
68 yield session
69 else:
70 session = self.session_factory()
71 try:
72 yield session
73 except BaseException:
74 session.rollback()
75 raise
76 else:
77 session.commit()
78
79 def __init__(self):
80 config = configuration.get_config()
81 connection_string = config.get('task_history', 'db_connection')
82 self.engine = sqlalchemy.create_engine(connection_string)
83 self.session_factory = sqlalchemy.orm.sessionmaker(bind=self.engine, expire_on_commit=False)
84 Base.metadata.create_all(self.engine)
85 self.tasks = {} # task_id -> TaskRecord
86
87 _upgrade_schema(self.engine)
88
89 def task_scheduled(self, task):
90 htask = self._get_task(task, status=PENDING)
91 self._add_task_event(htask, TaskEvent(event_name=PENDING, ts=datetime.datetime.now()))
92
93 def task_finished(self, task, successful):
94 event_name = DONE if successful else FAILED
95 htask = self._get_task(task, status=event_name)
96 self._add_task_event(htask, TaskEvent(event_name=event_name, ts=datetime.datetime.now()))
97
98 def task_started(self, task, worker_host):
99 htask = self._get_task(task, status=RUNNING, host=worker_host)
100 self._add_task_event(htask, TaskEvent(event_name=RUNNING, ts=datetime.datetime.now()))
101
102 def _get_task(self, task, status, host=None):
103 if task.id in self.tasks:
104 htask = self.tasks[task.id]
105 htask.status = status
106 if host:
107 htask.host = host
108 else:
109 htask = self.tasks[task.id] = task_history.StoredTask(task, status, host)
110 return htask
111
112 def _add_task_event(self, task, event):
113 for (task_record, session) in self._find_or_create_task(task):
114 task_record.events.append(event)
115
116 def _find_or_create_task(self, task):
117 with self._session() as session:
118 if task.record_id is not None:
119 logger.debug("Finding task with record_id [%d]", task.record_id)
120 task_record = session.query(TaskRecord).get(task.record_id)
121 if not task_record:
122 raise Exception("Task with record_id, but no matching Task record!")
123 yield (task_record, session)
124 else:
125 task_record = TaskRecord(task_id=task._task.id, name=task.task_family, host=task.host)
126 for (k, v) in six.iteritems(task.parameters):
127 task_record.parameters[k] = TaskParameter(name=k, value=v)
128 session.add(task_record)
129 yield (task_record, session)
130 if task.host:
131 task_record.host = task.host
132 task.record_id = task_record.id
133
134 def find_all_by_parameters(self, task_name, session=None, **task_params):
135 """
136 Find tasks with the given task_name and the same parameters as the kwargs.
137 """
138 with self._session(session) as session:
139 query = session.query(TaskRecord).join(TaskEvent).filter(TaskRecord.name == task_name)
140 for (k, v) in six.iteritems(task_params):
141 alias = sqlalchemy.orm.aliased(TaskParameter)
142 query = query.join(alias).filter(alias.name == k, alias.value == v)
143
144 tasks = query.order_by(TaskEvent.ts)
145 for task in tasks:
146 # Sanity check
147 assert all(k in task.parameters and v == str(task.parameters[k].value) for (k, v) in six.iteritems(task_params))
148
149 yield task
150
151 def find_all_by_name(self, task_name, session=None):
152 """
153 Find all tasks with the given task_name.
154 """
155 return self.find_all_by_parameters(task_name, session)
156
157 def find_latest_runs(self, session=None):
158 """
159 Return tasks that have been updated in the past 24 hours.
160 """
161 with self._session(session) as session:
162 yesterday = datetime.datetime.now() - datetime.timedelta(days=1)
163 return session.query(TaskRecord).\
164 join(TaskEvent).\
165 filter(TaskEvent.ts >= yesterday).\
166 group_by(TaskRecord.id, TaskEvent.event_name, TaskEvent.ts).\
167 order_by(TaskEvent.ts.desc()).\
168 all()
169
170 def find_all_runs(self, session=None):
171 """
172 Return all tasks that have been updated.
173 """
174 with self._session(session) as session:
175 return session.query(TaskRecord).all()
176
177 def find_all_events(self, session=None):
178 """
179 Return all running/failed/done events.
180 """
181 with self._session(session) as session:
182 return session.query(TaskEvent).all()
183
184 def find_task_by_id(self, id, session=None):
185 """
186 Find task with the given record ID.
187 """
188 with self._session(session) as session:
189 return session.query(TaskRecord).get(id)
190
191
192 class TaskParameter(Base):
193 """
194 Table to track luigi.Parameter()s of a Task.
195 """
196 __tablename__ = 'task_parameters'
197 task_id = sqlalchemy.Column(sqlalchemy.Integer, sqlalchemy.ForeignKey('tasks.id'), primary_key=True)
198 name = sqlalchemy.Column(sqlalchemy.String(128), primary_key=True)
199 value = sqlalchemy.Column(sqlalchemy.String(256))
200
201 def __repr__(self):
202 return "TaskParameter(task_id=%d, name=%s, value=%s)" % (self.task_id, self.name, self.value)
203
204
205 class TaskEvent(Base):
206 """
207 Table to track when a task is scheduled, starts, finishes, and fails.
208 """
209 __tablename__ = 'task_events'
210 id = sqlalchemy.Column(sqlalchemy.Integer, primary_key=True)
211 task_id = sqlalchemy.Column(sqlalchemy.Integer, sqlalchemy.ForeignKey('tasks.id'), index=True)
212 event_name = sqlalchemy.Column(sqlalchemy.String(20))
213 ts = sqlalchemy.Column(sqlalchemy.TIMESTAMP, index=True, nullable=False)
214
215 def __repr__(self):
216 return "TaskEvent(task_id=%s, event_name=%s, ts=%s" % (self.task_id, self.event_name, self.ts)
217
218
219 class TaskRecord(Base):
220 """
221 Base table to track information about a luigi.Task.
222
223 References to other tables are available through task.events, task.parameters, etc.
224 """
225 __tablename__ = 'tasks'
226 id = sqlalchemy.Column(sqlalchemy.Integer, primary_key=True)
227 task_id = sqlalchemy.Column(sqlalchemy.String(200), index=True)
228 name = sqlalchemy.Column(sqlalchemy.String(128), index=True)
229 host = sqlalchemy.Column(sqlalchemy.String(128))
230 parameters = sqlalchemy.orm.relationship(
231 'TaskParameter',
232 collection_class=sqlalchemy.orm.collections.attribute_mapped_collection('name'),
233 cascade="all, delete-orphan")
234 events = sqlalchemy.orm.relationship(
235 'TaskEvent',
236 order_by=(sqlalchemy.desc(TaskEvent.ts), sqlalchemy.desc(TaskEvent.id)),
237 backref='task')
238
239 def __repr__(self):
240 return "TaskRecord(name=%s, host=%s)" % (self.name, self.host)
241
242
243 def _upgrade_schema(engine):
244 """
245 Ensure the database schema is up to date with the codebase.
246
247 :param engine: SQLAlchemy engine of the underlying database.
248 """
249 inspector = reflection.Inspector.from_engine(engine)
250 conn = engine.connect()
251
252 # Upgrade 1. Add task_id column and index to tasks
253 if 'task_id' not in [x['name'] for x in inspector.get_columns('tasks')]:
254 logger.warn('Upgrading DbTaskHistory schema: Adding tasks.task_id')
255 conn.execute('ALTER TABLE tasks ADD COLUMN task_id VARCHAR(200)')
256 conn.execute('CREATE INDEX ix_task_id ON tasks (task_id)')
257
[end of luigi/db_task_history.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/luigi/db_task_history.py b/luigi/db_task_history.py
--- a/luigi/db_task_history.py
+++ b/luigi/db_task_history.py
@@ -196,7 +196,7 @@
__tablename__ = 'task_parameters'
task_id = sqlalchemy.Column(sqlalchemy.Integer, sqlalchemy.ForeignKey('tasks.id'), primary_key=True)
name = sqlalchemy.Column(sqlalchemy.String(128), primary_key=True)
- value = sqlalchemy.Column(sqlalchemy.String(256))
+ value = sqlalchemy.Column(sqlalchemy.Text())
def __repr__(self):
return "TaskParameter(task_id=%d, name=%s, value=%s)" % (self.task_id, self.name, self.value)
@@ -247,10 +247,35 @@
:param engine: SQLAlchemy engine of the underlying database.
"""
inspector = reflection.Inspector.from_engine(engine)
- conn = engine.connect()
-
- # Upgrade 1. Add task_id column and index to tasks
- if 'task_id' not in [x['name'] for x in inspector.get_columns('tasks')]:
- logger.warn('Upgrading DbTaskHistory schema: Adding tasks.task_id')
- conn.execute('ALTER TABLE tasks ADD COLUMN task_id VARCHAR(200)')
- conn.execute('CREATE INDEX ix_task_id ON tasks (task_id)')
+ with engine.connect() as conn:
+
+ # Upgrade 1. Add task_id column and index to tasks
+ if 'task_id' not in [x['name'] for x in inspector.get_columns('tasks')]:
+ logger.warning('Upgrading DbTaskHistory schema: Adding tasks.task_id')
+ conn.execute('ALTER TABLE tasks ADD COLUMN task_id VARCHAR(200)')
+ conn.execute('CREATE INDEX ix_task_id ON tasks (task_id)')
+
+ # Upgrade 2. Alter value column to be TEXT, note that this is idempotent so no if-guard
+ if 'mysql' in engine.dialect.name:
+ conn.execute('ALTER TABLE task_parameters MODIFY COLUMN value TEXT')
+ elif 'oracle' in engine.dialect.name:
+ conn.execute('ALTER TABLE task_parameters MODIFY value TEXT')
+ elif 'mssql' in engine.dialect.name:
+ conn.execute('ALTER TABLE task_parameters ALTER COLUMN value TEXT')
+ elif 'postgresql' in engine.dialect.name:
+ conn.execute('ALTER TABLE task_parameters ALTER COLUMN value TYPE TEXT')
+ elif 'sqlite' in engine.dialect.name:
+ # SQLite does not support changing column types. A database file will need
+ # to be used to pickup this migration change.
+ for i in conn.execute('PRAGMA table_info(task_parameters);').fetchall():
+ if i['name'] == 'value' and i['type'] != 'TEXT':
+ logger.warning(
+ 'SQLite can not change column types. Please use a new database '
+ 'to pickup column type changes.'
+ )
+ else:
+ logger.warning(
+ 'SQLAlcheny dialect {} could not be migrated to the TEXT type'.format(
+ engine.dialect
+ )
+ )
|
{"golden_diff": "diff --git a/luigi/db_task_history.py b/luigi/db_task_history.py\n--- a/luigi/db_task_history.py\n+++ b/luigi/db_task_history.py\n@@ -196,7 +196,7 @@\n __tablename__ = 'task_parameters'\n task_id = sqlalchemy.Column(sqlalchemy.Integer, sqlalchemy.ForeignKey('tasks.id'), primary_key=True)\n name = sqlalchemy.Column(sqlalchemy.String(128), primary_key=True)\n- value = sqlalchemy.Column(sqlalchemy.String(256))\n+ value = sqlalchemy.Column(sqlalchemy.Text())\n \n def __repr__(self):\n return \"TaskParameter(task_id=%d, name=%s, value=%s)\" % (self.task_id, self.name, self.value)\n@@ -247,10 +247,35 @@\n :param engine: SQLAlchemy engine of the underlying database.\n \"\"\"\n inspector = reflection.Inspector.from_engine(engine)\n- conn = engine.connect()\n-\n- # Upgrade 1. Add task_id column and index to tasks\n- if 'task_id' not in [x['name'] for x in inspector.get_columns('tasks')]:\n- logger.warn('Upgrading DbTaskHistory schema: Adding tasks.task_id')\n- conn.execute('ALTER TABLE tasks ADD COLUMN task_id VARCHAR(200)')\n- conn.execute('CREATE INDEX ix_task_id ON tasks (task_id)')\n+ with engine.connect() as conn:\n+\n+ # Upgrade 1. Add task_id column and index to tasks\n+ if 'task_id' not in [x['name'] for x in inspector.get_columns('tasks')]:\n+ logger.warning('Upgrading DbTaskHistory schema: Adding tasks.task_id')\n+ conn.execute('ALTER TABLE tasks ADD COLUMN task_id VARCHAR(200)')\n+ conn.execute('CREATE INDEX ix_task_id ON tasks (task_id)')\n+\n+ # Upgrade 2. Alter value column to be TEXT, note that this is idempotent so no if-guard\n+ if 'mysql' in engine.dialect.name:\n+ conn.execute('ALTER TABLE task_parameters MODIFY COLUMN value TEXT')\n+ elif 'oracle' in engine.dialect.name:\n+ conn.execute('ALTER TABLE task_parameters MODIFY value TEXT')\n+ elif 'mssql' in engine.dialect.name:\n+ conn.execute('ALTER TABLE task_parameters ALTER COLUMN value TEXT')\n+ elif 'postgresql' in engine.dialect.name:\n+ conn.execute('ALTER TABLE task_parameters ALTER COLUMN value TYPE TEXT')\n+ elif 'sqlite' in engine.dialect.name:\n+ # SQLite does not support changing column types. A database file will need\n+ # to be used to pickup this migration change.\n+ for i in conn.execute('PRAGMA table_info(task_parameters);').fetchall():\n+ if i['name'] == 'value' and i['type'] != 'TEXT':\n+ logger.warning(\n+ 'SQLite can not change column types. Please use a new database '\n+ 'to pickup column type changes.'\n+ )\n+ else:\n+ logger.warning(\n+ 'SQLAlcheny dialect {} could not be migrated to the TEXT type'.format(\n+ engine.dialect\n+ )\n+ )\n", "issue": "Lets use Text type for value column of TaskParameter table\n## Description\n\nChange `value` column type from `string(256)` to `text` because of the issues on insert to task parameters table.\n\n[error](https://gist.github.com/oivoodoo/0fb78f5a041bb08939f30f4af10c00c6) \n## Motivation and Context\n\nFound this issue from the log file in our production system.\n## Have you tested this? If so, how?\n\nGoing to test on 17.10.2016 in the next our deploy.\n\nluigi parameter value column is set to limit size of 256\n<!---\r\nWe use GitHub issues mainly for tracking bugs and feature requests.\r\nQuestions for how to use luigi can be sent to the mailing list.\r\n\r\nCurrently, there are no strict procedures or guidelines for submitting issues.\r\nIn short, please just use common sense.\r\n\r\nCommon sense includes this at bare-minimum:\r\n\r\n * search for similar issues posted before creating a new issue.\r\n * Use markdown to format all code/logs. Issues which are hard to read\r\n when rendered on GitHub might be closed with a friendly reminder of this.\r\n * If applicable, reading relevant parts of the documentation.\r\n\r\nAlso, add steps to reproduce the bug, if applicable. Sample code would be nice too :)\r\n\r\nFor more information on how to submit valuable contributions,\r\nsee https://opensource.guide/how-to-contribute/#how-to-submit-a-contribution\r\n-->\r\n\r\nBut we need values longer than that. Can the limit be raised? In postgres this can just be `TEXT` type.\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n#\n# Copyright 2012-2015 Spotify AB\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n#\n\n\"\"\"\nProvides a database backend to the central scheduler. This lets you see historical runs.\nSee :ref:`TaskHistory` for information about how to turn out the task history feature.\n\"\"\"\n#\n# Description: Added codes for visualization of how long each task takes\n# running-time until it reaches the next status (failed or done)\n# At \"{base_url}/tasklist\", all completed(failed or done) tasks are shown.\n# At \"{base_url}/tasklist\", a user can select one specific task to see\n# how its running-time has changed over time.\n# At \"{base_url}/tasklist/{task_name}\", it visualizes a multi-bar graph\n# that represents the changes of the running-time for a selected task\n# up to the next status (failed or done).\n# This visualization let us know how the running-time of the specific task\n# has changed over time.\n#\n# Copyright 2015 Naver Corp.\n# Author Yeseul Park ([email protected])\n#\n\nimport datetime\nimport logging\nfrom contextlib import contextmanager\n\nfrom luigi import six\n\nfrom luigi import configuration\nfrom luigi import task_history\nfrom luigi.task_status import DONE, FAILED, PENDING, RUNNING\n\nimport sqlalchemy\nimport sqlalchemy.ext.declarative\nimport sqlalchemy.orm\nimport sqlalchemy.orm.collections\nfrom sqlalchemy.engine import reflection\nBase = sqlalchemy.ext.declarative.declarative_base()\n\nlogger = logging.getLogger('luigi-interface')\n\n\nclass DbTaskHistory(task_history.TaskHistory):\n \"\"\"\n Task History that writes to a database using sqlalchemy.\n Also has methods for useful db queries.\n \"\"\"\n CURRENT_SOURCE_VERSION = 1\n\n @contextmanager\n def _session(self, session=None):\n if session:\n yield session\n else:\n session = self.session_factory()\n try:\n yield session\n except BaseException:\n session.rollback()\n raise\n else:\n session.commit()\n\n def __init__(self):\n config = configuration.get_config()\n connection_string = config.get('task_history', 'db_connection')\n self.engine = sqlalchemy.create_engine(connection_string)\n self.session_factory = sqlalchemy.orm.sessionmaker(bind=self.engine, expire_on_commit=False)\n Base.metadata.create_all(self.engine)\n self.tasks = {} # task_id -> TaskRecord\n\n _upgrade_schema(self.engine)\n\n def task_scheduled(self, task):\n htask = self._get_task(task, status=PENDING)\n self._add_task_event(htask, TaskEvent(event_name=PENDING, ts=datetime.datetime.now()))\n\n def task_finished(self, task, successful):\n event_name = DONE if successful else FAILED\n htask = self._get_task(task, status=event_name)\n self._add_task_event(htask, TaskEvent(event_name=event_name, ts=datetime.datetime.now()))\n\n def task_started(self, task, worker_host):\n htask = self._get_task(task, status=RUNNING, host=worker_host)\n self._add_task_event(htask, TaskEvent(event_name=RUNNING, ts=datetime.datetime.now()))\n\n def _get_task(self, task, status, host=None):\n if task.id in self.tasks:\n htask = self.tasks[task.id]\n htask.status = status\n if host:\n htask.host = host\n else:\n htask = self.tasks[task.id] = task_history.StoredTask(task, status, host)\n return htask\n\n def _add_task_event(self, task, event):\n for (task_record, session) in self._find_or_create_task(task):\n task_record.events.append(event)\n\n def _find_or_create_task(self, task):\n with self._session() as session:\n if task.record_id is not None:\n logger.debug(\"Finding task with record_id [%d]\", task.record_id)\n task_record = session.query(TaskRecord).get(task.record_id)\n if not task_record:\n raise Exception(\"Task with record_id, but no matching Task record!\")\n yield (task_record, session)\n else:\n task_record = TaskRecord(task_id=task._task.id, name=task.task_family, host=task.host)\n for (k, v) in six.iteritems(task.parameters):\n task_record.parameters[k] = TaskParameter(name=k, value=v)\n session.add(task_record)\n yield (task_record, session)\n if task.host:\n task_record.host = task.host\n task.record_id = task_record.id\n\n def find_all_by_parameters(self, task_name, session=None, **task_params):\n \"\"\"\n Find tasks with the given task_name and the same parameters as the kwargs.\n \"\"\"\n with self._session(session) as session:\n query = session.query(TaskRecord).join(TaskEvent).filter(TaskRecord.name == task_name)\n for (k, v) in six.iteritems(task_params):\n alias = sqlalchemy.orm.aliased(TaskParameter)\n query = query.join(alias).filter(alias.name == k, alias.value == v)\n\n tasks = query.order_by(TaskEvent.ts)\n for task in tasks:\n # Sanity check\n assert all(k in task.parameters and v == str(task.parameters[k].value) for (k, v) in six.iteritems(task_params))\n\n yield task\n\n def find_all_by_name(self, task_name, session=None):\n \"\"\"\n Find all tasks with the given task_name.\n \"\"\"\n return self.find_all_by_parameters(task_name, session)\n\n def find_latest_runs(self, session=None):\n \"\"\"\n Return tasks that have been updated in the past 24 hours.\n \"\"\"\n with self._session(session) as session:\n yesterday = datetime.datetime.now() - datetime.timedelta(days=1)\n return session.query(TaskRecord).\\\n join(TaskEvent).\\\n filter(TaskEvent.ts >= yesterday).\\\n group_by(TaskRecord.id, TaskEvent.event_name, TaskEvent.ts).\\\n order_by(TaskEvent.ts.desc()).\\\n all()\n\n def find_all_runs(self, session=None):\n \"\"\"\n Return all tasks that have been updated.\n \"\"\"\n with self._session(session) as session:\n return session.query(TaskRecord).all()\n\n def find_all_events(self, session=None):\n \"\"\"\n Return all running/failed/done events.\n \"\"\"\n with self._session(session) as session:\n return session.query(TaskEvent).all()\n\n def find_task_by_id(self, id, session=None):\n \"\"\"\n Find task with the given record ID.\n \"\"\"\n with self._session(session) as session:\n return session.query(TaskRecord).get(id)\n\n\nclass TaskParameter(Base):\n \"\"\"\n Table to track luigi.Parameter()s of a Task.\n \"\"\"\n __tablename__ = 'task_parameters'\n task_id = sqlalchemy.Column(sqlalchemy.Integer, sqlalchemy.ForeignKey('tasks.id'), primary_key=True)\n name = sqlalchemy.Column(sqlalchemy.String(128), primary_key=True)\n value = sqlalchemy.Column(sqlalchemy.String(256))\n\n def __repr__(self):\n return \"TaskParameter(task_id=%d, name=%s, value=%s)\" % (self.task_id, self.name, self.value)\n\n\nclass TaskEvent(Base):\n \"\"\"\n Table to track when a task is scheduled, starts, finishes, and fails.\n \"\"\"\n __tablename__ = 'task_events'\n id = sqlalchemy.Column(sqlalchemy.Integer, primary_key=True)\n task_id = sqlalchemy.Column(sqlalchemy.Integer, sqlalchemy.ForeignKey('tasks.id'), index=True)\n event_name = sqlalchemy.Column(sqlalchemy.String(20))\n ts = sqlalchemy.Column(sqlalchemy.TIMESTAMP, index=True, nullable=False)\n\n def __repr__(self):\n return \"TaskEvent(task_id=%s, event_name=%s, ts=%s\" % (self.task_id, self.event_name, self.ts)\n\n\nclass TaskRecord(Base):\n \"\"\"\n Base table to track information about a luigi.Task.\n\n References to other tables are available through task.events, task.parameters, etc.\n \"\"\"\n __tablename__ = 'tasks'\n id = sqlalchemy.Column(sqlalchemy.Integer, primary_key=True)\n task_id = sqlalchemy.Column(sqlalchemy.String(200), index=True)\n name = sqlalchemy.Column(sqlalchemy.String(128), index=True)\n host = sqlalchemy.Column(sqlalchemy.String(128))\n parameters = sqlalchemy.orm.relationship(\n 'TaskParameter',\n collection_class=sqlalchemy.orm.collections.attribute_mapped_collection('name'),\n cascade=\"all, delete-orphan\")\n events = sqlalchemy.orm.relationship(\n 'TaskEvent',\n order_by=(sqlalchemy.desc(TaskEvent.ts), sqlalchemy.desc(TaskEvent.id)),\n backref='task')\n\n def __repr__(self):\n return \"TaskRecord(name=%s, host=%s)\" % (self.name, self.host)\n\n\ndef _upgrade_schema(engine):\n \"\"\"\n Ensure the database schema is up to date with the codebase.\n\n :param engine: SQLAlchemy engine of the underlying database.\n \"\"\"\n inspector = reflection.Inspector.from_engine(engine)\n conn = engine.connect()\n\n # Upgrade 1. Add task_id column and index to tasks\n if 'task_id' not in [x['name'] for x in inspector.get_columns('tasks')]:\n logger.warn('Upgrading DbTaskHistory schema: Adding tasks.task_id')\n conn.execute('ALTER TABLE tasks ADD COLUMN task_id VARCHAR(200)')\n conn.execute('CREATE INDEX ix_task_id ON tasks (task_id)')\n", "path": "luigi/db_task_history.py"}]}
| 3,695 | 691 |
gh_patches_debug_13668
|
rasdani/github-patches
|
git_diff
|
kubeflow__pipelines-1459
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
cmle training component should output job_dir.txt
It should output the file regardless user provides jodDir or not, otherwise argo will fail.
</issue>
<code>
[start of component_sdk/python/kfp_component/google/ml_engine/_create_job.py]
1 # Copyright 2018 Google LLC
2 #
3 # Licensed under the Apache License, Version 2.0 (the "License");
4 # you may not use this file except in compliance with the License.
5 # You may obtain a copy of the License at
6 #
7 # http://www.apache.org/licenses/LICENSE-2.0
8 #
9 # Unless required by applicable law or agreed to in writing, software
10 # distributed under the License is distributed on an "AS IS" BASIS,
11 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 # See the License for the specific language governing permissions and
13 # limitations under the License.
14
15
16 import json
17 import logging
18 import re
19 import time
20
21 from googleapiclient import errors
22
23 from kfp_component.core import KfpExecutionContext, display
24 from ._client import MLEngineClient
25 from .. import common as gcp_common
26
27 def create_job(project_id, job, job_id_prefix=None, wait_interval=30):
28 """Creates a MLEngine job.
29
30 Args:
31 project_id: the ID of the parent project of the job.
32 job: the payload of the job. Must have ``jobId``
33 and ``trainingInput`` or ``predictionInput`.
34 job_id_prefix: the prefix of the generated job id.
35 wait_interval: optional wait interval between calls
36 to get job status. Defaults to 30.
37
38 Outputs:
39 /tmp/kfp/output/ml_engine/job.json: The json payload of the create job.
40 /tmp/kfp/output/ml_engine/job_id.txt: The ID of the created job.
41 /tmp/kfp/output/ml_engine/job_dir.txt: The `jobDir` of the training job.
42 """
43 return CreateJobOp(project_id, job, job_id_prefix,
44 wait_interval).execute_and_wait()
45
46 class CreateJobOp:
47 def __init__(self, project_id, job, job_id_prefix=None, wait_interval=30):
48 self._ml = MLEngineClient()
49 self._project_id = project_id
50 self._job_id_prefix = job_id_prefix
51 self._job_id = None
52 self._job = job
53 self._wait_interval = wait_interval
54
55 def execute_and_wait(self):
56 with KfpExecutionContext(on_cancel=self._cancel) as ctx:
57 self._set_job_id(ctx.context_id())
58 self._dump_metadata()
59 self._create_job()
60 finished_job = self._wait_for_done()
61 self._dump_job(finished_job)
62 if finished_job['state'] != 'SUCCEEDED':
63 raise RuntimeError('Job failed with state {}. Error: {}'.format(
64 finished_job['state'], finished_job.get('errorMessage', '')))
65 return finished_job
66
67 def _set_job_id(self, context_id):
68 if self._job_id_prefix:
69 job_id = self._job_id_prefix + context_id[:16]
70 else:
71 job_id = 'job_' + context_id
72 job_id = gcp_common.normalize_name(job_id)
73 self._job_id = job_id
74 self._job['jobId'] = job_id
75
76 def _cancel(self):
77 try:
78 logging.info('Cancelling job {}.'.format(self._job_id))
79 self._ml.cancel_job(self._project_id, self._job_id)
80 logging.info('Cancelled job {}.'.format(self._job_id))
81 except errors.HttpError as e:
82 # Best effort to cancel the job
83 logging.error('Failed to cancel the job: {}'.format(e))
84 pass
85
86 def _create_job(self):
87 try:
88 self._ml.create_job(
89 project_id = self._project_id,
90 job = self._job
91 )
92 except errors.HttpError as e:
93 if e.resp.status == 409:
94 if not self._is_dup_job():
95 logging.error('Another job has been created with same name before: {}'.format(self._job_id))
96 raise
97 logging.info('The job {} has been submitted before. Continue waiting.'.format(self._job_id))
98 else:
99 logging.error('Failed to create job.\nPayload: {}\nError: {}'.format(self._job, e))
100 raise
101
102 def _is_dup_job(self):
103 existing_job = self._ml.get_job(self._project_id, self._job_id)
104 return existing_job.get('trainingInput', None) == self._job.get('trainingInput', None) \
105 and existing_job.get('predictionInput', None) == self._job.get('predictionInput', None)
106
107 def _wait_for_done(self):
108 while True:
109 job = self._ml.get_job(self._project_id, self._job_id)
110 if job.get('state', None) in ['SUCCEEDED', 'FAILED', 'CANCELLED']:
111 return job
112 # Move to config from flag
113 logging.info('job status is {}, wait for {}s'.format(
114 job.get('state', None), self._wait_interval))
115 time.sleep(self._wait_interval)
116
117 def _dump_metadata(self):
118 display.display(display.Link(
119 'https://console.cloud.google.com/mlengine/jobs/{}?project={}'.format(
120 self._job_id, self._project_id),
121 'Job Details'
122 ))
123 display.display(display.Link(
124 'https://console.cloud.google.com/logs/viewer?project={}&resource=ml_job/job_id/{}&interval=NO_LIMIT'.format(
125 self._project_id, self._job_id),
126 'Logs'
127 ))
128 if 'trainingInput' in self._job and 'jobDir' in self._job['trainingInput']:
129 display.display(display.Tensorboard(
130 self._job['trainingInput']['jobDir']))
131
132 def _dump_job(self, job):
133 logging.info('Dumping job: {}'.format(job))
134 gcp_common.dump_file('/tmp/kfp/output/ml_engine/job.json', json.dumps(job))
135 gcp_common.dump_file('/tmp/kfp/output/ml_engine/job_id.txt', job['jobId'])
136 if 'trainingInput' in job and 'jobDir' in job['trainingInput']:
137 gcp_common.dump_file('/tmp/kfp/output/ml_engine/job_dir.txt',
138 job['trainingInput']['jobDir'])
139
[end of component_sdk/python/kfp_component/google/ml_engine/_create_job.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/component_sdk/python/kfp_component/google/ml_engine/_create_job.py b/component_sdk/python/kfp_component/google/ml_engine/_create_job.py
--- a/component_sdk/python/kfp_component/google/ml_engine/_create_job.py
+++ b/component_sdk/python/kfp_component/google/ml_engine/_create_job.py
@@ -133,6 +133,8 @@
logging.info('Dumping job: {}'.format(job))
gcp_common.dump_file('/tmp/kfp/output/ml_engine/job.json', json.dumps(job))
gcp_common.dump_file('/tmp/kfp/output/ml_engine/job_id.txt', job['jobId'])
+ job_dir = ''
if 'trainingInput' in job and 'jobDir' in job['trainingInput']:
- gcp_common.dump_file('/tmp/kfp/output/ml_engine/job_dir.txt',
- job['trainingInput']['jobDir'])
+ job_dir = job['trainingInput']['jobDir']
+ gcp_common.dump_file('/tmp/kfp/output/ml_engine/job_dir.txt',
+ job_dir)
|
{"golden_diff": "diff --git a/component_sdk/python/kfp_component/google/ml_engine/_create_job.py b/component_sdk/python/kfp_component/google/ml_engine/_create_job.py\n--- a/component_sdk/python/kfp_component/google/ml_engine/_create_job.py\n+++ b/component_sdk/python/kfp_component/google/ml_engine/_create_job.py\n@@ -133,6 +133,8 @@\n logging.info('Dumping job: {}'.format(job))\n gcp_common.dump_file('/tmp/kfp/output/ml_engine/job.json', json.dumps(job))\n gcp_common.dump_file('/tmp/kfp/output/ml_engine/job_id.txt', job['jobId'])\n+ job_dir = ''\n if 'trainingInput' in job and 'jobDir' in job['trainingInput']:\n- gcp_common.dump_file('/tmp/kfp/output/ml_engine/job_dir.txt', \n- job['trainingInput']['jobDir'])\n+ job_dir = job['trainingInput']['jobDir']\n+ gcp_common.dump_file('/tmp/kfp/output/ml_engine/job_dir.txt', \n+ job_dir)\n", "issue": "cmle training component should output job_dir.txt\nIt should output the file regardless user provides jodDir or not, otherwise argo will fail.\n", "before_files": [{"content": "# Copyright 2018 Google LLC\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\n\nimport json\nimport logging\nimport re\nimport time\n\nfrom googleapiclient import errors\n\nfrom kfp_component.core import KfpExecutionContext, display\nfrom ._client import MLEngineClient\nfrom .. import common as gcp_common\n\ndef create_job(project_id, job, job_id_prefix=None, wait_interval=30):\n \"\"\"Creates a MLEngine job.\n\n Args:\n project_id: the ID of the parent project of the job.\n job: the payload of the job. Must have ``jobId`` \n and ``trainingInput`` or ``predictionInput`.\n job_id_prefix: the prefix of the generated job id.\n wait_interval: optional wait interval between calls\n to get job status. Defaults to 30.\n\n Outputs:\n /tmp/kfp/output/ml_engine/job.json: The json payload of the create job.\n /tmp/kfp/output/ml_engine/job_id.txt: The ID of the created job.\n /tmp/kfp/output/ml_engine/job_dir.txt: The `jobDir` of the training job.\n \"\"\"\n return CreateJobOp(project_id, job, job_id_prefix,\n wait_interval).execute_and_wait()\n\nclass CreateJobOp:\n def __init__(self, project_id, job, job_id_prefix=None, wait_interval=30):\n self._ml = MLEngineClient()\n self._project_id = project_id\n self._job_id_prefix = job_id_prefix\n self._job_id = None\n self._job = job\n self._wait_interval = wait_interval\n \n def execute_and_wait(self):\n with KfpExecutionContext(on_cancel=self._cancel) as ctx:\n self._set_job_id(ctx.context_id())\n self._dump_metadata()\n self._create_job()\n finished_job = self._wait_for_done()\n self._dump_job(finished_job)\n if finished_job['state'] != 'SUCCEEDED':\n raise RuntimeError('Job failed with state {}. Error: {}'.format(\n finished_job['state'], finished_job.get('errorMessage', '')))\n return finished_job\n\n def _set_job_id(self, context_id):\n if self._job_id_prefix:\n job_id = self._job_id_prefix + context_id[:16]\n else:\n job_id = 'job_' + context_id\n job_id = gcp_common.normalize_name(job_id)\n self._job_id = job_id\n self._job['jobId'] = job_id\n\n def _cancel(self):\n try:\n logging.info('Cancelling job {}.'.format(self._job_id))\n self._ml.cancel_job(self._project_id, self._job_id)\n logging.info('Cancelled job {}.'.format(self._job_id))\n except errors.HttpError as e:\n # Best effort to cancel the job\n logging.error('Failed to cancel the job: {}'.format(e))\n pass\n\n def _create_job(self):\n try:\n self._ml.create_job(\n project_id = self._project_id,\n job = self._job\n )\n except errors.HttpError as e:\n if e.resp.status == 409:\n if not self._is_dup_job():\n logging.error('Another job has been created with same name before: {}'.format(self._job_id))\n raise\n logging.info('The job {} has been submitted before. Continue waiting.'.format(self._job_id))\n else:\n logging.error('Failed to create job.\\nPayload: {}\\nError: {}'.format(self._job, e))\n raise\n\n def _is_dup_job(self):\n existing_job = self._ml.get_job(self._project_id, self._job_id)\n return existing_job.get('trainingInput', None) == self._job.get('trainingInput', None) \\\n and existing_job.get('predictionInput', None) == self._job.get('predictionInput', None)\n\n def _wait_for_done(self):\n while True:\n job = self._ml.get_job(self._project_id, self._job_id)\n if job.get('state', None) in ['SUCCEEDED', 'FAILED', 'CANCELLED']:\n return job\n # Move to config from flag\n logging.info('job status is {}, wait for {}s'.format(\n job.get('state', None), self._wait_interval))\n time.sleep(self._wait_interval)\n\n def _dump_metadata(self):\n display.display(display.Link(\n 'https://console.cloud.google.com/mlengine/jobs/{}?project={}'.format(\n self._job_id, self._project_id),\n 'Job Details'\n ))\n display.display(display.Link(\n 'https://console.cloud.google.com/logs/viewer?project={}&resource=ml_job/job_id/{}&interval=NO_LIMIT'.format(\n self._project_id, self._job_id),\n 'Logs'\n ))\n if 'trainingInput' in self._job and 'jobDir' in self._job['trainingInput']:\n display.display(display.Tensorboard(\n self._job['trainingInput']['jobDir']))\n\n def _dump_job(self, job):\n logging.info('Dumping job: {}'.format(job))\n gcp_common.dump_file('/tmp/kfp/output/ml_engine/job.json', json.dumps(job))\n gcp_common.dump_file('/tmp/kfp/output/ml_engine/job_id.txt', job['jobId'])\n if 'trainingInput' in job and 'jobDir' in job['trainingInput']:\n gcp_common.dump_file('/tmp/kfp/output/ml_engine/job_dir.txt', \n job['trainingInput']['jobDir'])\n", "path": "component_sdk/python/kfp_component/google/ml_engine/_create_job.py"}]}
| 2,204 | 223 |
gh_patches_debug_28239
|
rasdani/github-patches
|
git_diff
|
aws__aws-cli-310
|
You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
aws_completer lists currently unsupported services (emr)
I was playing with aws-cli today and I am using the bash completion:
```
complete -C aws_completer aws
aws em<tab>
```
completes to `aws emr`
Hitting `<tab>` again causes
```
$ aws emr Traceback (most recent call last):
File "/usr/local/bin/aws_completer", line 22, in <module>
awscli.completer.complete(cline, cpoint)
File "/usr/local/lib/python2.7/dist-packages/awscli/completer.py", line 153, in complete
choices = Completer().complete(cmdline, point)
File "/usr/local/lib/python2.7/dist-packages/awscli/completer.py", line 142, in complete
self._process_command_line()
File "/usr/local/lib/python2.7/dist-packages/awscli/completer.py", line 126, in _process_command_line
if self.command_hc.command_table:
AttributeError: 'NoneType' object has no attribute 'command_table'
```
I guess the answer is to filter out non-supported services in the completer.
</issue>
<code>
[start of awscli/completer.py]
1 # Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2 # Licensed under the Apache License, Version 2.0 (the "License"). You
3 # may not use this file except in compliance with the License. A copy of
4 # the License is located at
5
6 # http://aws.amazon.com/apache2.0/
7
8 # or in the "license" file accompanying this file. This file is
9 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
10 # ANY KIND, either express or implied. See the License for the specific
11 # language governing permissions and limitations under the License.
12 import awscli.clidriver
13 import sys
14 import logging
15 import copy
16
17 LOG = logging.getLogger(__name__)
18
19
20 class Completer(object):
21
22 def __init__(self):
23 self.driver = awscli.clidriver.create_clidriver()
24 self.main_hc = self.driver.create_help_command()
25 self.main_options = [n for n in self.main_hc.arg_table]
26 self.cmdline = None
27 self.point = None
28 self.command_hc = None
29 self.subcommand_hc = None
30 self.command_name = None
31 self.subcommand_name = None
32 self.current_word = None
33 self.previous_word = None
34 self.non_options = None
35
36 def _complete_option(self, option_name):
37 if option_name == '--region':
38 return self.driver.session.get_data('aws/_regions').keys()
39 if option_name == '--endpoint-url':
40 return []
41 if option_name == '--output':
42 cli_data = self.driver.session.get_data('cli')
43 return cli_data['options']['output']['choices']
44 if option_name == '--profile':
45 return self.driver.session.available_profiles
46 return []
47
48 def _complete_provider(self):
49 retval = []
50 if self.current_word.startswith('-'):
51 cw = self.current_word.lstrip('-')
52 l = ['--' + n for n in self.main_options
53 if n.startswith(cw)]
54 retval = l
55 elif self.current_word == 'aws':
56 retval = self.main_hc.command_table.keys()
57 else:
58 # Otherwise, see if they have entered a partial command name
59 retval = [n for n in self.main_hc.command_table
60 if n.startswith(self.current_word)]
61 return retval
62
63 def _complete_command(self):
64 retval = []
65 if self.current_word == self.command_name:
66 retval = self.command_hc.command_table.keys()
67 elif self.current_word.startswith('-'):
68 retval = self._find_possible_options()
69 else:
70 # See if they have entered a partial command name
71 retval = [n for n in self.command_hc.command_table
72 if n.startswith(self.current_word)]
73 return retval
74
75 def _complete_subcommand(self):
76 retval = []
77 if self.current_word == self.subcommand_name:
78 retval = []
79 elif self.current_word.startswith('-'):
80 retval = self._find_possible_options()
81 return retval
82
83 def _find_possible_options(self):
84 all_options = copy.copy(self.main_options)
85 if self.subcommand_hc:
86 all_options = all_options + list(self.subcommand_hc.arg_table.keys())
87 for opt in self.options:
88 # Look thru list of options on cmdline. If there are
89 # options that have already been specified and they are
90 # not the current word, remove them from list of possibles.
91 if opt != self.current_word:
92 stripped_opt = opt.lstrip('-')
93 if stripped_opt in all_options:
94 all_options.remove(stripped_opt)
95 cw = self.current_word.lstrip('-')
96 possibles = ['--' + n for n in all_options if n.startswith(cw)]
97 if len(possibles) == 1 and possibles[0] == self.current_word:
98 return self._complete_option(possibles[0])
99 return possibles
100
101 def _process_command_line(self):
102 # Process the command line and try to find:
103 # - command_name
104 # - subcommand_name
105 # - words
106 # - current_word
107 # - previous_word
108 # - non_options
109 # - options
110 self.command_name = None
111 self.subcommand_name = None
112 self.words = self.cmdline[0:self.point].split()
113 self.current_word = self.words[-1]
114 if len(self.words) >= 2:
115 self.previous_word = self.words[-2]
116 else:
117 self.previous_word = None
118 self.non_options = [w for w in self.words if not w.startswith('-')]
119 self.options = [w for w in self.words if w.startswith('-')]
120 # Look for a command name in the non_options
121 for w in self.non_options:
122 if w in self.main_hc.command_table:
123 self.command_name = w
124 cmd_obj = self.main_hc.command_table[self.command_name]
125 self.command_hc = cmd_obj.create_help_command()
126 if self.command_hc.command_table:
127 # Look for subcommand name
128 for w in self.non_options:
129 if w in self.command_hc.command_table:
130 self.subcommand_name = w
131 cmd_obj = self.command_hc.command_table[self.subcommand_name]
132 self.subcommand_hc = cmd_obj.create_help_command()
133 break
134 break
135
136 def complete(self, cmdline, point):
137 self.cmdline = cmdline
138 self.command_name = None
139 if point is None:
140 point = len(cmdline)
141 self.point = point
142 self._process_command_line()
143 if not self.command_name:
144 # If we didn't find any command names in the cmdline
145 # lets try to complete provider options
146 return self._complete_provider()
147 if self.command_name and not self.subcommand_name:
148 return self._complete_command()
149 return self._complete_subcommand()
150
151
152 def complete(cmdline, point):
153 choices = Completer().complete(cmdline, point)
154 print(' \n'.join(choices))
155
156
157 if __name__ == '__main__':
158 if len(sys.argv) == 3:
159 cmdline = sys.argv[1]
160 point = int(sys.argv[2])
161 elif len(sys.argv) == 2:
162 cmdline = sys.argv[1]
163 else:
164 print('usage: %s <cmdline> <point>' % sys.argv[0])
165 sys.exit(1)
166 print(complete(cmdline, point))
167
[end of awscli/completer.py]
</code>
I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
<patch>
diff --git a/file.py b/file.py
--- a/file.py
+++ b/file.py
@@ -1,27 +1,35 @@
def euclidean(a, b):
- while b:
- a, b = b, a % b
- return a
+ if b == 0:
+ return a
+ return euclidean(b, a % b)
def bresenham(x0, y0, x1, y1):
points = []
dx = abs(x1 - x0)
dy = abs(y1 - y0)
- sx = 1 if x0 < x1 else -1
- sy = 1 if y0 < y1 else -1
- err = dx - dy
+ x, y = x0, y0
+ sx = -1 if x0 > x1 else 1
+ sy = -1 if y0 > y1 else 1
- while True:
- points.append((x0, y0))
- if x0 == x1 and y0 == y1:
- break
- e2 = 2 * err
- if e2 > -dy:
- err -= dy
- x0 += sx
- if e2 < dx:
- err += dx
- y0 += sy
+ if dx > dy:
+ err = dx / 2.0
+ while x != x1:
+ points.append((x, y))
+ err -= dy
+ if err < 0:
+ y += sy
+ err += dx
+ x += sx
+ else:
+ err = dy / 2.0
+ while y != y1:
+ points.append((x, y))
+ err -= dx
+ if err < 0:
+ x += sx
+ err += dy
+ y += sy
+
+ points.append((x, y))
return points
</patch>
|
diff --git a/awscli/completer.py b/awscli/completer.py
--- a/awscli/completer.py
+++ b/awscli/completer.py
@@ -63,13 +63,15 @@
def _complete_command(self):
retval = []
if self.current_word == self.command_name:
- retval = self.command_hc.command_table.keys()
+ if self.command_hc:
+ retval = self.command_hc.command_table.keys()
elif self.current_word.startswith('-'):
retval = self._find_possible_options()
else:
# See if they have entered a partial command name
- retval = [n for n in self.command_hc.command_table
- if n.startswith(self.current_word)]
+ if self.command_hc:
+ retval = [n for n in self.command_hc.command_table
+ if n.startswith(self.current_word)]
return retval
def _complete_subcommand(self):
@@ -123,7 +125,7 @@
self.command_name = w
cmd_obj = self.main_hc.command_table[self.command_name]
self.command_hc = cmd_obj.create_help_command()
- if self.command_hc.command_table:
+ if self.command_hc and self.command_hc.command_table:
# Look for subcommand name
for w in self.non_options:
if w in self.command_hc.command_table:
|
{"golden_diff": "diff --git a/awscli/completer.py b/awscli/completer.py\n--- a/awscli/completer.py\n+++ b/awscli/completer.py\n@@ -63,13 +63,15 @@\n def _complete_command(self):\n retval = []\n if self.current_word == self.command_name:\n- retval = self.command_hc.command_table.keys()\n+ if self.command_hc:\n+ retval = self.command_hc.command_table.keys()\n elif self.current_word.startswith('-'):\n retval = self._find_possible_options()\n else:\n # See if they have entered a partial command name\n- retval = [n for n in self.command_hc.command_table\n- if n.startswith(self.current_word)]\n+ if self.command_hc:\n+ retval = [n for n in self.command_hc.command_table\n+ if n.startswith(self.current_word)]\n return retval\n \n def _complete_subcommand(self):\n@@ -123,7 +125,7 @@\n self.command_name = w\n cmd_obj = self.main_hc.command_table[self.command_name]\n self.command_hc = cmd_obj.create_help_command()\n- if self.command_hc.command_table:\n+ if self.command_hc and self.command_hc.command_table:\n # Look for subcommand name\n for w in self.non_options:\n if w in self.command_hc.command_table:\n", "issue": "aws_completer lists currently unsupported services (emr)\nI was playing with aws-cli today and I am using the bash completion:\n\n```\ncomplete -C aws_completer aws\naws em<tab>\n```\n\ncompletes to `aws emr`\n\nHitting `<tab>` again causes\n\n```\n$ aws emr Traceback (most recent call last):\n File \"/usr/local/bin/aws_completer\", line 22, in <module>\n awscli.completer.complete(cline, cpoint)\n File \"/usr/local/lib/python2.7/dist-packages/awscli/completer.py\", line 153, in complete\n choices = Completer().complete(cmdline, point)\n File \"/usr/local/lib/python2.7/dist-packages/awscli/completer.py\", line 142, in complete\n self._process_command_line()\n File \"/usr/local/lib/python2.7/dist-packages/awscli/completer.py\", line 126, in _process_command_line\n if self.command_hc.command_table:\nAttributeError: 'NoneType' object has no attribute 'command_table'\n```\n\nI guess the answer is to filter out non-supported services in the completer.\n\n", "before_files": [{"content": "# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n# Licensed under the Apache License, Version 2.0 (the \"License\"). You\n# may not use this file except in compliance with the License. A copy of\n# the License is located at\n\n# http://aws.amazon.com/apache2.0/\n\n# or in the \"license\" file accompanying this file. This file is\n# distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF\n# ANY KIND, either express or implied. See the License for the specific\n# language governing permissions and limitations under the License.\nimport awscli.clidriver\nimport sys\nimport logging\nimport copy\n\nLOG = logging.getLogger(__name__)\n\n\nclass Completer(object):\n\n def __init__(self):\n self.driver = awscli.clidriver.create_clidriver()\n self.main_hc = self.driver.create_help_command()\n self.main_options = [n for n in self.main_hc.arg_table]\n self.cmdline = None\n self.point = None\n self.command_hc = None\n self.subcommand_hc = None\n self.command_name = None\n self.subcommand_name = None\n self.current_word = None\n self.previous_word = None\n self.non_options = None\n\n def _complete_option(self, option_name):\n if option_name == '--region':\n return self.driver.session.get_data('aws/_regions').keys()\n if option_name == '--endpoint-url':\n return []\n if option_name == '--output':\n cli_data = self.driver.session.get_data('cli')\n return cli_data['options']['output']['choices']\n if option_name == '--profile':\n return self.driver.session.available_profiles\n return []\n\n def _complete_provider(self):\n retval = []\n if self.current_word.startswith('-'):\n cw = self.current_word.lstrip('-')\n l = ['--' + n for n in self.main_options\n if n.startswith(cw)]\n retval = l\n elif self.current_word == 'aws':\n retval = self.main_hc.command_table.keys()\n else:\n # Otherwise, see if they have entered a partial command name\n retval = [n for n in self.main_hc.command_table\n if n.startswith(self.current_word)]\n return retval\n\n def _complete_command(self):\n retval = []\n if self.current_word == self.command_name:\n retval = self.command_hc.command_table.keys()\n elif self.current_word.startswith('-'):\n retval = self._find_possible_options()\n else:\n # See if they have entered a partial command name\n retval = [n for n in self.command_hc.command_table\n if n.startswith(self.current_word)]\n return retval\n\n def _complete_subcommand(self):\n retval = []\n if self.current_word == self.subcommand_name:\n retval = []\n elif self.current_word.startswith('-'):\n retval = self._find_possible_options()\n return retval\n\n def _find_possible_options(self):\n all_options = copy.copy(self.main_options)\n if self.subcommand_hc:\n all_options = all_options + list(self.subcommand_hc.arg_table.keys())\n for opt in self.options:\n # Look thru list of options on cmdline. If there are\n # options that have already been specified and they are\n # not the current word, remove them from list of possibles.\n if opt != self.current_word:\n stripped_opt = opt.lstrip('-')\n if stripped_opt in all_options:\n all_options.remove(stripped_opt)\n cw = self.current_word.lstrip('-')\n possibles = ['--' + n for n in all_options if n.startswith(cw)]\n if len(possibles) == 1 and possibles[0] == self.current_word:\n return self._complete_option(possibles[0])\n return possibles\n\n def _process_command_line(self):\n # Process the command line and try to find:\n # - command_name\n # - subcommand_name\n # - words\n # - current_word\n # - previous_word\n # - non_options\n # - options\n self.command_name = None\n self.subcommand_name = None\n self.words = self.cmdline[0:self.point].split()\n self.current_word = self.words[-1]\n if len(self.words) >= 2:\n self.previous_word = self.words[-2]\n else:\n self.previous_word = None\n self.non_options = [w for w in self.words if not w.startswith('-')]\n self.options = [w for w in self.words if w.startswith('-')]\n # Look for a command name in the non_options\n for w in self.non_options:\n if w in self.main_hc.command_table:\n self.command_name = w\n cmd_obj = self.main_hc.command_table[self.command_name]\n self.command_hc = cmd_obj.create_help_command()\n if self.command_hc.command_table:\n # Look for subcommand name\n for w in self.non_options:\n if w in self.command_hc.command_table:\n self.subcommand_name = w\n cmd_obj = self.command_hc.command_table[self.subcommand_name]\n self.subcommand_hc = cmd_obj.create_help_command()\n break\n break\n\n def complete(self, cmdline, point):\n self.cmdline = cmdline\n self.command_name = None\n if point is None:\n point = len(cmdline)\n self.point = point\n self._process_command_line()\n if not self.command_name:\n # If we didn't find any command names in the cmdline\n # lets try to complete provider options\n return self._complete_provider()\n if self.command_name and not self.subcommand_name:\n return self._complete_command()\n return self._complete_subcommand()\n\n\ndef complete(cmdline, point):\n choices = Completer().complete(cmdline, point)\n print(' \\n'.join(choices))\n\n\nif __name__ == '__main__':\n if len(sys.argv) == 3:\n cmdline = sys.argv[1]\n point = int(sys.argv[2])\n elif len(sys.argv) == 2:\n cmdline = sys.argv[1]\n else:\n print('usage: %s <cmdline> <point>' % sys.argv[0])\n sys.exit(1)\n print(complete(cmdline, point))\n", "path": "awscli/completer.py"}]}
| 2,576 | 304 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.