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_18968 | rasdani/github-patches | git_diff | litestar-org__litestar-1676 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
StaticFilesConfig and virtual directories
I'm trying to write a ``FileSystemProtocol`` to load files from the package data using [importlib_resources](https://importlib-resources.readthedocs.io/en/latest/using.html#). But because ``directories`` is defined as ``DirectoryPath``, pydantic checks if the given directories exist in the local filesystem.
This is not generally true, especially in any kind of virtual filesystem (e.g. a zipped package). I think this condition should be relaxed to support virtual filesystems.
https://github.com/starlite-api/starlite/blob/9bb6dcd57c10a591377cf8e3a537e9292566d5b9/starlite/config/static_files.py#L32
</issue>
<code>
[start of litestar/contrib/sqlalchemy/types.py]
1 from __future__ import annotations
2
3 import uuid
4 from typing import TYPE_CHECKING, Any, cast
5
6 from sqlalchemy.dialects.postgresql import JSONB as PG_JSONB
7 from sqlalchemy.dialects.postgresql import UUID as PG_UUID
8 from sqlalchemy.types import BINARY, CHAR, BigInteger, Integer, TypeDecorator
9 from sqlalchemy.types import JSON as _JSON
10
11 if TYPE_CHECKING:
12 from sqlalchemy.engine import Dialect
13
14 BigIntIdentity = BigInteger().with_variant(Integer, "sqlite")
15 """Platform-independent BigInteger Primary Key.
16
17 User a Big Integer on engines that support it.
18
19 Uses Integer for sqlite since there is no
20
21 """
22
23
24 class GUID(TypeDecorator):
25 """Platform-independent GUID type.
26
27 Uses PostgreSQL's UUID type, otherwise uses
28 BINARY(16) or CHAR(32), storing as stringified hex values.
29
30 Will accept stringified UUIDs as a hexstring or an actual UUID
31
32 """
33
34 impl = BINARY(16)
35 cache_ok = True
36 python_type = type(uuid.UUID)
37
38 def __init__(self, binary: bool = True) -> None:
39 self.binary = binary
40
41 def load_dialect_impl(self, dialect: Dialect) -> Any:
42 if dialect.name == "postgresql":
43 return dialect.type_descriptor(PG_UUID())
44 if self.binary:
45 return dialect.type_descriptor(BINARY(16))
46 return dialect.type_descriptor(CHAR(32))
47
48 def process_bind_param(self, value: bytes | str | uuid.UUID | None, dialect: Dialect) -> bytes | str | None:
49 if value is None:
50 return value
51 if dialect.name == "postgresql":
52 return str(value)
53 value = self.to_uuid(value)
54 if value is None:
55 return value
56 return value.bytes if self.binary else value.hex
57
58 def process_result_value(self, value: bytes | str | uuid.UUID | None, dialect: Dialect) -> uuid.UUID | None:
59 if value is None:
60 return value
61 if isinstance(value, uuid.UUID):
62 return value
63 if self.binary:
64 return uuid.UUID(bytes=cast("bytes", value))
65 return uuid.UUID(hex=cast("str", value))
66
67 @staticmethod
68 def to_uuid(value: Any) -> uuid.UUID | None:
69 if isinstance(value, uuid.UUID) or value is None:
70 return value
71 try:
72 value = uuid.UUID(hex=value)
73 except (TypeError, ValueError):
74 value = uuid.UUID(bytes=value)
75 return cast("uuid.UUID | None", value)
76
77
78 class JSON(_JSON):
79 """Platform-independent JSON type.
80
81 Uses JSONB type for postgres, otherwise uses the generic JSON data type.
82 """
83
84 def load_dialect_impl(self, dialect: Dialect) -> Any:
85 if dialect.name == "postgresql":
86 return dialect.type_descriptor(PG_JSONB()) # type: ignore[no-untyped-call]
87 return dialect.type_descriptor(_JSON())
88
[end of litestar/contrib/sqlalchemy/types.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/litestar/contrib/sqlalchemy/types.py b/litestar/contrib/sqlalchemy/types.py
--- a/litestar/contrib/sqlalchemy/types.py
+++ b/litestar/contrib/sqlalchemy/types.py
@@ -35,7 +35,7 @@
cache_ok = True
python_type = type(uuid.UUID)
- def __init__(self, binary: bool = True) -> None:
+ def __init__(self, *args: Any, binary: bool = True, **kwargs: Any) -> None:
self.binary = binary
def load_dialect_impl(self, dialect: Dialect) -> Any:
@@ -75,13 +75,8 @@
return cast("uuid.UUID | None", value)
-class JSON(_JSON):
- """Platform-independent JSON type.
+JSON = _JSON().with_variant(PG_JSONB, "postgresql")
+"""Platform-independent JSON type.
Uses JSONB type for postgres, otherwise uses the generic JSON data type.
- """
-
- def load_dialect_impl(self, dialect: Dialect) -> Any:
- if dialect.name == "postgresql":
- return dialect.type_descriptor(PG_JSONB()) # type: ignore[no-untyped-call]
- return dialect.type_descriptor(_JSON())
+"""
| {"golden_diff": "diff --git a/litestar/contrib/sqlalchemy/types.py b/litestar/contrib/sqlalchemy/types.py\n--- a/litestar/contrib/sqlalchemy/types.py\n+++ b/litestar/contrib/sqlalchemy/types.py\n@@ -35,7 +35,7 @@\n cache_ok = True\n python_type = type(uuid.UUID)\n \n- def __init__(self, binary: bool = True) -> None:\n+ def __init__(self, *args: Any, binary: bool = True, **kwargs: Any) -> None:\n self.binary = binary\n \n def load_dialect_impl(self, dialect: Dialect) -> Any:\n@@ -75,13 +75,8 @@\n return cast(\"uuid.UUID | None\", value)\n \n \n-class JSON(_JSON):\n- \"\"\"Platform-independent JSON type.\n+JSON = _JSON().with_variant(PG_JSONB, \"postgresql\")\n+\"\"\"Platform-independent JSON type.\n \n Uses JSONB type for postgres, otherwise uses the generic JSON data type.\n- \"\"\"\n-\n- def load_dialect_impl(self, dialect: Dialect) -> Any:\n- if dialect.name == \"postgresql\":\n- return dialect.type_descriptor(PG_JSONB()) # type: ignore[no-untyped-call]\n- return dialect.type_descriptor(_JSON())\n+\"\"\"\n", "issue": "StaticFilesConfig and virtual directories\nI'm trying to write a ``FileSystemProtocol`` to load files from the package data using [importlib_resources](https://importlib-resources.readthedocs.io/en/latest/using.html#). But because ``directories`` is defined as ``DirectoryPath``, pydantic checks if the given directories exist in the local filesystem. \r\n\r\nThis is not generally true, especially in any kind of virtual filesystem (e.g. a zipped package). I think this condition should be relaxed to support virtual filesystems.\r\n\r\nhttps://github.com/starlite-api/starlite/blob/9bb6dcd57c10a591377cf8e3a537e9292566d5b9/starlite/config/static_files.py#L32\n", "before_files": [{"content": "from __future__ import annotations\n\nimport uuid\nfrom typing import TYPE_CHECKING, Any, cast\n\nfrom sqlalchemy.dialects.postgresql import JSONB as PG_JSONB\nfrom sqlalchemy.dialects.postgresql import UUID as PG_UUID\nfrom sqlalchemy.types import BINARY, CHAR, BigInteger, Integer, TypeDecorator\nfrom sqlalchemy.types import JSON as _JSON\n\nif TYPE_CHECKING:\n from sqlalchemy.engine import Dialect\n\nBigIntIdentity = BigInteger().with_variant(Integer, \"sqlite\")\n\"\"\"Platform-independent BigInteger Primary Key.\n\nUser a Big Integer on engines that support it.\n\nUses Integer for sqlite since there is no\n\n\"\"\"\n\n\nclass GUID(TypeDecorator):\n \"\"\"Platform-independent GUID type.\n\n Uses PostgreSQL's UUID type, otherwise uses\n BINARY(16) or CHAR(32), storing as stringified hex values.\n\n Will accept stringified UUIDs as a hexstring or an actual UUID\n\n \"\"\"\n\n impl = BINARY(16)\n cache_ok = True\n python_type = type(uuid.UUID)\n\n def __init__(self, binary: bool = True) -> None:\n self.binary = binary\n\n def load_dialect_impl(self, dialect: Dialect) -> Any:\n if dialect.name == \"postgresql\":\n return dialect.type_descriptor(PG_UUID())\n if self.binary:\n return dialect.type_descriptor(BINARY(16))\n return dialect.type_descriptor(CHAR(32))\n\n def process_bind_param(self, value: bytes | str | uuid.UUID | None, dialect: Dialect) -> bytes | str | None:\n if value is None:\n return value\n if dialect.name == \"postgresql\":\n return str(value)\n value = self.to_uuid(value)\n if value is None:\n return value\n return value.bytes if self.binary else value.hex\n\n def process_result_value(self, value: bytes | str | uuid.UUID | None, dialect: Dialect) -> uuid.UUID | None:\n if value is None:\n return value\n if isinstance(value, uuid.UUID):\n return value\n if self.binary:\n return uuid.UUID(bytes=cast(\"bytes\", value))\n return uuid.UUID(hex=cast(\"str\", value))\n\n @staticmethod\n def to_uuid(value: Any) -> uuid.UUID | None:\n if isinstance(value, uuid.UUID) or value is None:\n return value\n try:\n value = uuid.UUID(hex=value)\n except (TypeError, ValueError):\n value = uuid.UUID(bytes=value)\n return cast(\"uuid.UUID | None\", value)\n\n\nclass JSON(_JSON):\n \"\"\"Platform-independent JSON type.\n\n Uses JSONB type for postgres, otherwise uses the generic JSON data type.\n \"\"\"\n\n def load_dialect_impl(self, dialect: Dialect) -> Any:\n if dialect.name == \"postgresql\":\n return dialect.type_descriptor(PG_JSONB()) # type: ignore[no-untyped-call]\n return dialect.type_descriptor(_JSON())\n", "path": "litestar/contrib/sqlalchemy/types.py"}]} | 1,505 | 282 |
gh_patches_debug_14870 | rasdani/github-patches | git_diff | Zeroto521__my-data-toolkit-559 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
DEP: Drop `inplace` for `drop_inf`, no more `inplace`
<!--
Thanks for contributing a pull request!
Please follow these standard acronyms to start the commit message:
- ENH: enhancement
- BUG: bug fix
- DOC: documentation
- TYP: type annotations
- TST: addition or modification of tests
- MAINT: maintenance commit (refactoring, typos, etc.)
- BLD: change related to building
- REL: related to releasing
- API: an (incompatible) API change
- DEP: deprecate something, or remove a deprecated object
- DEV: development tool or utility
- REV: revert an earlier commit
- PERF: performance improvement
- BOT: always commit via a bot
- CI: related to CI or CD
- CLN: Code cleanup
-->
- [x] closes #531
- [x] whatsnew entry
No more `inplace` option.
</issue>
<code>
[start of dtoolkit/accessor/dataframe/drop_inf.py]
1 from __future__ import annotations
2
3 from typing import TYPE_CHECKING
4
5 import numpy as np
6 import pandas as pd
7 from pandas.util._validators import validate_bool_kwarg
8
9 from dtoolkit.accessor.dataframe import boolean # noqa
10 from dtoolkit.accessor.register import register_dataframe_method
11 from dtoolkit.accessor.series.drop_inf import get_inf_range
12 from dtoolkit.util._decorator import deprecated_kwargs
13
14
15 if TYPE_CHECKING:
16 from dtoolkit._typing import IntOrStr
17
18
19 @register_dataframe_method
20 @deprecated_kwargs(
21 "inplace",
22 message=(
23 "The keyword argument '{argument}' of '{func_name}' is deprecated and will "
24 "be removed in 0.0.17. (Warning added DToolKit 0.0.16)"
25 ),
26 )
27 def drop_inf(
28 df: pd.DataFrame,
29 axis: IntOrStr = 0,
30 how: str = "any",
31 inf: str = "all",
32 subset: list[str] = None,
33 inplace: bool = False,
34 ) -> pd.DataFrame | None:
35 """
36 Remove ``inf`` values.
37
38 Parameters
39 ----------
40 axis : {0 or 'index', 1 or 'columns'}, default 0
41 Determine if rows or columns which contain ``inf`` values are
42 removed.
43
44 * 0, or 'index' : Drop rows which contain ``inf`` values.
45 * 1, or 'columns' : Drop columns which contain ``inf`` value.
46
47 how : {'any', 'all'}, default 'any'
48 Determine if row or column is removed from :obj:`~pandas.DataFrame`,
49 when we have at least one ``inf`` or all ``inf``.
50
51 * 'any' : If any ``inf`` values are present, drop that row or column.
52 * 'all' : If all values are ``inf``, drop that row or column.
53
54 inf : {'all', 'pos', '+', 'neg', '-'}, default 'all'
55 * 'all' : Remove ``inf`` and ``-inf``.
56 * 'pos' / '+' : Only remove ``inf``.
57 * 'neg' / '-' : Only remove ``-inf``.
58
59 subset : array-like, optional
60 Labels along other axis to consider, e.g. if you are dropping rows
61 these would be a list of columns to include.
62
63 inplace : bool, default False
64 If True, do operation inplace and return None.
65
66 Returns
67 -------
68 DataFrame or None
69 DataFrame with ``inf`` entries dropped from it or None if
70 ``inplace=True``.
71
72 See Also
73 --------
74 dtoolkit.accessor.series.drop_inf
75 :obj:`~pandas.Series` drops ``inf`` values.
76
77 Examples
78 --------
79 >>> import dtoolkit.accessor
80 >>> import pandas as pd
81 >>> import numpy as np
82 >>> df = pd.DataFrame({"name": ['Alfred', 'Batman', 'Catwoman'],
83 ... "toy": [np.inf, 'Batmobile', 'Bullwhip'],
84 ... "born": [np.inf, pd.Timestamp("1940-04-25"),
85 ... -np.inf]})
86 >>> df
87 name toy born
88 0 Alfred inf inf
89 1 Batman Batmobile 1940-04-25 00:00:00
90 2 Catwoman Bullwhip -inf
91
92 Drop the rows where at least one element is inf and -inf.
93
94 >>> df.drop_inf()
95 name toy born
96 1 Batman Batmobile 1940-04-25 00:00:00
97
98 Drop the columns where at least one element is inf and -inf.
99
100 >>> df.drop_inf(axis='columns')
101 name
102 0 Alfred
103 1 Batman
104 2 Catwoman
105
106 Drop the rows where all elements are inf and -inf.
107
108 >>> df.drop_inf(how='all')
109 name toy born
110 0 Alfred inf inf
111 1 Batman Batmobile 1940-04-25 00:00:00
112 2 Catwoman Bullwhip -inf
113
114 Drop the rows where at least one element is -inf.
115
116 >>> df.drop_inf(inf='neg')
117 name toy born
118 0 Alfred inf inf
119 1 Batman Batmobile 1940-04-25 00:00:00
120
121 Define in which columns to look for inf and -inf values.
122
123 >>> df.drop_inf(subset=['name', 'toy'])
124 name toy born
125 1 Batman Batmobile 1940-04-25 00:00:00
126 2 Catwoman Bullwhip -inf
127
128 Keep the DataFrame with valid entries in the same variable.
129
130 >>> df.drop_inf(inplace=True)
131 >>> df
132 name toy born
133 1 Batman Batmobile 1940-04-25 00:00:00
134 """
135
136 inplace = validate_bool_kwarg(inplace, "inplace")
137 inf_range = get_inf_range(inf)
138 axis = df._get_axis_number(axis)
139 agg_axis = 1 - axis
140
141 agg_obj = df
142 if subset is not None:
143 ax = df._get_axis(agg_axis)
144 indices = ax.get_indexer_for(subset)
145 check = indices == -1
146 if check.any():
147 raise KeyError(list(np.compress(check, subset)))
148
149 agg_obj = df.take(indices, axis=agg_axis)
150
151 mask = agg_obj.isin(inf_range).boolean(how=how, axis=agg_axis)
152 result = df.loc(axis=axis)[~mask]
153
154 if not inplace:
155 return result
156
157 df._update_inplace(result)
158
[end of dtoolkit/accessor/dataframe/drop_inf.py]
[start of dtoolkit/accessor/series/drop_inf.py]
1 from __future__ import annotations
2
3 import numpy as np
4 import pandas as pd
5 from pandas.util._validators import validate_bool_kwarg
6
7 from dtoolkit.accessor.register import register_series_method
8 from dtoolkit.util._decorator import deprecated_kwargs
9
10
11 @register_series_method
12 @deprecated_kwargs(
13 "inplace",
14 message=(
15 "The keyword argument '{argument}' of '{func_name}' is deprecated and will "
16 "be removed in 0.0.17. (Warning added DToolKit 0.0.16)"
17 ),
18 )
19 def drop_inf(
20 s: pd.Series,
21 inf: str = "all",
22 inplace: bool = False,
23 ) -> pd.Series | None:
24 """
25 Remove ``inf`` values.
26
27 Parameters
28 ----------
29 inf : {'all', 'pos', '+', 'neg', '-'}, default 'all'
30
31 * 'all' : Remove ``inf`` and ``-inf``.
32 * 'pos' / '+' : Only remove ``inf``.
33 * 'neg' / '-' : Only remove ``-inf``.
34
35 inplace : bool, default False
36 If True, do operation inplace and return None.
37
38 Returns
39 -------
40 Series or None
41 Series with ``inf`` entries dropped from it or None if
42 ``inplace=True``.
43
44 See Also
45 --------
46 dtoolkit.accessor.dataframe.drop_inf
47 :obj:`~pandas.DataFrame` drops rows or columns which contain ``inf``
48 values.
49
50 Examples
51 --------
52 >>> import dtoolkit.accessor
53 >>> import pandas as pd
54 >>> import numpy as np
55 >>> s = pd.Series([1., 2., np.inf])
56 >>> s
57 0 1.0
58 1 2.0
59 2 inf
60 dtype: float64
61
62 Drop inf values from a Series.
63
64 >>> s.drop_inf()
65 0 1.0
66 1 2.0
67 dtype: float64
68
69 Keep the Series with valid entries in the same variable.
70
71 >>> s.drop_inf(inplace=True)
72 >>> s
73 0 1.0
74 1 2.0
75 dtype: float64
76 """
77
78 inplace = validate_bool_kwarg(inplace, "inplace")
79 inf_range = get_inf_range(inf)
80 mask = s.isin(inf_range)
81 result = s[~mask]
82
83 if not inplace:
84 return result
85
86 s._update_inplace(result)
87
88
89 def get_inf_range(inf: str = "all") -> list[float]:
90 """Get inf value from string"""
91
92 inf_range = {
93 "all": [np.inf, -np.inf],
94 "pos": [np.inf],
95 "+": [np.inf],
96 "neg": [-np.inf],
97 "-": [-np.inf],
98 }
99
100 if inf in inf_range:
101 return inf_range[inf]
102
103 raise ValueError(f"invalid inf option: {inf!r}")
104
[end of dtoolkit/accessor/series/drop_inf.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/dtoolkit/accessor/dataframe/drop_inf.py b/dtoolkit/accessor/dataframe/drop_inf.py
--- a/dtoolkit/accessor/dataframe/drop_inf.py
+++ b/dtoolkit/accessor/dataframe/drop_inf.py
@@ -63,6 +63,10 @@
inplace : bool, default False
If True, do operation inplace and return None.
+ .. deprecated:: 0.0.17
+ 'inplace' is deprecated and will be removed in 0.0.17.
+ (Warning added DToolKit 0.0.16)
+
Returns
-------
DataFrame or None
diff --git a/dtoolkit/accessor/series/drop_inf.py b/dtoolkit/accessor/series/drop_inf.py
--- a/dtoolkit/accessor/series/drop_inf.py
+++ b/dtoolkit/accessor/series/drop_inf.py
@@ -35,6 +35,10 @@
inplace : bool, default False
If True, do operation inplace and return None.
+ .. deprecated:: 0.0.17
+ 'inplace' is deprecated and will be removed in 0.0.17.
+ (Warning added DToolKit 0.0.16)
+
Returns
-------
Series or None
| {"golden_diff": "diff --git a/dtoolkit/accessor/dataframe/drop_inf.py b/dtoolkit/accessor/dataframe/drop_inf.py\n--- a/dtoolkit/accessor/dataframe/drop_inf.py\n+++ b/dtoolkit/accessor/dataframe/drop_inf.py\n@@ -63,6 +63,10 @@\n inplace : bool, default False\n If True, do operation inplace and return None.\n \n+ .. deprecated:: 0.0.17\n+ 'inplace' is deprecated and will be removed in 0.0.17.\n+ (Warning added DToolKit 0.0.16)\n+\n Returns\n -------\n DataFrame or None\ndiff --git a/dtoolkit/accessor/series/drop_inf.py b/dtoolkit/accessor/series/drop_inf.py\n--- a/dtoolkit/accessor/series/drop_inf.py\n+++ b/dtoolkit/accessor/series/drop_inf.py\n@@ -35,6 +35,10 @@\n inplace : bool, default False\n If True, do operation inplace and return None.\n \n+ .. deprecated:: 0.0.17\n+ 'inplace' is deprecated and will be removed in 0.0.17.\n+ (Warning added DToolKit 0.0.16)\n+\n Returns\n -------\n Series or None\n", "issue": "DEP: Drop `inplace` for `drop_inf`, no more `inplace`\n<!--\r\nThanks for contributing a pull request!\r\n\r\nPlease follow these standard acronyms to start the commit message:\r\n\r\n- ENH: enhancement\r\n- BUG: bug fix\r\n- DOC: documentation\r\n- TYP: type annotations\r\n- TST: addition or modification of tests\r\n- MAINT: maintenance commit (refactoring, typos, etc.)\r\n- BLD: change related to building\r\n- REL: related to releasing\r\n- API: an (incompatible) API change\r\n- DEP: deprecate something, or remove a deprecated object\r\n- DEV: development tool or utility\r\n- REV: revert an earlier commit\r\n- PERF: performance improvement\r\n- BOT: always commit via a bot\r\n- CI: related to CI or CD\r\n- CLN: Code cleanup\r\n-->\r\n\r\n- [x] closes #531\r\n- [x] whatsnew entry\r\n\r\nNo more `inplace` option.\n", "before_files": [{"content": "from __future__ import annotations\n\nfrom typing import TYPE_CHECKING\n\nimport numpy as np\nimport pandas as pd\nfrom pandas.util._validators import validate_bool_kwarg\n\nfrom dtoolkit.accessor.dataframe import boolean # noqa\nfrom dtoolkit.accessor.register import register_dataframe_method\nfrom dtoolkit.accessor.series.drop_inf import get_inf_range\nfrom dtoolkit.util._decorator import deprecated_kwargs\n\n\nif TYPE_CHECKING:\n from dtoolkit._typing import IntOrStr\n\n\n@register_dataframe_method\n@deprecated_kwargs(\n \"inplace\",\n message=(\n \"The keyword argument '{argument}' of '{func_name}' is deprecated and will \"\n \"be removed in 0.0.17. (Warning added DToolKit 0.0.16)\"\n ),\n)\ndef drop_inf(\n df: pd.DataFrame,\n axis: IntOrStr = 0,\n how: str = \"any\",\n inf: str = \"all\",\n subset: list[str] = None,\n inplace: bool = False,\n) -> pd.DataFrame | None:\n \"\"\"\n Remove ``inf`` values.\n\n Parameters\n ----------\n axis : {0 or 'index', 1 or 'columns'}, default 0\n Determine if rows or columns which contain ``inf`` values are\n removed.\n\n * 0, or 'index' : Drop rows which contain ``inf`` values.\n * 1, or 'columns' : Drop columns which contain ``inf`` value.\n\n how : {'any', 'all'}, default 'any'\n Determine if row or column is removed from :obj:`~pandas.DataFrame`,\n when we have at least one ``inf`` or all ``inf``.\n\n * 'any' : If any ``inf`` values are present, drop that row or column.\n * 'all' : If all values are ``inf``, drop that row or column.\n\n inf : {'all', 'pos', '+', 'neg', '-'}, default 'all'\n * 'all' : Remove ``inf`` and ``-inf``.\n * 'pos' / '+' : Only remove ``inf``.\n * 'neg' / '-' : Only remove ``-inf``.\n\n subset : array-like, optional\n Labels along other axis to consider, e.g. if you are dropping rows\n these would be a list of columns to include.\n\n inplace : bool, default False\n If True, do operation inplace and return None.\n\n Returns\n -------\n DataFrame or None\n DataFrame with ``inf`` entries dropped from it or None if\n ``inplace=True``.\n\n See Also\n --------\n dtoolkit.accessor.series.drop_inf\n :obj:`~pandas.Series` drops ``inf`` values.\n\n Examples\n --------\n >>> import dtoolkit.accessor\n >>> import pandas as pd\n >>> import numpy as np\n >>> df = pd.DataFrame({\"name\": ['Alfred', 'Batman', 'Catwoman'],\n ... \"toy\": [np.inf, 'Batmobile', 'Bullwhip'],\n ... \"born\": [np.inf, pd.Timestamp(\"1940-04-25\"),\n ... -np.inf]})\n >>> df\n name toy born\n 0 Alfred inf inf\n 1 Batman Batmobile 1940-04-25 00:00:00\n 2 Catwoman Bullwhip -inf\n\n Drop the rows where at least one element is inf and -inf.\n\n >>> df.drop_inf()\n name toy born\n 1 Batman Batmobile 1940-04-25 00:00:00\n\n Drop the columns where at least one element is inf and -inf.\n\n >>> df.drop_inf(axis='columns')\n name\n 0 Alfred\n 1 Batman\n 2 Catwoman\n\n Drop the rows where all elements are inf and -inf.\n\n >>> df.drop_inf(how='all')\n name toy born\n 0 Alfred inf inf\n 1 Batman Batmobile 1940-04-25 00:00:00\n 2 Catwoman Bullwhip -inf\n\n Drop the rows where at least one element is -inf.\n\n >>> df.drop_inf(inf='neg')\n name toy born\n 0 Alfred inf inf\n 1 Batman Batmobile 1940-04-25 00:00:00\n\n Define in which columns to look for inf and -inf values.\n\n >>> df.drop_inf(subset=['name', 'toy'])\n name toy born\n 1 Batman Batmobile 1940-04-25 00:00:00\n 2 Catwoman Bullwhip -inf\n\n Keep the DataFrame with valid entries in the same variable.\n\n >>> df.drop_inf(inplace=True)\n >>> df\n name toy born\n 1 Batman Batmobile 1940-04-25 00:00:00\n \"\"\"\n\n inplace = validate_bool_kwarg(inplace, \"inplace\")\n inf_range = get_inf_range(inf)\n axis = df._get_axis_number(axis)\n agg_axis = 1 - axis\n\n agg_obj = df\n if subset is not None:\n ax = df._get_axis(agg_axis)\n indices = ax.get_indexer_for(subset)\n check = indices == -1\n if check.any():\n raise KeyError(list(np.compress(check, subset)))\n\n agg_obj = df.take(indices, axis=agg_axis)\n\n mask = agg_obj.isin(inf_range).boolean(how=how, axis=agg_axis)\n result = df.loc(axis=axis)[~mask]\n\n if not inplace:\n return result\n\n df._update_inplace(result)\n", "path": "dtoolkit/accessor/dataframe/drop_inf.py"}, {"content": "from __future__ import annotations\n\nimport numpy as np\nimport pandas as pd\nfrom pandas.util._validators import validate_bool_kwarg\n\nfrom dtoolkit.accessor.register import register_series_method\nfrom dtoolkit.util._decorator import deprecated_kwargs\n\n\n@register_series_method\n@deprecated_kwargs(\n \"inplace\",\n message=(\n \"The keyword argument '{argument}' of '{func_name}' is deprecated and will \"\n \"be removed in 0.0.17. (Warning added DToolKit 0.0.16)\"\n ),\n)\ndef drop_inf(\n s: pd.Series,\n inf: str = \"all\",\n inplace: bool = False,\n) -> pd.Series | None:\n \"\"\"\n Remove ``inf`` values.\n\n Parameters\n ----------\n inf : {'all', 'pos', '+', 'neg', '-'}, default 'all'\n\n * 'all' : Remove ``inf`` and ``-inf``.\n * 'pos' / '+' : Only remove ``inf``.\n * 'neg' / '-' : Only remove ``-inf``.\n\n inplace : bool, default False\n If True, do operation inplace and return None.\n\n Returns\n -------\n Series or None\n Series with ``inf`` entries dropped from it or None if\n ``inplace=True``.\n\n See Also\n --------\n dtoolkit.accessor.dataframe.drop_inf\n :obj:`~pandas.DataFrame` drops rows or columns which contain ``inf``\n values.\n\n Examples\n --------\n >>> import dtoolkit.accessor\n >>> import pandas as pd\n >>> import numpy as np\n >>> s = pd.Series([1., 2., np.inf])\n >>> s\n 0 1.0\n 1 2.0\n 2 inf\n dtype: float64\n\n Drop inf values from a Series.\n\n >>> s.drop_inf()\n 0 1.0\n 1 2.0\n dtype: float64\n\n Keep the Series with valid entries in the same variable.\n\n >>> s.drop_inf(inplace=True)\n >>> s\n 0 1.0\n 1 2.0\n dtype: float64\n \"\"\"\n\n inplace = validate_bool_kwarg(inplace, \"inplace\")\n inf_range = get_inf_range(inf)\n mask = s.isin(inf_range)\n result = s[~mask]\n\n if not inplace:\n return result\n\n s._update_inplace(result)\n\n\ndef get_inf_range(inf: str = \"all\") -> list[float]:\n \"\"\"Get inf value from string\"\"\"\n\n inf_range = {\n \"all\": [np.inf, -np.inf],\n \"pos\": [np.inf],\n \"+\": [np.inf],\n \"neg\": [-np.inf],\n \"-\": [-np.inf],\n }\n\n if inf in inf_range:\n return inf_range[inf]\n\n raise ValueError(f\"invalid inf option: {inf!r}\")\n", "path": "dtoolkit/accessor/series/drop_inf.py"}]} | 3,363 | 300 |
gh_patches_debug_15850 | rasdani/github-patches | git_diff | translate__pootle-3503 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Pick the changes done in releasing docs in stable/2.6.0
</issue>
<code>
[start of docs/conf.py]
1 # -*- coding: utf-8 -*-
2 #
3 # This file is execfile()d with the current directory set to its containing
4 # dir.
5 #
6 # Note that not all possible configuration values are present in this
7 # autogenerated file.
8 #
9 # All configuration values have a default; values that are commented out
10 # serve to show the default.
11
12 import sys
13 import os
14
15 # If extensions (or modules to document with autodoc) are in another directory,
16 # add these directories to sys.path here. If the directory is relative to the
17 # documentation root, use os.path.abspath to make it absolute, like shown here.
18 #sys.path.insert(0, os.path.abspath('.'))
19
20 sys.path.insert(0, os.path.abspath('_ext'))
21 sys.path.insert(0, os.path.abspath('.'))
22
23 # -- General configuration ----------------------------------------------------
24
25 # If your documentation needs a minimal Sphinx version, state it here.
26 #needs_sphinx = '1.0'
27
28 # Add any Sphinx extension module names here, as strings. They can be
29 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
30 # ones.
31 extensions = ['jsonlexer', 'pootle_docs',
32 'sphinx.ext.extlinks', 'sphinx.ext.intersphinx']
33
34 # Add any paths that contain templates here, relative to this directory.
35 templates_path = ['_templates']
36
37 # The suffix of source filenames.
38 source_suffix = '.rst'
39
40 # The encoding of source files.
41 #source_encoding = 'utf-8-sig'
42
43 # The master toctree document.
44 master_doc = 'index'
45
46 # General information about the project.
47 project = u'Pootle'
48 copyright = u'2004-2014, Translate'
49
50 # The version info for the project you're documenting, acts as replacement for
51 # |version| and |release|, also used in various other places throughout the
52 # built documents.
53 #
54 # The short X.Y version.
55 version = '2.5.1'
56 # The full version, including alpha/beta/rc tags.
57 release = '2.5.1-alpha1'
58
59 # The language for content autogenerated by Sphinx. Refer to documentation
60 # for a list of supported languages.
61 #language = None
62
63 # There are two options for replacing |today|: either, you set today to some
64 # non-false value, then it is used:
65 #today = ''
66 # Else, today_fmt is used as the format for a strftime call.
67 #today_fmt = '%B %d, %Y'
68
69 # List of patterns, relative to source directory, that match files and
70 # directories to ignore when looking for source files.
71 exclude_patterns = ['_build', '_themes/README.rst', 'specs']
72
73 # The reST default role (used for this markup: `text`) to use for all
74 # documents.
75 #default_role = None
76
77 # If true, '()' will be appended to :func: etc. cross-reference text.
78 #add_function_parentheses = True
79
80 # If true, the current module name will be prepended to all description
81 # unit titles (such as .. function::).
82 #add_module_names = True
83
84 # If true, sectionauthor and moduleauthor directives will be shown in the
85 # output. They are ignored by default.
86 #show_authors = False
87
88 # The name of the Pygments (syntax highlighting) style to use.
89 pygments_style = 'sphinx'
90
91 # A list of ignored prefixes for module index sorting.
92 #modindex_common_prefix = []
93
94 # Build a refence icon.rst.inc files that we can include for inline
95 # icons.
96 import os
97
98 icons_dir = "../pootle/static/images/sprite"
99 icons_inc_file_name = "icons.rst.inc"
100 build_icons_inc = False
101
102 if not os.path.isfile(os.path.join(os.curdir, icons_inc_file_name)):
103 build_icons_inc = True
104 else:
105 icon_inc_mtime = os.stat(os.path.join(os.curdir,
106 icons_inc_file_name)).st_mtime
107 for icon_image in os.listdir(icons_dir):
108 if os.stat(os.path.join(icons_dir,
109 icon_image)).st_mtime > icon_inc_mtime:
110 build_icons_inc = True
111
112 if build_icons_inc:
113 icons_txt_file = open(icons_inc_file_name, "w")
114 for icon_image in os.listdir(icons_dir):
115 icon_name = icon_image[:icon_image.rfind(".")]
116 print >>icons_txt_file, ".. |icon:" + icon_name + "| " + \
117 "image:: /" + icons_dir + "/" + icon_image
118 print >>icons_txt_file, " :alt: " + \
119 icon_name.replace("-", " ").replace("_", " ") + \
120 " icon"
121 print >>icons_txt_file
122 icons_txt_file.close()
123
124 # Files to include at the end of every .rst file
125 rst_epilog = """
126 .. include:: /%s
127 """ % icons_inc_file_name
128
129
130 # -- Options for HTML output --------------------------------------------------
131
132 # The theme to use for HTML and HTML Help pages. See the documentation for
133 # a list of builtin themes.
134 html_theme = 'sphinx-bootstrap'
135
136 # Theme options are theme-specific and customize the look and feel of a theme
137 # further. For a list of options available for each theme, see the
138 # documentation.
139 html_theme_options = {
140 'nosidebar': True,
141 'link_color': '#489b7',
142 'link_color_hover': '#489b7',
143 }
144
145 # Add any paths that contain custom themes here, relative to this directory.
146 html_theme_path = ['_themes']
147
148 # The name for this set of Sphinx documents. If None, it defaults to
149 # "<project> v<release> documentation".
150 #html_title = None
151
152 # A shorter title for the navigation bar. Default is the same as html_title.
153 #html_short_title = None
154
155 # The name of an image file (relative to this directory) to place at the top
156 # of the sidebar.
157 html_logo = '_static/pootle_logo.png'
158
159 # The name of an image file (within the static path) to use as favicon of the
160 # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
161 # pixels large.
162 html_favicon = '../pootle/static/favicon.ico'
163
164 # Add any paths that contain custom static files (such as style sheets) here,
165 # relative to this directory. They are copied after the builtin static files,
166 # so a file named "default.css" will overwrite the builtin "default.css".
167 html_static_path = ['_static']
168
169 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
170 # using the given strftime format.
171 #html_last_updated_fmt = '%b %d, %Y'
172
173 # If true, SmartyPants will be used to convert quotes and dashes to
174 # typographically correct entities.
175 #html_use_smartypants = True
176
177 # Custom sidebar templates, maps document names to template names.
178 #html_sidebars = {}
179
180 # Additional templates that should be rendered to pages, maps page names to
181 # template names.
182 #html_additional_pages = {}
183
184 # If false, no module index is generated.
185 html_domain_indices = False
186
187 # If false, no index is generated.
188 #html_use_index = True
189
190 # If true, the index is split into individual pages for each letter.
191 #html_split_index = False
192
193 # If true, links to the reST sources are added to the pages.
194 html_show_sourcelink = False
195
196 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
197 #html_show_sphinx = True
198
199 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
200 #html_show_copyright = True
201
202 # If true, an OpenSearch description file will be output, and all pages will
203 # contain a <link> tag referring to it. The value of this option must be the
204 # base URL from which the finished HTML is served.
205 #html_use_opensearch = ''
206
207 # This is the file name suffix for HTML files (e.g. ".xhtml").
208 #html_file_suffix = None
209
210 # Output file base name for HTML help builder.
211 htmlhelp_basename = 'Pootledoc'
212
213
214 # -- Options for LaTeX output -------------------------------------------------
215
216 latex_elements = {
217 # The paper size ('letterpaper' or 'a4paper').
218 #'papersize': 'letterpaper',
219
220 # The font size ('10pt', '11pt' or '12pt').
221 #'pointsize': '10pt',
222
223 # Additional stuff for the LaTeX preamble.
224 #'preamble': '',
225 }
226
227 # Grouping the document tree into LaTeX files. List of tuples
228 # (source start file, target name, title, author, documentclass [howto/manual])
229 latex_documents = [
230 ('index', 'Pootle.tex', u'Pootle Documentation',
231 u'Translate.org.za', 'manual'),
232 ]
233
234 # The name of an image file (relative to this directory) to place at the top of
235 # the title page.
236 #latex_logo = None
237
238 # For "manual" documents, if this is true, then toplevel headings are parts,
239 # not chapters.
240 #latex_use_parts = False
241
242 # If true, show page references after internal links.
243 #latex_show_pagerefs = False
244
245 # If true, show URL addresses after external links.
246 #latex_show_urls = False
247
248 # Documents to append as an appendix to all manuals.
249 #latex_appendices = []
250
251 # If false, no module index is generated.
252 #latex_domain_indices = True
253
254
255 # -- Options for manual page output -------------------------------------------
256
257 # One entry per manual page. List of tuples
258 # (source start file, name, description, authors, manual section).
259 man_pages = [
260 ('index', 'pootle', u'Pootle Documentation',
261 [u'Translate.org.za'], 1)
262 ]
263
264 # If true, show URL addresses after external links.
265 #man_show_urls = False
266
267
268 # -- Options for Texinfo output -----------------------------------------------
269
270 # Grouping the document tree into Texinfo files. List of tuples
271 # (source start file, target name, title, author,
272 # dir menu entry, description, category)
273 texinfo_documents = [
274 ('index', 'Pootle', u'Pootle Documentation',
275 u'Translate.org.za', 'Pootle', 'Online translation tool.',
276 'Miscellaneous'),
277 ]
278
279 # Documents to append as an appendix to all manuals.
280 #texinfo_appendices = []
281
282 # If false, no module index is generated.
283 #texinfo_domain_indices = True
284
285 # How to display URL addresses: 'footnote', 'no', or 'inline'.
286 #texinfo_show_urls = 'footnote'
287
288
289 # -- Options for Intersphinx -------------------------------------------------
290
291 intersphinx_mapping = {
292 'python': ('https://docs.python.org/2.7', None),
293 'django': ('https://docs.djangoproject.com/en/dev',
294 'https://docs.djangoproject.com/en/dev/_objects'),
295 'toolkit': ('http://docs.translatehouse.org/projects/translate-toolkit/en/latest/', None),
296 'south': ('https://south.readthedocs.org/en/latest/', None),
297 'tastypie': ('https://django-tastypie.readthedocs.org/en/latest/', None),
298 }
299
300
301 # -- Options for External links -------------------------------------------------
302
303 extlinks = {
304 # :role: (URL, prefix)
305 'bug': ('http://bugs.locamotion.org/show_bug.cgi?id=%s', 'bug '),
306 'man': ('http://linux.die.net/man/1/%s', ''),
307 'wiki': ('http://translate.sourceforge.net/wiki/%s', ''),
308 'wp': ('https://en.wikipedia.org/wiki/%s', ''),
309 }
310
311 # -- Options for Gettext -------------------------------------------------
312
313 locale_dirs = ["_translations/"]
314 gettext_compact = False
315
[end of docs/conf.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/docs/conf.py b/docs/conf.py
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -45,16 +45,16 @@
# General information about the project.
project = u'Pootle'
-copyright = u'2004-2014, Translate'
+copyright = u'2004-2015, Translate'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-version = '2.5.1'
+version = '2.7.0'
# The full version, including alpha/beta/rc tags.
-release = '2.5.1-alpha1'
+release = '2.7.0-alpha1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
| {"golden_diff": "diff --git a/docs/conf.py b/docs/conf.py\n--- a/docs/conf.py\n+++ b/docs/conf.py\n@@ -45,16 +45,16 @@\n \n # General information about the project.\n project = u'Pootle'\n-copyright = u'2004-2014, Translate'\n+copyright = u'2004-2015, Translate'\n \n # The version info for the project you're documenting, acts as replacement for\n # |version| and |release|, also used in various other places throughout the\n # built documents.\n #\n # The short X.Y version.\n-version = '2.5.1'\n+version = '2.7.0'\n # The full version, including alpha/beta/rc tags.\n-release = '2.5.1-alpha1'\n+release = '2.7.0-alpha1'\n \n # The language for content autogenerated by Sphinx. Refer to documentation\n # for a list of supported languages.\n", "issue": "Pick the changes done in releasing docs in stable/2.6.0\n\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n#\n# This file is execfile()d with the current directory set to its containing\n# dir.\n#\n# Note that not all possible configuration values are present in this\n# autogenerated file.\n#\n# All configuration values have a default; values that are commented out\n# serve to show the default.\n\nimport sys\nimport os\n\n# If extensions (or modules to document with autodoc) are in another directory,\n# add these directories to sys.path here. If the directory is relative to the\n# documentation root, use os.path.abspath to make it absolute, like shown here.\n#sys.path.insert(0, os.path.abspath('.'))\n\nsys.path.insert(0, os.path.abspath('_ext'))\nsys.path.insert(0, os.path.abspath('.'))\n\n# -- General configuration ----------------------------------------------------\n\n# If your documentation needs a minimal Sphinx version, state it here.\n#needs_sphinx = '1.0'\n\n# Add any Sphinx extension module names here, as strings. They can be\n# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom\n# ones.\nextensions = ['jsonlexer', 'pootle_docs',\n 'sphinx.ext.extlinks', 'sphinx.ext.intersphinx']\n\n# Add any paths that contain templates here, relative to this directory.\ntemplates_path = ['_templates']\n\n# The suffix of source filenames.\nsource_suffix = '.rst'\n\n# The encoding of source files.\n#source_encoding = 'utf-8-sig'\n\n# The master toctree document.\nmaster_doc = 'index'\n\n# General information about the project.\nproject = u'Pootle'\ncopyright = u'2004-2014, Translate'\n\n# The version info for the project you're documenting, acts as replacement for\n# |version| and |release|, also used in various other places throughout the\n# built documents.\n#\n# The short X.Y version.\nversion = '2.5.1'\n# The full version, including alpha/beta/rc tags.\nrelease = '2.5.1-alpha1'\n\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n#language = None\n\n# There are two options for replacing |today|: either, you set today to some\n# non-false value, then it is used:\n#today = ''\n# Else, today_fmt is used as the format for a strftime call.\n#today_fmt = '%B %d, %Y'\n\n# List of patterns, relative to source directory, that match files and\n# directories to ignore when looking for source files.\nexclude_patterns = ['_build', '_themes/README.rst', 'specs']\n\n# The reST default role (used for this markup: `text`) to use for all\n# documents.\n#default_role = None\n\n# If true, '()' will be appended to :func: etc. cross-reference text.\n#add_function_parentheses = True\n\n# If true, the current module name will be prepended to all description\n# unit titles (such as .. function::).\n#add_module_names = True\n\n# If true, sectionauthor and moduleauthor directives will be shown in the\n# output. They are ignored by default.\n#show_authors = False\n\n# The name of the Pygments (syntax highlighting) style to use.\npygments_style = 'sphinx'\n\n# A list of ignored prefixes for module index sorting.\n#modindex_common_prefix = []\n\n# Build a refence icon.rst.inc files that we can include for inline\n# icons.\nimport os\n\nicons_dir = \"../pootle/static/images/sprite\"\nicons_inc_file_name = \"icons.rst.inc\"\nbuild_icons_inc = False\n\nif not os.path.isfile(os.path.join(os.curdir, icons_inc_file_name)):\n build_icons_inc = True\nelse:\n icon_inc_mtime = os.stat(os.path.join(os.curdir,\n icons_inc_file_name)).st_mtime\n for icon_image in os.listdir(icons_dir):\n if os.stat(os.path.join(icons_dir,\n icon_image)).st_mtime > icon_inc_mtime:\n build_icons_inc = True\n\nif build_icons_inc:\n icons_txt_file = open(icons_inc_file_name, \"w\")\n for icon_image in os.listdir(icons_dir):\n icon_name = icon_image[:icon_image.rfind(\".\")]\n print >>icons_txt_file, \".. |icon:\" + icon_name + \"| \" + \\\n \"image:: /\" + icons_dir + \"/\" + icon_image\n print >>icons_txt_file, \" :alt: \" + \\\n icon_name.replace(\"-\", \" \").replace(\"_\", \" \") + \\\n \" icon\"\n print >>icons_txt_file\n icons_txt_file.close()\n\n# Files to include at the end of every .rst file\nrst_epilog = \"\"\"\n.. include:: /%s\n\"\"\" % icons_inc_file_name\n\n\n# -- Options for HTML output --------------------------------------------------\n\n# The theme to use for HTML and HTML Help pages. See the documentation for\n# a list of builtin themes.\nhtml_theme = 'sphinx-bootstrap'\n\n# Theme options are theme-specific and customize the look and feel of a theme\n# further. For a list of options available for each theme, see the\n# documentation.\nhtml_theme_options = {\n 'nosidebar': True,\n 'link_color': '#489b7',\n 'link_color_hover': '#489b7',\n}\n\n# Add any paths that contain custom themes here, relative to this directory.\nhtml_theme_path = ['_themes']\n\n# The name for this set of Sphinx documents. If None, it defaults to\n# \"<project> v<release> documentation\".\n#html_title = None\n\n# A shorter title for the navigation bar. Default is the same as html_title.\n#html_short_title = None\n\n# The name of an image file (relative to this directory) to place at the top\n# of the sidebar.\nhtml_logo = '_static/pootle_logo.png'\n\n# The name of an image file (within the static path) to use as favicon of the\n# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32\n# pixels large.\nhtml_favicon = '../pootle/static/favicon.ico'\n\n# Add any paths that contain custom static files (such as style sheets) here,\n# relative to this directory. They are copied after the builtin static files,\n# so a file named \"default.css\" will overwrite the builtin \"default.css\".\nhtml_static_path = ['_static']\n\n# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,\n# using the given strftime format.\n#html_last_updated_fmt = '%b %d, %Y'\n\n# If true, SmartyPants will be used to convert quotes and dashes to\n# typographically correct entities.\n#html_use_smartypants = True\n\n# Custom sidebar templates, maps document names to template names.\n#html_sidebars = {}\n\n# Additional templates that should be rendered to pages, maps page names to\n# template names.\n#html_additional_pages = {}\n\n# If false, no module index is generated.\nhtml_domain_indices = False\n\n# If false, no index is generated.\n#html_use_index = True\n\n# If true, the index is split into individual pages for each letter.\n#html_split_index = False\n\n# If true, links to the reST sources are added to the pages.\nhtml_show_sourcelink = False\n\n# If true, \"Created using Sphinx\" is shown in the HTML footer. Default is True.\n#html_show_sphinx = True\n\n# If true, \"(C) Copyright ...\" is shown in the HTML footer. Default is True.\n#html_show_copyright = True\n\n# If true, an OpenSearch description file will be output, and all pages will\n# contain a <link> tag referring to it. The value of this option must be the\n# base URL from which the finished HTML is served.\n#html_use_opensearch = ''\n\n# This is the file name suffix for HTML files (e.g. \".xhtml\").\n#html_file_suffix = None\n\n# Output file base name for HTML help builder.\nhtmlhelp_basename = 'Pootledoc'\n\n\n# -- Options for LaTeX output -------------------------------------------------\n\nlatex_elements = {\n# The paper size ('letterpaper' or 'a4paper').\n#'papersize': 'letterpaper',\n\n# The font size ('10pt', '11pt' or '12pt').\n#'pointsize': '10pt',\n\n# Additional stuff for the LaTeX preamble.\n#'preamble': '',\n}\n\n# Grouping the document tree into LaTeX files. List of tuples\n# (source start file, target name, title, author, documentclass [howto/manual])\nlatex_documents = [\n ('index', 'Pootle.tex', u'Pootle Documentation',\n u'Translate.org.za', 'manual'),\n]\n\n# The name of an image file (relative to this directory) to place at the top of\n# the title page.\n#latex_logo = None\n\n# For \"manual\" documents, if this is true, then toplevel headings are parts,\n# not chapters.\n#latex_use_parts = False\n\n# If true, show page references after internal links.\n#latex_show_pagerefs = False\n\n# If true, show URL addresses after external links.\n#latex_show_urls = False\n\n# Documents to append as an appendix to all manuals.\n#latex_appendices = []\n\n# If false, no module index is generated.\n#latex_domain_indices = True\n\n\n# -- Options for manual page output -------------------------------------------\n\n# One entry per manual page. List of tuples\n# (source start file, name, description, authors, manual section).\nman_pages = [\n ('index', 'pootle', u'Pootle Documentation',\n [u'Translate.org.za'], 1)\n]\n\n# If true, show URL addresses after external links.\n#man_show_urls = False\n\n\n# -- Options for Texinfo output -----------------------------------------------\n\n# Grouping the document tree into Texinfo files. List of tuples\n# (source start file, target name, title, author,\n# dir menu entry, description, category)\ntexinfo_documents = [\n ('index', 'Pootle', u'Pootle Documentation',\n u'Translate.org.za', 'Pootle', 'Online translation tool.',\n 'Miscellaneous'),\n]\n\n# Documents to append as an appendix to all manuals.\n#texinfo_appendices = []\n\n# If false, no module index is generated.\n#texinfo_domain_indices = True\n\n# How to display URL addresses: 'footnote', 'no', or 'inline'.\n#texinfo_show_urls = 'footnote'\n\n\n# -- Options for Intersphinx -------------------------------------------------\n\nintersphinx_mapping = {\n 'python': ('https://docs.python.org/2.7', None),\n 'django': ('https://docs.djangoproject.com/en/dev',\n 'https://docs.djangoproject.com/en/dev/_objects'),\n 'toolkit': ('http://docs.translatehouse.org/projects/translate-toolkit/en/latest/', None),\n 'south': ('https://south.readthedocs.org/en/latest/', None),\n 'tastypie': ('https://django-tastypie.readthedocs.org/en/latest/', None),\n}\n\n\n# -- Options for External links -------------------------------------------------\n\nextlinks = {\n # :role: (URL, prefix)\n 'bug': ('http://bugs.locamotion.org/show_bug.cgi?id=%s', 'bug '),\n 'man': ('http://linux.die.net/man/1/%s', ''),\n 'wiki': ('http://translate.sourceforge.net/wiki/%s', ''),\n 'wp': ('https://en.wikipedia.org/wiki/%s', ''),\n}\n\n# -- Options for Gettext -------------------------------------------------\n\nlocale_dirs = [\"_translations/\"]\ngettext_compact = False\n", "path": "docs/conf.py"}]} | 3,947 | 211 |
gh_patches_debug_49092 | rasdani/github-patches | git_diff | cal-itp__benefits-1042 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Refactor "Agency links" include, page template
In #480 we introduced some new rendering for "Agency links" - the contact info phone number / website that shows up most notably on the Help page, but also when the user fails to verify their eligibility.
As a follow-up we should clean up the Page and Help templates so we aren't trying to do too much where it isn't needed.
## Tasks
* [x] The Back button should not be rendered in an include with agency links
* [x] The Page template should not render anything related to agency links
* [x] Create new template(s) for pages that do need to render agency links, using the include
</issue>
<code>
[start of benefits/eligibility/views.py]
1 """
2 The eligibility application: view definitions for the eligibility verification flow.
3 """
4 from django.contrib import messages
5 from django.shortcuts import redirect
6 from django.template.response import TemplateResponse
7 from django.urls import reverse
8 from django.utils.decorators import decorator_from_middleware
9 from django.utils.html import format_html
10 from django.utils.translation import pgettext, gettext as _
11
12 from benefits.core import recaptcha, session, viewmodels
13 from benefits.core.middleware import AgencySessionRequired, LoginRequired, RateLimit, VerifierSessionRequired
14 from benefits.core.models import EligibilityVerifier
15 from benefits.core.views import ROUTE_HELP
16 from . import analytics, forms, verify
17
18
19 ROUTE_INDEX = "eligibility:index"
20 ROUTE_START = "eligibility:start"
21 ROUTE_LOGIN = "oauth:login"
22 ROUTE_CONFIRM = "eligibility:confirm"
23 ROUTE_ENROLLMENT = "enrollment:index"
24
25 TEMPLATE_INDEX = "eligibility/index.html"
26 TEMPLATE_START = "eligibility/start.html"
27 TEMPLATE_CONFIRM = "eligibility/confirm.html"
28 TEMPLATE_UNVERIFIED = "eligibility/unverified.html"
29
30
31 @decorator_from_middleware(AgencySessionRequired)
32 def index(request):
33 """View handler for the eligibility verifier selection form."""
34
35 session.update(request, eligibility_types=[], origin=reverse(ROUTE_INDEX))
36 agency = session.agency(request)
37
38 eligibility_start = reverse(ROUTE_START)
39
40 help_page = reverse(ROUTE_HELP)
41
42 page = viewmodels.Page(
43 title=_("eligibility.pages.index.title"),
44 headline=_("eligibility.pages.index.headline"),
45 paragraphs=[
46 format_html(_("eligibility.pages.index.p[0]%(info_link)s") % {"info_link": f"{help_page}#what-is-cal-itp"})
47 ],
48 forms=forms.EligibilityVerifierSelectionForm(agency=agency),
49 )
50
51 ctx = page.context_dict()
52 ctx["help_page"] = help_page
53 ctx["help_text"] = format_html(
54 _("eligibility.pages.index.help_text%(help_link)s") % {"help_link": f"{help_page}#what-is-cal-itp"}
55 )
56
57 if request.method == "POST":
58 form = forms.EligibilityVerifierSelectionForm(data=request.POST, agency=agency)
59
60 if form.is_valid():
61 verifier_id = form.cleaned_data.get("verifier")
62 verifier = EligibilityVerifier.objects.get(id=verifier_id)
63 session.update(request, verifier=verifier)
64
65 response = redirect(eligibility_start)
66 else:
67 # form was not valid, allow for correction/resubmission
68 page.forms = [form]
69 response = TemplateResponse(request, TEMPLATE_INDEX, ctx)
70 else:
71 if agency.eligibility_verifiers.count() == 1:
72 verifier = agency.eligibility_verifiers.first()
73 session.update(request, verifier=verifier)
74 response = redirect(eligibility_start)
75 else:
76 response = TemplateResponse(request, TEMPLATE_INDEX, ctx)
77
78 return response
79
80
81 @decorator_from_middleware(AgencySessionRequired)
82 @decorator_from_middleware(VerifierSessionRequired)
83 def start(request):
84 """View handler for the eligibility verification getting started screen."""
85
86 verifier = session.verifier(request)
87 button = viewmodels.Button.primary(text=_("eligibility.buttons.continue"), url=reverse(ROUTE_CONFIRM))
88
89 # define the verifier-specific required item
90 identity_item = viewmodels.MediaItem(
91 icon=viewmodels.Icon("idcardcheck", pgettext("image alt text", "core.icons.idcardcheck")),
92 heading=_(verifier.start_item_name),
93 details=_(verifier.start_item_description),
94 )
95
96 if verifier.is_auth_required:
97 if verifier.uses_auth_verification:
98 identity_item.bullets = [
99 _("eligibility.pages.start.mst_login.required_items[0]"),
100 _("eligibility.pages.start.mst_login.required_items[1]"),
101 _("eligibility.pages.start.mst_login.required_items[2]"),
102 ]
103
104 if not session.logged_in(request):
105 button = viewmodels.Button.login(
106 text=_(verifier.auth_provider.sign_in_button_label),
107 url=reverse(ROUTE_LOGIN),
108 )
109
110 # define the bank card item
111 bank_card_item = viewmodels.MediaItem(
112 icon=viewmodels.Icon("bankcardcheck", pgettext("image alt text", "core.icons.bankcardcheck")),
113 heading=_("eligibility.pages.start.bankcard.title"),
114 details=_("eligibility.pages.start.bankcard.text"),
115 )
116
117 media = [identity_item, bank_card_item]
118
119 page = viewmodels.Page(
120 title=_("eligibility.pages.start.title"),
121 headline=_(verifier.start_headline),
122 paragraphs=[_(verifier.start_blurb)],
123 button=button,
124 )
125
126 ctx = page.context_dict()
127 ctx["previous_page_button"] = viewmodels.Button.previous_page(url=reverse(ROUTE_INDEX))
128 ctx["start_sub_headline"] = _(verifier.start_sub_headline)
129 ctx["media"] = media
130 ctx["help_link"] = reverse(ROUTE_HELP)
131
132 # update origin now, after we've saved the previous page
133 session.update(request, eligibility_types=[], origin=reverse(ROUTE_START))
134
135 return TemplateResponse(request, TEMPLATE_START, ctx)
136
137
138 @decorator_from_middleware(AgencySessionRequired)
139 @decorator_from_middleware(LoginRequired)
140 @decorator_from_middleware(RateLimit)
141 @decorator_from_middleware(VerifierSessionRequired)
142 def confirm(request):
143 """View handler for the eligibility verification form."""
144
145 # GET from an already verified user, no need to verify again
146 if request.method == "GET" and session.eligible(request):
147 eligibility = session.eligibility(request)
148 return verified(request, [eligibility.name])
149
150 agency = session.agency(request)
151 verifier = session.verifier(request)
152 types_to_verify = verify.typenames_to_verify(agency, verifier)
153
154 # GET for OAuth verification
155 if request.method == "GET" and verifier.uses_auth_verification:
156 analytics.started_eligibility(request, types_to_verify)
157
158 verified_types = verify.eligibility_from_oauth(verifier, session.oauth_claim(request), agency)
159 if verified_types:
160 return verified(request, verified_types)
161 else:
162 return unverified(request)
163
164 # GET/POST for Eligibility API verification
165 page = viewmodels.Page(
166 title=_(verifier.form_title),
167 headline=_(verifier.form_headline),
168 paragraphs=[_(verifier.form_blurb)],
169 form=forms.EligibilityVerificationForm(auto_id=True, label_suffix="", verifier=verifier),
170 )
171
172 ctx = page.context_dict()
173 ctx["previous_page_button"] = viewmodels.Button.previous_page(url=reverse(ROUTE_START))
174
175 # GET from an unverified user, present the form
176 if request.method == "GET":
177 return TemplateResponse(request, TEMPLATE_CONFIRM, ctx)
178 # POST form submission, process form data, make Eligibility Verification API call
179 elif request.method == "POST":
180 analytics.started_eligibility(request, types_to_verify)
181
182 form = forms.EligibilityVerificationForm(data=request.POST, verifier=verifier)
183 # form was not valid, allow for correction/resubmission
184 if not form.is_valid():
185 if recaptcha.has_error(form):
186 messages.error(request, "Recaptcha failed. Please try again.")
187
188 page.forms = [form]
189 ctx.update(page.context_dict())
190 return TemplateResponse(request, TEMPLATE_CONFIRM, ctx)
191
192 # form is valid, make Eligibility Verification request to get the verified types
193 verified_types = verify.eligibility_from_api(verifier, form, agency)
194
195 # form was not valid, allow for correction/resubmission
196 if verified_types is None:
197 analytics.returned_error(request, types_to_verify, form.errors)
198 page.forms = [form]
199 ctx.update(page.context_dict())
200 return TemplateResponse(request, TEMPLATE_CONFIRM, ctx)
201 # no types were verified
202 elif len(verified_types) == 0:
203 return unverified(request)
204 # type(s) were verified
205 else:
206 return verified(request, verified_types)
207
208
209 @decorator_from_middleware(AgencySessionRequired)
210 @decorator_from_middleware(LoginRequired)
211 def verified(request, verified_types):
212 """View handler for the verified eligibility page."""
213
214 analytics.returned_success(request, verified_types)
215
216 session.update(request, eligibility_types=verified_types)
217
218 return redirect(ROUTE_ENROLLMENT)
219
220
221 @decorator_from_middleware(AgencySessionRequired)
222 @decorator_from_middleware(VerifierSessionRequired)
223 def unverified(request):
224 """View handler for the unverified eligibility page."""
225
226 agency = session.agency(request)
227 verifier = session.verifier(request)
228 types_to_verify = verify.typenames_to_verify(agency, verifier)
229
230 analytics.returned_fail(request, types_to_verify)
231
232 # tel: link to agency phone number
233 buttons = viewmodels.Button.agency_contact_links(agency)
234 buttons.append(viewmodels.Button.home(request))
235
236 page = viewmodels.Page(
237 title=_(verifier.unverified_title),
238 classes="with-agency-links",
239 headline=_(verifier.unverified_headline),
240 icon=viewmodels.Icon("idcardquestion", pgettext("image alt text", "core.icons.idcardquestion")),
241 paragraphs=[_(verifier.unverified_blurb)],
242 buttons=buttons,
243 )
244
245 return TemplateResponse(request, TEMPLATE_UNVERIFIED, page.context_dict())
246
[end of benefits/eligibility/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/benefits/eligibility/views.py b/benefits/eligibility/views.py
--- a/benefits/eligibility/views.py
+++ b/benefits/eligibility/views.py
@@ -235,7 +235,6 @@
page = viewmodels.Page(
title=_(verifier.unverified_title),
- classes="with-agency-links",
headline=_(verifier.unverified_headline),
icon=viewmodels.Icon("idcardquestion", pgettext("image alt text", "core.icons.idcardquestion")),
paragraphs=[_(verifier.unverified_blurb)],
| {"golden_diff": "diff --git a/benefits/eligibility/views.py b/benefits/eligibility/views.py\n--- a/benefits/eligibility/views.py\n+++ b/benefits/eligibility/views.py\n@@ -235,7 +235,6 @@\n \n page = viewmodels.Page(\n title=_(verifier.unverified_title),\n- classes=\"with-agency-links\",\n headline=_(verifier.unverified_headline),\n icon=viewmodels.Icon(\"idcardquestion\", pgettext(\"image alt text\", \"core.icons.idcardquestion\")),\n paragraphs=[_(verifier.unverified_blurb)],\n", "issue": "Refactor \"Agency links\" include, page template\nIn #480 we introduced some new rendering for \"Agency links\" - the contact info phone number / website that shows up most notably on the Help page, but also when the user fails to verify their eligibility.\r\n\r\nAs a follow-up we should clean up the Page and Help templates so we aren't trying to do too much where it isn't needed.\r\n\r\n## Tasks\r\n\r\n* [x] The Back button should not be rendered in an include with agency links\r\n* [x] The Page template should not render anything related to agency links\r\n* [x] Create new template(s) for pages that do need to render agency links, using the include\n", "before_files": [{"content": "\"\"\"\nThe eligibility application: view definitions for the eligibility verification flow.\n\"\"\"\nfrom django.contrib import messages\nfrom django.shortcuts import redirect\nfrom django.template.response import TemplateResponse\nfrom django.urls import reverse\nfrom django.utils.decorators import decorator_from_middleware\nfrom django.utils.html import format_html\nfrom django.utils.translation import pgettext, gettext as _\n\nfrom benefits.core import recaptcha, session, viewmodels\nfrom benefits.core.middleware import AgencySessionRequired, LoginRequired, RateLimit, VerifierSessionRequired\nfrom benefits.core.models import EligibilityVerifier\nfrom benefits.core.views import ROUTE_HELP\nfrom . import analytics, forms, verify\n\n\nROUTE_INDEX = \"eligibility:index\"\nROUTE_START = \"eligibility:start\"\nROUTE_LOGIN = \"oauth:login\"\nROUTE_CONFIRM = \"eligibility:confirm\"\nROUTE_ENROLLMENT = \"enrollment:index\"\n\nTEMPLATE_INDEX = \"eligibility/index.html\"\nTEMPLATE_START = \"eligibility/start.html\"\nTEMPLATE_CONFIRM = \"eligibility/confirm.html\"\nTEMPLATE_UNVERIFIED = \"eligibility/unverified.html\"\n\n\n@decorator_from_middleware(AgencySessionRequired)\ndef index(request):\n \"\"\"View handler for the eligibility verifier selection form.\"\"\"\n\n session.update(request, eligibility_types=[], origin=reverse(ROUTE_INDEX))\n agency = session.agency(request)\n\n eligibility_start = reverse(ROUTE_START)\n\n help_page = reverse(ROUTE_HELP)\n\n page = viewmodels.Page(\n title=_(\"eligibility.pages.index.title\"),\n headline=_(\"eligibility.pages.index.headline\"),\n paragraphs=[\n format_html(_(\"eligibility.pages.index.p[0]%(info_link)s\") % {\"info_link\": f\"{help_page}#what-is-cal-itp\"})\n ],\n forms=forms.EligibilityVerifierSelectionForm(agency=agency),\n )\n\n ctx = page.context_dict()\n ctx[\"help_page\"] = help_page\n ctx[\"help_text\"] = format_html(\n _(\"eligibility.pages.index.help_text%(help_link)s\") % {\"help_link\": f\"{help_page}#what-is-cal-itp\"}\n )\n\n if request.method == \"POST\":\n form = forms.EligibilityVerifierSelectionForm(data=request.POST, agency=agency)\n\n if form.is_valid():\n verifier_id = form.cleaned_data.get(\"verifier\")\n verifier = EligibilityVerifier.objects.get(id=verifier_id)\n session.update(request, verifier=verifier)\n\n response = redirect(eligibility_start)\n else:\n # form was not valid, allow for correction/resubmission\n page.forms = [form]\n response = TemplateResponse(request, TEMPLATE_INDEX, ctx)\n else:\n if agency.eligibility_verifiers.count() == 1:\n verifier = agency.eligibility_verifiers.first()\n session.update(request, verifier=verifier)\n response = redirect(eligibility_start)\n else:\n response = TemplateResponse(request, TEMPLATE_INDEX, ctx)\n\n return response\n\n\n@decorator_from_middleware(AgencySessionRequired)\n@decorator_from_middleware(VerifierSessionRequired)\ndef start(request):\n \"\"\"View handler for the eligibility verification getting started screen.\"\"\"\n\n verifier = session.verifier(request)\n button = viewmodels.Button.primary(text=_(\"eligibility.buttons.continue\"), url=reverse(ROUTE_CONFIRM))\n\n # define the verifier-specific required item\n identity_item = viewmodels.MediaItem(\n icon=viewmodels.Icon(\"idcardcheck\", pgettext(\"image alt text\", \"core.icons.idcardcheck\")),\n heading=_(verifier.start_item_name),\n details=_(verifier.start_item_description),\n )\n\n if verifier.is_auth_required:\n if verifier.uses_auth_verification:\n identity_item.bullets = [\n _(\"eligibility.pages.start.mst_login.required_items[0]\"),\n _(\"eligibility.pages.start.mst_login.required_items[1]\"),\n _(\"eligibility.pages.start.mst_login.required_items[2]\"),\n ]\n\n if not session.logged_in(request):\n button = viewmodels.Button.login(\n text=_(verifier.auth_provider.sign_in_button_label),\n url=reverse(ROUTE_LOGIN),\n )\n\n # define the bank card item\n bank_card_item = viewmodels.MediaItem(\n icon=viewmodels.Icon(\"bankcardcheck\", pgettext(\"image alt text\", \"core.icons.bankcardcheck\")),\n heading=_(\"eligibility.pages.start.bankcard.title\"),\n details=_(\"eligibility.pages.start.bankcard.text\"),\n )\n\n media = [identity_item, bank_card_item]\n\n page = viewmodels.Page(\n title=_(\"eligibility.pages.start.title\"),\n headline=_(verifier.start_headline),\n paragraphs=[_(verifier.start_blurb)],\n button=button,\n )\n\n ctx = page.context_dict()\n ctx[\"previous_page_button\"] = viewmodels.Button.previous_page(url=reverse(ROUTE_INDEX))\n ctx[\"start_sub_headline\"] = _(verifier.start_sub_headline)\n ctx[\"media\"] = media\n ctx[\"help_link\"] = reverse(ROUTE_HELP)\n\n # update origin now, after we've saved the previous page\n session.update(request, eligibility_types=[], origin=reverse(ROUTE_START))\n\n return TemplateResponse(request, TEMPLATE_START, ctx)\n\n\n@decorator_from_middleware(AgencySessionRequired)\n@decorator_from_middleware(LoginRequired)\n@decorator_from_middleware(RateLimit)\n@decorator_from_middleware(VerifierSessionRequired)\ndef confirm(request):\n \"\"\"View handler for the eligibility verification form.\"\"\"\n\n # GET from an already verified user, no need to verify again\n if request.method == \"GET\" and session.eligible(request):\n eligibility = session.eligibility(request)\n return verified(request, [eligibility.name])\n\n agency = session.agency(request)\n verifier = session.verifier(request)\n types_to_verify = verify.typenames_to_verify(agency, verifier)\n\n # GET for OAuth verification\n if request.method == \"GET\" and verifier.uses_auth_verification:\n analytics.started_eligibility(request, types_to_verify)\n\n verified_types = verify.eligibility_from_oauth(verifier, session.oauth_claim(request), agency)\n if verified_types:\n return verified(request, verified_types)\n else:\n return unverified(request)\n\n # GET/POST for Eligibility API verification\n page = viewmodels.Page(\n title=_(verifier.form_title),\n headline=_(verifier.form_headline),\n paragraphs=[_(verifier.form_blurb)],\n form=forms.EligibilityVerificationForm(auto_id=True, label_suffix=\"\", verifier=verifier),\n )\n\n ctx = page.context_dict()\n ctx[\"previous_page_button\"] = viewmodels.Button.previous_page(url=reverse(ROUTE_START))\n\n # GET from an unverified user, present the form\n if request.method == \"GET\":\n return TemplateResponse(request, TEMPLATE_CONFIRM, ctx)\n # POST form submission, process form data, make Eligibility Verification API call\n elif request.method == \"POST\":\n analytics.started_eligibility(request, types_to_verify)\n\n form = forms.EligibilityVerificationForm(data=request.POST, verifier=verifier)\n # form was not valid, allow for correction/resubmission\n if not form.is_valid():\n if recaptcha.has_error(form):\n messages.error(request, \"Recaptcha failed. Please try again.\")\n\n page.forms = [form]\n ctx.update(page.context_dict())\n return TemplateResponse(request, TEMPLATE_CONFIRM, ctx)\n\n # form is valid, make Eligibility Verification request to get the verified types\n verified_types = verify.eligibility_from_api(verifier, form, agency)\n\n # form was not valid, allow for correction/resubmission\n if verified_types is None:\n analytics.returned_error(request, types_to_verify, form.errors)\n page.forms = [form]\n ctx.update(page.context_dict())\n return TemplateResponse(request, TEMPLATE_CONFIRM, ctx)\n # no types were verified\n elif len(verified_types) == 0:\n return unverified(request)\n # type(s) were verified\n else:\n return verified(request, verified_types)\n\n\n@decorator_from_middleware(AgencySessionRequired)\n@decorator_from_middleware(LoginRequired)\ndef verified(request, verified_types):\n \"\"\"View handler for the verified eligibility page.\"\"\"\n\n analytics.returned_success(request, verified_types)\n\n session.update(request, eligibility_types=verified_types)\n\n return redirect(ROUTE_ENROLLMENT)\n\n\n@decorator_from_middleware(AgencySessionRequired)\n@decorator_from_middleware(VerifierSessionRequired)\ndef unverified(request):\n \"\"\"View handler for the unverified eligibility page.\"\"\"\n\n agency = session.agency(request)\n verifier = session.verifier(request)\n types_to_verify = verify.typenames_to_verify(agency, verifier)\n\n analytics.returned_fail(request, types_to_verify)\n\n # tel: link to agency phone number\n buttons = viewmodels.Button.agency_contact_links(agency)\n buttons.append(viewmodels.Button.home(request))\n\n page = viewmodels.Page(\n title=_(verifier.unverified_title),\n classes=\"with-agency-links\",\n headline=_(verifier.unverified_headline),\n icon=viewmodels.Icon(\"idcardquestion\", pgettext(\"image alt text\", \"core.icons.idcardquestion\")),\n paragraphs=[_(verifier.unverified_blurb)],\n buttons=buttons,\n )\n\n return TemplateResponse(request, TEMPLATE_UNVERIFIED, page.context_dict())\n", "path": "benefits/eligibility/views.py"}]} | 3,299 | 131 |
gh_patches_debug_22809 | rasdani/github-patches | git_diff | mabel-dev__opteryx-1396 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
🪲 Incorrect error raised on type errors on JOINs
### Thank you for taking the time to report a problem with Opteryx.
_To help us to respond to your request we ask that you try to provide the below detail about the bug._
**Describe the bug** _A clear and specific description of what the bug is. What the error, incorrect or unexpected behaviour was._
**Expected behaviour** _A clear and concise description of what you expected to happen._
**Sample Code/Statement** _If you can, please submit the SQL statement or Python code snippet, or a representative example using the sample datasets._
~~~sql
~~~
**Additional context** _Add any other context about the problem here, for example what you have done to try to diagnose or workaround the problem._
</issue>
<code>
[start of opteryx/operators/join_node.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 """
14 Join Node
15
16 This is a SQL Query Execution Plan Node.
17
18 This handles most of the join types as a wrapper for pyarrow's JOIN functions,
19 only CROSS JOINs are not handled here.
20
21 This is a faster implementation that the pyarrow_ops implementation, but hashes
22 the right table every call so carries a penalty.
23 """
24 from typing import Generator
25
26 import pyarrow
27
28 from opteryx.models import QueryProperties
29 from opteryx.operators import BasePlanNode
30
31
32 class JoinNode(BasePlanNode):
33 def __init__(self, properties: QueryProperties, **config):
34 super().__init__(properties=properties)
35 self._join_type = config["type"]
36 self._on = config.get("on")
37 self._using = config.get("using")
38
39 self._left_columns = config.get("left_columns")
40 self._left_relation = config.get("left_relation_names")
41
42 self._right_columns = config.get("right_columns")
43 self._right_relation = config.get("right_relation_names")
44
45 @property
46 def name(self): # pragma: no cover
47 return f"{self._join_type} Join"
48
49 @property
50 def config(self): # pragma: no cover
51 return ""
52
53 def execute(self) -> Generator:
54 left_node = self._producers[0] # type:ignore
55 right_node = self._producers[1] # type:ignore
56
57 right_table = pyarrow.concat_tables(right_node.execute(), mode="default")
58
59 for morsel in left_node.execute():
60 # in place until #1295 resolved
61 if not self._right_columns[0] in morsel.column_names:
62 self._right_columns, self._left_columns = self._left_columns, self._right_columns
63
64 try:
65 # do the join
66 new_morsel = morsel.join(
67 right_table,
68 keys=self._right_columns,
69 right_keys=self._left_columns,
70 join_type=self._join_type,
71 coalesce_keys=self._using is not None,
72 )
73 except pyarrow.ArrowInvalid as err: # pragma: no cover
74 last_token = str(err).split(" ")[-1]
75 column = None
76 for col in left_node.columns:
77 if last_token == col.identity:
78 column = col.name
79 break
80 for col in right_node.columns:
81 if last_token == col.identity:
82 column = col.name
83 break
84 if column:
85 raise pyarrow.ArrowInvalid(str(err).replace(last_token, f"'{column}'"))
86 raise err
87
88 yield new_morsel
89
[end of opteryx/operators/join_node.py]
[start of opteryx/__version__.py]
1 __build__ = 226
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 Store the version here so:
17 1) we don't load dependencies by storing it in __init__.py
18 2) we can import it in setup.py for the same reason
19 """
20 from enum import Enum # isort: skip
21
22
23 class VersionStatus(Enum):
24 ALPHA = "alpha"
25 BETA = "beta"
26 RELEASE = "release"
27
28
29 _major = 0
30 _minor = 12
31 _revision = 4
32 _status = VersionStatus.BETA
33
34 __version__ = f"{_major}.{_minor}.{_revision}" + (
35 f"-{_status.value}.{__build__}" if _status != VersionStatus.RELEASE else ""
36 )
37
[end of opteryx/__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/opteryx/__version__.py b/opteryx/__version__.py
--- a/opteryx/__version__.py
+++ b/opteryx/__version__.py
@@ -1,4 +1,4 @@
-__build__ = 226
+__build__ = 228
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/opteryx/operators/join_node.py b/opteryx/operators/join_node.py
--- a/opteryx/operators/join_node.py
+++ b/opteryx/operators/join_node.py
@@ -25,6 +25,7 @@
import pyarrow
+from opteryx.exceptions import UnsupportedSyntaxError
from opteryx.models import QueryProperties
from opteryx.operators import BasePlanNode
@@ -82,7 +83,11 @@
column = col.name
break
if column:
- raise pyarrow.ArrowInvalid(str(err).replace(last_token, f"'{column}'"))
- raise err
+ raise UnsupportedSyntaxError(
+ f"Unable to JOIN with unsupported column types in table, '{column}'."
+ ) from err
+ raise UnsupportedSyntaxError(
+ "Unable to JOIN with unsupported column types in table."
+ ) from err
yield new_morsel
| {"golden_diff": "diff --git a/opteryx/__version__.py b/opteryx/__version__.py\n--- a/opteryx/__version__.py\n+++ b/opteryx/__version__.py\n@@ -1,4 +1,4 @@\n-__build__ = 226\n+__build__ = 228\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.\ndiff --git a/opteryx/operators/join_node.py b/opteryx/operators/join_node.py\n--- a/opteryx/operators/join_node.py\n+++ b/opteryx/operators/join_node.py\n@@ -25,6 +25,7 @@\n \n import pyarrow\n \n+from opteryx.exceptions import UnsupportedSyntaxError\n from opteryx.models import QueryProperties\n from opteryx.operators import BasePlanNode\n \n@@ -82,7 +83,11 @@\n column = col.name\n break\n if column:\n- raise pyarrow.ArrowInvalid(str(err).replace(last_token, f\"'{column}'\"))\n- raise err\n+ raise UnsupportedSyntaxError(\n+ f\"Unable to JOIN with unsupported column types in table, '{column}'.\"\n+ ) from err\n+ raise UnsupportedSyntaxError(\n+ \"Unable to JOIN with unsupported column types in table.\"\n+ ) from err\n \n yield new_morsel\n", "issue": "\ud83e\udeb2 Incorrect error raised on type errors on JOINs\n### Thank you for taking the time to report a problem with Opteryx.\r\n_To help us to respond to your request we ask that you try to provide the below detail about the bug._\r\n\r\n**Describe the bug** _A clear and specific description of what the bug is. What the error, incorrect or unexpected behaviour was._\r\n\r\n\r\n**Expected behaviour** _A clear and concise description of what you expected to happen._\r\n\r\n\r\n**Sample Code/Statement** _If you can, please submit the SQL statement or Python code snippet, or a representative example using the sample datasets._\r\n\r\n~~~sql\r\n\r\n~~~\r\n\r\n**Additional context** _Add any other context about the problem here, for example what you have done to try to diagnose or workaround the problem._\r\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\n\"\"\"\nJoin Node\n\nThis is a SQL Query Execution Plan Node.\n\nThis handles most of the join types as a wrapper for pyarrow's JOIN functions, \nonly CROSS JOINs are not handled here.\n\nThis is a faster implementation that the pyarrow_ops implementation, but hashes\nthe right table every call so carries a penalty.\n\"\"\"\nfrom typing import Generator\n\nimport pyarrow\n\nfrom opteryx.models import QueryProperties\nfrom opteryx.operators import BasePlanNode\n\n\nclass JoinNode(BasePlanNode):\n def __init__(self, properties: QueryProperties, **config):\n super().__init__(properties=properties)\n self._join_type = config[\"type\"]\n self._on = config.get(\"on\")\n self._using = config.get(\"using\")\n\n self._left_columns = config.get(\"left_columns\")\n self._left_relation = config.get(\"left_relation_names\")\n\n self._right_columns = config.get(\"right_columns\")\n self._right_relation = config.get(\"right_relation_names\")\n\n @property\n def name(self): # pragma: no cover\n return f\"{self._join_type} Join\"\n\n @property\n def config(self): # pragma: no cover\n return \"\"\n\n def execute(self) -> Generator:\n left_node = self._producers[0] # type:ignore\n right_node = self._producers[1] # type:ignore\n\n right_table = pyarrow.concat_tables(right_node.execute(), mode=\"default\")\n\n for morsel in left_node.execute():\n # in place until #1295 resolved\n if not self._right_columns[0] in morsel.column_names:\n self._right_columns, self._left_columns = self._left_columns, self._right_columns\n\n try:\n # do the join\n new_morsel = morsel.join(\n right_table,\n keys=self._right_columns,\n right_keys=self._left_columns,\n join_type=self._join_type,\n coalesce_keys=self._using is not None,\n )\n except pyarrow.ArrowInvalid as err: # pragma: no cover\n last_token = str(err).split(\" \")[-1]\n column = None\n for col in left_node.columns:\n if last_token == col.identity:\n column = col.name\n break\n for col in right_node.columns:\n if last_token == col.identity:\n column = col.name\n break\n if column:\n raise pyarrow.ArrowInvalid(str(err).replace(last_token, f\"'{column}'\"))\n raise err\n\n yield new_morsel\n", "path": "opteryx/operators/join_node.py"}, {"content": "__build__ = 226\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\"\"\"\nStore the version here so:\n1) we don't load dependencies by storing it in __init__.py\n2) we can import it in setup.py for the same reason\n\"\"\"\nfrom enum import Enum # isort: skip\n\n\nclass VersionStatus(Enum):\n ALPHA = \"alpha\"\n BETA = \"beta\"\n RELEASE = \"release\"\n\n\n_major = 0\n_minor = 12\n_revision = 4\n_status = VersionStatus.BETA\n\n__version__ = f\"{_major}.{_minor}.{_revision}\" + (\n f\"-{_status.value}.{__build__}\" if _status != VersionStatus.RELEASE else \"\"\n)\n", "path": "opteryx/__version__.py"}]} | 1,925 | 309 |
gh_patches_debug_39387 | rasdani/github-patches | git_diff | uccser__cs-unplugged-1035 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Modify Job Badges printable to use one string per badge
Currently the way the strings are broken for translation doesn't support all languages (for example: Māori has a word after the emphasis of the role).
</issue>
<code>
[start of csunplugged/resources/generators/JobBadgesResourceGenerator.py]
1 """Class for Job Badges resource generator."""
2
3 from PIL import Image, ImageDraw
4 from resources.utils.BaseResourceGenerator import BaseResourceGenerator
5 from django.utils.translation import ugettext_lazy as _
6 from utils.TextBoxDrawer import TextBoxDrawer
7
8
9 class JobBadgesResourceGenerator(BaseResourceGenerator):
10 """Class for Job Badges resource generator."""
11
12 def data(self):
13 """Create data for a copy of the Job Badges resource.
14
15 Returns:
16 A dictionary of the one page for the resource.
17 """
18 path = "static/img/resources/job-badges/job-badges"
19 image_path = "{}.png".format(path)
20 svg_path = "{}.svg".format(path)
21 image = Image.open(image_path)
22
23 draw = ImageDraw.Draw(image)
24 textbox_drawer = TextBoxDrawer(image, draw, svg_path)
25
26 hello_ids = [
27 "programmer_hello1",
28 "programmer_hello2",
29 "tester_hello1",
30 "tester_hello2",
31 "bot_hello1",
32 "bot_hello2",
33 ]
34
35 for hello_id in hello_ids:
36 textbox_drawer.write_text_box(
37 hello_id,
38 _("Hello, I'm a"),
39 horiz_just="center"
40 )
41
42 for i in range(1, 3):
43 textbox_drawer.write_text_box(
44 "programmer{}".format(i),
45 _("Programmer"),
46 horiz_just="center"
47 )
48 textbox_drawer.write_text_box(
49 "tester{}".format(i),
50 _("Tester"),
51 horiz_just="center"
52 )
53 textbox_drawer.write_text_box(
54 "bot{}".format(i),
55 _("Bot"),
56 horiz_just="center"
57 )
58
59 return {"type": "image", "data": image}
60
[end of csunplugged/resources/generators/JobBadgesResourceGenerator.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/csunplugged/resources/generators/JobBadgesResourceGenerator.py b/csunplugged/resources/generators/JobBadgesResourceGenerator.py
--- a/csunplugged/resources/generators/JobBadgesResourceGenerator.py
+++ b/csunplugged/resources/generators/JobBadgesResourceGenerator.py
@@ -1,9 +1,20 @@
"""Class for Job Badges resource generator."""
from PIL import Image, ImageDraw
-from resources.utils.BaseResourceGenerator import BaseResourceGenerator
+from utils.TextBoxDrawer import TextBox, TextBoxDrawer
from django.utils.translation import ugettext_lazy as _
-from utils.TextBoxDrawer import TextBoxDrawer
+from resources.utils.BaseResourceGenerator import BaseResourceGenerator
+from resources.utils.coords import calculate_box_vertices
+
+FONT_PATH = "static/fonts/PatrickHand-Regular.ttf"
+FONT_SIZE = 200
+TEXTBOX_WIDTH = 1000
+TEXTBOX_HEIGHT = 275
+LABEL_DATA = {
+ "programmer": _("Hello, I'm a Programmer"),
+ "tester": _("Hello, I'm a Tester"),
+ "bot": _("Hello, I'm a Bot"),
+}
class JobBadgesResourceGenerator(BaseResourceGenerator):
@@ -15,45 +26,38 @@
Returns:
A dictionary of the one page for the resource.
"""
- path = "static/img/resources/job-badges/job-badges"
- image_path = "{}.png".format(path)
- svg_path = "{}.svg".format(path)
+ image_path = "static/img/resources/job-badges/job-badges.png"
image = Image.open(image_path)
-
draw = ImageDraw.Draw(image)
- textbox_drawer = TextBoxDrawer(image, draw, svg_path)
-
- hello_ids = [
- "programmer_hello1",
- "programmer_hello2",
- "tester_hello1",
- "tester_hello2",
- "bot_hello1",
- "bot_hello2",
- ]
-
- for hello_id in hello_ids:
- textbox_drawer.write_text_box(
- hello_id,
- _("Hello, I'm a"),
- horiz_just="center"
- )
-
- for i in range(1, 3):
- textbox_drawer.write_text_box(
- "programmer{}".format(i),
- _("Programmer"),
- horiz_just="center"
- )
- textbox_drawer.write_text_box(
- "tester{}".format(i),
- _("Tester"),
- horiz_just="center"
- )
- textbox_drawer.write_text_box(
- "bot{}".format(i),
- _("Bot"),
- horiz_just="center"
- )
+ textbox_drawer = TextBoxDrawer(image, draw)
+
+ # coordinates of top left point of text box
+ top_left_x_coords = [50, 1200]
+ top_left_y_coord = 100
+
+ # Add text labels
+ for label, label_text in LABEL_DATA.items():
+ for top_left_x_coord in top_left_x_coords:
+ vertices = calculate_box_vertices(
+ (top_left_x_coord, top_left_y_coord),
+ TEXTBOX_WIDTH,
+ TEXTBOX_HEIGHT
+ )
+ box = TextBox(
+ vertices=vertices,
+ width=TEXTBOX_WIDTH,
+ height=TEXTBOX_HEIGHT,
+ font_path=FONT_PATH,
+ font_size=FONT_SIZE,
+ )
+ textbox_drawer.write_text_box(
+ box,
+ label_text,
+ horiz_just="center",
+ vert_just="center",
+ )
+
+ # increase y coord for next name tag down
+ top_left_y_coord += 675
return {"type": "image", "data": image}
| {"golden_diff": "diff --git a/csunplugged/resources/generators/JobBadgesResourceGenerator.py b/csunplugged/resources/generators/JobBadgesResourceGenerator.py\n--- a/csunplugged/resources/generators/JobBadgesResourceGenerator.py\n+++ b/csunplugged/resources/generators/JobBadgesResourceGenerator.py\n@@ -1,9 +1,20 @@\n \"\"\"Class for Job Badges resource generator.\"\"\"\n \n from PIL import Image, ImageDraw\n-from resources.utils.BaseResourceGenerator import BaseResourceGenerator\n+from utils.TextBoxDrawer import TextBox, TextBoxDrawer\n from django.utils.translation import ugettext_lazy as _\n-from utils.TextBoxDrawer import TextBoxDrawer\n+from resources.utils.BaseResourceGenerator import BaseResourceGenerator\n+from resources.utils.coords import calculate_box_vertices\n+\n+FONT_PATH = \"static/fonts/PatrickHand-Regular.ttf\"\n+FONT_SIZE = 200\n+TEXTBOX_WIDTH = 1000\n+TEXTBOX_HEIGHT = 275\n+LABEL_DATA = {\n+ \"programmer\": _(\"Hello, I'm a Programmer\"),\n+ \"tester\": _(\"Hello, I'm a Tester\"),\n+ \"bot\": _(\"Hello, I'm a Bot\"),\n+}\n \n \n class JobBadgesResourceGenerator(BaseResourceGenerator):\n@@ -15,45 +26,38 @@\n Returns:\n A dictionary of the one page for the resource.\n \"\"\"\n- path = \"static/img/resources/job-badges/job-badges\"\n- image_path = \"{}.png\".format(path)\n- svg_path = \"{}.svg\".format(path)\n+ image_path = \"static/img/resources/job-badges/job-badges.png\"\n image = Image.open(image_path)\n-\n draw = ImageDraw.Draw(image)\n- textbox_drawer = TextBoxDrawer(image, draw, svg_path)\n-\n- hello_ids = [\n- \"programmer_hello1\",\n- \"programmer_hello2\",\n- \"tester_hello1\",\n- \"tester_hello2\",\n- \"bot_hello1\",\n- \"bot_hello2\",\n- ]\n-\n- for hello_id in hello_ids:\n- textbox_drawer.write_text_box(\n- hello_id,\n- _(\"Hello, I'm a\"),\n- horiz_just=\"center\"\n- )\n-\n- for i in range(1, 3):\n- textbox_drawer.write_text_box(\n- \"programmer{}\".format(i),\n- _(\"Programmer\"),\n- horiz_just=\"center\"\n- )\n- textbox_drawer.write_text_box(\n- \"tester{}\".format(i),\n- _(\"Tester\"),\n- horiz_just=\"center\"\n- )\n- textbox_drawer.write_text_box(\n- \"bot{}\".format(i),\n- _(\"Bot\"),\n- horiz_just=\"center\"\n- )\n+ textbox_drawer = TextBoxDrawer(image, draw)\n+\n+ # coordinates of top left point of text box\n+ top_left_x_coords = [50, 1200]\n+ top_left_y_coord = 100\n+\n+ # Add text labels\n+ for label, label_text in LABEL_DATA.items():\n+ for top_left_x_coord in top_left_x_coords:\n+ vertices = calculate_box_vertices(\n+ (top_left_x_coord, top_left_y_coord),\n+ TEXTBOX_WIDTH,\n+ TEXTBOX_HEIGHT\n+ )\n+ box = TextBox(\n+ vertices=vertices,\n+ width=TEXTBOX_WIDTH,\n+ height=TEXTBOX_HEIGHT,\n+ font_path=FONT_PATH,\n+ font_size=FONT_SIZE,\n+ )\n+ textbox_drawer.write_text_box(\n+ box,\n+ label_text,\n+ horiz_just=\"center\",\n+ vert_just=\"center\",\n+ )\n+\n+ # increase y coord for next name tag down\n+ top_left_y_coord += 675\n \n return {\"type\": \"image\", \"data\": image}\n", "issue": "Modify Job Badges printable to use one string per badge\nCurrently the way the strings are broken for translation doesn't support all languages (for example: M\u0101ori has a word after the emphasis of the role).\n", "before_files": [{"content": "\"\"\"Class for Job Badges resource generator.\"\"\"\n\nfrom PIL import Image, ImageDraw\nfrom resources.utils.BaseResourceGenerator import BaseResourceGenerator\nfrom django.utils.translation import ugettext_lazy as _\nfrom utils.TextBoxDrawer import TextBoxDrawer\n\n\nclass JobBadgesResourceGenerator(BaseResourceGenerator):\n \"\"\"Class for Job Badges resource generator.\"\"\"\n\n def data(self):\n \"\"\"Create data for a copy of the Job Badges resource.\n\n Returns:\n A dictionary of the one page for the resource.\n \"\"\"\n path = \"static/img/resources/job-badges/job-badges\"\n image_path = \"{}.png\".format(path)\n svg_path = \"{}.svg\".format(path)\n image = Image.open(image_path)\n\n draw = ImageDraw.Draw(image)\n textbox_drawer = TextBoxDrawer(image, draw, svg_path)\n\n hello_ids = [\n \"programmer_hello1\",\n \"programmer_hello2\",\n \"tester_hello1\",\n \"tester_hello2\",\n \"bot_hello1\",\n \"bot_hello2\",\n ]\n\n for hello_id in hello_ids:\n textbox_drawer.write_text_box(\n hello_id,\n _(\"Hello, I'm a\"),\n horiz_just=\"center\"\n )\n\n for i in range(1, 3):\n textbox_drawer.write_text_box(\n \"programmer{}\".format(i),\n _(\"Programmer\"),\n horiz_just=\"center\"\n )\n textbox_drawer.write_text_box(\n \"tester{}\".format(i),\n _(\"Tester\"),\n horiz_just=\"center\"\n )\n textbox_drawer.write_text_box(\n \"bot{}\".format(i),\n _(\"Bot\"),\n horiz_just=\"center\"\n )\n\n return {\"type\": \"image\", \"data\": image}\n", "path": "csunplugged/resources/generators/JobBadgesResourceGenerator.py"}]} | 1,079 | 843 |
gh_patches_debug_429 | rasdani/github-patches | git_diff | qtile__qtile-2450 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Widgets missing from docs
Some widgets seem to have disappeared from the [official docs](http://docs.qtile.org/en/latest/manual/ref/widgets.html) (specifically `Mpris2` and `KeyboardKbdd`).
Given that these are two widgets that I've done some work on, it may be linked to that (but not immediately sure how).
I can do some bisecting and report back.
# Qtile version
Latest (3fb1e46 at time of posting)
EDIT: I can't replicate this on my system. However, given the identity of the two widgets, my guess is that this is related to `dbus-next` and that the modules need to be included in the `docs\conf.py` file here:
https://github.com/qtile/qtile/blob/3fb1e4645910c67bf6d302d59302dfb88f10c4ad/docs/conf.py#L27-L48
I'll submit a PR on that basis.
</issue>
<code>
[start of docs/conf.py]
1 # -*- coding: utf-8 -*-
2 #
3 # Qtile documentation build configuration file, created by
4 # sphinx-quickstart on Sat Feb 11 15:20:21 2012.
5 #
6 # This file is execfile()d with the current directory set to its containing dir.
7 #
8 # Note that not all possible configuration values are present in this
9 # autogenerated file.
10 #
11 # All configuration values have a default; values that are commented out
12 # serve to show the default.
13
14 import os
15 import setuptools_scm
16 import sys
17 from unittest.mock import MagicMock
18
19
20 class Mock(MagicMock):
21 # xcbq does a dir() on objects and pull stuff out of them and tries to sort
22 # the result. MagicMock has a bunch of stuff that can't be sorted, so let's
23 # like about dir().
24 def __dir__(self):
25 return []
26
27 MOCK_MODULES = [
28 'libqtile._ffi_pango',
29 'libqtile.backend.x11._ffi_xcursors',
30 'cairocffi',
31 'cairocffi.xcb',
32 'cairocffi.pixbuf',
33 'cffi',
34 'dateutil',
35 'dateutil.parser',
36 'iwlib',
37 'keyring',
38 'mpd',
39 'psutil',
40 'trollius',
41 'xcffib',
42 'xcffib.randr',
43 'xcffib.render',
44 'xcffib.xfixes',
45 'xcffib.xinerama',
46 'xcffib.xproto',
47 'xdg.IconTheme',
48 ]
49 sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
50
51 # If extensions (or modules to document with autodoc) are in another directory,
52 # add these directories to sys.path here. If the directory is relative to the
53 # documentation root, use os.path.abspath to make it absolute, like shown here.
54 sys.path.insert(0, os.path.abspath('.'))
55 sys.path.insert(0, os.path.abspath('../'))
56
57 # -- General configuration -----------------------------------------------------
58
59 # If your documentation needs a minimal Sphinx version, state it here.
60 #needs_sphinx = '1.0'
61
62 # Add any Sphinx extension module names here, as strings. They can be extensions
63 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
64 extensions = [
65 'sphinx.ext.autodoc',
66 'sphinx.ext.autosummary',
67 'sphinx.ext.coverage',
68 'sphinx.ext.graphviz',
69 'sphinx.ext.todo',
70 'sphinx.ext.viewcode',
71 'sphinxcontrib.seqdiag',
72 'sphinx_qtile',
73 'numpydoc',
74 ]
75
76 numpydoc_show_class_members = False
77
78 # Add any paths that contain templates here, relative to this directory.
79 templates_path = []
80
81 # The suffix of source filenames.
82 source_suffix = '.rst'
83
84 # The encoding of source files.
85 #source_encoding = 'utf-8-sig'
86
87 # The master toctree document.
88 master_doc = 'index'
89
90 # General information about the project.
91 project = u'Qtile'
92 copyright = u'2008-2020, Aldo Cortesi and contributers'
93
94 # The version info for the project you're documenting, acts as replacement for
95 # |version| and |release|, also used in various other places throughout the
96 # built documents.
97 #
98 # The short X.Y version.
99 version = setuptools_scm.get_version(root="..")
100 # The full version, including alpha/beta/rc tags.
101 release = version
102
103 # The language for content autogenerated by Sphinx. Refer to documentation
104 # for a list of supported languages.
105 #language = None
106
107 # There are two options for replacing |today|: either, you set today to some
108 # non-false value, then it is used:
109 #today = ''
110 # Else, today_fmt is used as the format for a strftime call.
111 #today_fmt = '%B %d, %Y'
112
113 # List of patterns, relative to source directory, that match files and
114 # directories to ignore when looking for source files.
115 exclude_patterns = ['_build']
116
117 # The reST default role (used for this markup: `text`) to use for all documents.
118 #default_role = None
119
120 # If true, '()' will be appended to :func: etc. cross-reference text.
121 #add_function_parentheses = True
122
123 # If true, the current module name will be prepended to all description
124 # unit titles (such as .. function::).
125 #add_module_names = True
126
127 # If true, sectionauthor and moduleauthor directives will be shown in the
128 # output. They are ignored by default.
129 #show_authors = False
130
131 # The name of the Pygments (syntax highlighting) style to use.
132 pygments_style = 'sphinx'
133
134 # A list of ignored prefixes for module index sorting.
135 #modindex_common_prefix = []
136
137 # If true, `todo` and `todoList` produce output, else they produce nothing.
138 todo_include_todos = True
139
140
141 # -- Options for HTML output --------fautod-------------------------------------------
142
143 # The theme to use for HTML and HTML Help pages. See the documentation for
144 # a list of builtin themes.
145 #html_theme = 'default'
146
147 # Theme options are theme-specific and customize the look and feel of a theme
148 # further. For a list of options available for each theme, see the
149 # documentation.
150 #html_theme_options = {}
151
152 # Add any paths that contain custom themes here, relative to this directory.
153 #html_theme_path = []
154
155 # The name for this set of Sphinx documents. If None, it defaults to
156 # "<project> v<release> documentation".
157 #html_title = None
158
159 # A shorter title for the navigation bar. Default is the same as html_title.
160 #html_short_title = None
161
162 # The name of an image file (relative to this directory) to place at the top
163 # of the sidebar.
164 #html_logo = None
165
166 # The name of an image file (within the static path) to use as favicon of the
167 # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
168 # pixels large.
169 html_favicon = '_static/favicon.ico'
170
171 # Add any paths that contain custom static files (such as style sheets) here,
172 # relative to this directory. They are copied after the builtin static files,
173 # so a file named "default.css" will overwrite the builtin "default.css".
174 html_static_path = ['_static']
175
176 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
177 # using the given strftime format.
178 #html_last_updated_fmt = '%b %d, %Y'
179
180 # If true, SmartyPants will be used to convert quotes and dashes to
181 # typographically correct entities.
182 #html_use_smartypants = True
183
184 # Custom sidebar templates, maps document names to template names.
185 #html_sidebars = {}
186
187 # Additional templates that should be rendered to pages, maps page names to
188 # template names.
189 #html_additional_pages = {'index': 'index.html'}
190
191 # If false, no module index is generated.
192 #html_domain_indices = True
193
194 # If false, no index is generated.
195 html_use_index = True
196
197 # If true, the index is split into individual pages for each letter.
198 #html_split_index = False
199
200 # If true, links to the reST sources are added to the pages.
201 #html_show_sourcelink = True
202
203 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
204 #html_show_sphinx = True
205
206 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
207 #html_show_copyright = True
208
209 # If true, an OpenSearch description file will be output, and all pages will
210 # contain a <link> tag referring to it. The value of this option must be the
211 # base URL from which the finished HTML is served.
212 #html_use_opensearch = ''
213
214 # This is the file name suffix for HTML files (e.g. ".xhtml").
215 #html_file_suffix = None
216
217 # Output file base name for HTML help builder.
218 htmlhelp_basename = 'Qtiledoc'
219
220
221 # -- Options for LaTeX output --------------------------------------------------
222
223 latex_elements = {
224 # The paper size ('letterpaper' or 'a4paper').
225 #'papersize': 'letterpaper',
226
227 # The font size ('10pt', '11pt' or '12pt').
228 #'pointsize': '10pt',
229
230 # Additional stuff for the LaTeX preamble.
231 #'preamble': '',
232 }
233
234 # Grouping the document tree into LaTeX files. List of tuples
235 # (source start file, target name, title, author, documentclass [howto/manual]).
236 latex_documents = [
237 ('index', 'Qtile.tex', u'Qtile Documentation',
238 u'Aldo Cortesi', 'manual'),
239 ]
240
241 # The name of an image file (relative to this directory) to place at the top of
242 # the title page.
243 #latex_logo = None
244
245 # For "manual" documents, if this is true, then toplevel headings are parts,
246 # not chapters.
247 #latex_use_parts = False
248
249 # If true, show page references after internal links.
250 #latex_show_pagerefs = False
251
252 # If true, show URL addresses after external links.
253 #latex_show_urls = False
254
255 # Documents to append as an appendix to all manuals.
256 #latex_appendices = []
257
258 # If false, no module index is generated.
259 #latex_domain_indices = True
260
261
262 # -- Options for manual page output --------------------------------------------
263
264 # One entry per manual page. List of tuples
265 # (source start file, name, description, authors, manual section).
266 #man_pages = []
267
268 # If true, show URL addresses after external links.
269 #man_show_urls = False
270
271
272 # -- Options for Texinfo output ------------------------------------------------
273
274 # Grouping the document tree into Texinfo files. List of tuples
275 # (source start file, target name, title, author,
276 # dir menu entry, description, category)
277 texinfo_documents = [
278 ('index', 'Qtile', u'Qtile Documentation',
279 u'Aldo Cortesi', 'Qtile', 'A hackable tiling window manager.',
280 'Miscellaneous'),
281 ]
282
283 # Documents to append as an appendix to all manuals.
284 #texinfo_appendices = []
285
286 # If false, no module index is generated.
287 #texinfo_domain_indices = True
288
289 # How to display URL addresses: 'footnote', 'no', or 'inline'.
290 #texinfo_show_urls = 'footnote'
291
292 # only import and set the theme if we're building docs locally
293 if not os.environ.get('READTHEDOCS'):
294 import sphinx_rtd_theme
295 html_theme = 'sphinx_rtd_theme'
296 html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
297
298
299 graphviz_dot_args = ['-Lg']
300
301 # A workaround for the responsive tables always having annoying scrollbars.
302 def setup(app):
303 app.add_css_file("no_scrollbars.css")
304
[end of docs/conf.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/docs/conf.py b/docs/conf.py
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -33,6 +33,10 @@
'cffi',
'dateutil',
'dateutil.parser',
+ 'dbus_next',
+ 'dbus_next.aio',
+ 'dbus_next.service',
+ 'dbus_next.constants',
'iwlib',
'keyring',
'mpd',
| {"golden_diff": "diff --git a/docs/conf.py b/docs/conf.py\n--- a/docs/conf.py\n+++ b/docs/conf.py\n@@ -33,6 +33,10 @@\n 'cffi',\n 'dateutil',\n 'dateutil.parser',\n+ 'dbus_next',\n+ 'dbus_next.aio',\n+ 'dbus_next.service',\n+ 'dbus_next.constants',\n 'iwlib',\n 'keyring',\n 'mpd',\n", "issue": "Widgets missing from docs\nSome widgets seem to have disappeared from the [official docs](http://docs.qtile.org/en/latest/manual/ref/widgets.html) (specifically `Mpris2` and `KeyboardKbdd`).\r\n\r\nGiven that these are two widgets that I've done some work on, it may be linked to that (but not immediately sure how).\r\n\r\nI can do some bisecting and report back.\r\n\r\n# Qtile version\r\n\r\nLatest (3fb1e46 at time of posting)\r\n\r\n\r\nEDIT: I can't replicate this on my system. However, given the identity of the two widgets, my guess is that this is related to `dbus-next` and that the modules need to be included in the `docs\\conf.py` file here:\r\nhttps://github.com/qtile/qtile/blob/3fb1e4645910c67bf6d302d59302dfb88f10c4ad/docs/conf.py#L27-L48\r\n\r\nI'll submit a PR on that basis.\r\n\r\n\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n#\n# Qtile documentation build configuration file, created by\n# sphinx-quickstart on Sat Feb 11 15:20:21 2012.\n#\n# This file is execfile()d with the current directory set to its containing dir.\n#\n# Note that not all possible configuration values are present in this\n# autogenerated file.\n#\n# All configuration values have a default; values that are commented out\n# serve to show the default.\n\nimport os\nimport setuptools_scm\nimport sys\nfrom unittest.mock import MagicMock\n\n\nclass Mock(MagicMock):\n # xcbq does a dir() on objects and pull stuff out of them and tries to sort\n # the result. MagicMock has a bunch of stuff that can't be sorted, so let's\n # like about dir().\n def __dir__(self):\n return []\n\nMOCK_MODULES = [\n 'libqtile._ffi_pango',\n 'libqtile.backend.x11._ffi_xcursors',\n 'cairocffi',\n 'cairocffi.xcb',\n 'cairocffi.pixbuf',\n 'cffi',\n 'dateutil',\n 'dateutil.parser',\n 'iwlib',\n 'keyring',\n 'mpd',\n 'psutil',\n 'trollius',\n 'xcffib',\n 'xcffib.randr',\n 'xcffib.render',\n 'xcffib.xfixes',\n 'xcffib.xinerama',\n 'xcffib.xproto',\n 'xdg.IconTheme',\n]\nsys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)\n\n# If extensions (or modules to document with autodoc) are in another directory,\n# add these directories to sys.path here. If the directory is relative to the\n# documentation root, use os.path.abspath to make it absolute, like shown here.\nsys.path.insert(0, os.path.abspath('.'))\nsys.path.insert(0, os.path.abspath('../'))\n\n# -- General configuration -----------------------------------------------------\n\n# If your documentation needs a minimal Sphinx version, state it here.\n#needs_sphinx = '1.0'\n\n# Add any Sphinx extension module names here, as strings. They can be extensions\n# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.\nextensions = [\n 'sphinx.ext.autodoc',\n 'sphinx.ext.autosummary',\n 'sphinx.ext.coverage',\n 'sphinx.ext.graphviz',\n 'sphinx.ext.todo',\n 'sphinx.ext.viewcode',\n 'sphinxcontrib.seqdiag',\n 'sphinx_qtile',\n 'numpydoc',\n]\n\nnumpydoc_show_class_members = False\n\n# Add any paths that contain templates here, relative to this directory.\ntemplates_path = []\n\n# The suffix of source filenames.\nsource_suffix = '.rst'\n\n# The encoding of source files.\n#source_encoding = 'utf-8-sig'\n\n# The master toctree document.\nmaster_doc = 'index'\n\n# General information about the project.\nproject = u'Qtile'\ncopyright = u'2008-2020, Aldo Cortesi and contributers'\n\n# The version info for the project you're documenting, acts as replacement for\n# |version| and |release|, also used in various other places throughout the\n# built documents.\n#\n# The short X.Y version.\nversion = setuptools_scm.get_version(root=\"..\")\n# The full version, including alpha/beta/rc tags.\nrelease = version\n\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n#language = None\n\n# There are two options for replacing |today|: either, you set today to some\n# non-false value, then it is used:\n#today = ''\n# Else, today_fmt is used as the format for a strftime call.\n#today_fmt = '%B %d, %Y'\n\n# List of patterns, relative to source directory, that match files and\n# directories to ignore when looking for source files.\nexclude_patterns = ['_build']\n\n# The reST default role (used for this markup: `text`) to use for all documents.\n#default_role = None\n\n# If true, '()' will be appended to :func: etc. cross-reference text.\n#add_function_parentheses = True\n\n# If true, the current module name will be prepended to all description\n# unit titles (such as .. function::).\n#add_module_names = True\n\n# If true, sectionauthor and moduleauthor directives will be shown in the\n# output. They are ignored by default.\n#show_authors = False\n\n# The name of the Pygments (syntax highlighting) style to use.\npygments_style = 'sphinx'\n\n# A list of ignored prefixes for module index sorting.\n#modindex_common_prefix = []\n\n# If true, `todo` and `todoList` produce output, else they produce nothing.\ntodo_include_todos = True\n\n\n# -- Options for HTML output --------fautod-------------------------------------------\n\n# The theme to use for HTML and HTML Help pages. See the documentation for\n# a list of builtin themes.\n#html_theme = 'default'\n\n# Theme options are theme-specific and customize the look and feel of a theme\n# further. For a list of options available for each theme, see the\n# documentation.\n#html_theme_options = {}\n\n# Add any paths that contain custom themes here, relative to this directory.\n#html_theme_path = []\n\n# The name for this set of Sphinx documents. If None, it defaults to\n# \"<project> v<release> documentation\".\n#html_title = None\n\n# A shorter title for the navigation bar. Default is the same as html_title.\n#html_short_title = None\n\n# The name of an image file (relative to this directory) to place at the top\n# of the sidebar.\n#html_logo = None\n\n# The name of an image file (within the static path) to use as favicon of the\n# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32\n# pixels large.\nhtml_favicon = '_static/favicon.ico'\n\n# Add any paths that contain custom static files (such as style sheets) here,\n# relative to this directory. They are copied after the builtin static files,\n# so a file named \"default.css\" will overwrite the builtin \"default.css\".\nhtml_static_path = ['_static']\n\n# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,\n# using the given strftime format.\n#html_last_updated_fmt = '%b %d, %Y'\n\n# If true, SmartyPants will be used to convert quotes and dashes to\n# typographically correct entities.\n#html_use_smartypants = True\n\n# Custom sidebar templates, maps document names to template names.\n#html_sidebars = {}\n\n# Additional templates that should be rendered to pages, maps page names to\n# template names.\n#html_additional_pages = {'index': 'index.html'}\n\n# If false, no module index is generated.\n#html_domain_indices = True\n\n# If false, no index is generated.\nhtml_use_index = True\n\n# If true, the index is split into individual pages for each letter.\n#html_split_index = False\n\n# If true, links to the reST sources are added to the pages.\n#html_show_sourcelink = True\n\n# If true, \"Created using Sphinx\" is shown in the HTML footer. Default is True.\n#html_show_sphinx = True\n\n# If true, \"(C) Copyright ...\" is shown in the HTML footer. Default is True.\n#html_show_copyright = True\n\n# If true, an OpenSearch description file will be output, and all pages will\n# contain a <link> tag referring to it. The value of this option must be the\n# base URL from which the finished HTML is served.\n#html_use_opensearch = ''\n\n# This is the file name suffix for HTML files (e.g. \".xhtml\").\n#html_file_suffix = None\n\n# Output file base name for HTML help builder.\nhtmlhelp_basename = 'Qtiledoc'\n\n\n# -- Options for LaTeX output --------------------------------------------------\n\nlatex_elements = {\n# The paper size ('letterpaper' or 'a4paper').\n#'papersize': 'letterpaper',\n\n# The font size ('10pt', '11pt' or '12pt').\n#'pointsize': '10pt',\n\n# Additional stuff for the LaTeX preamble.\n#'preamble': '',\n}\n\n# Grouping the document tree into LaTeX files. List of tuples\n# (source start file, target name, title, author, documentclass [howto/manual]).\nlatex_documents = [\n ('index', 'Qtile.tex', u'Qtile Documentation',\n u'Aldo Cortesi', 'manual'),\n]\n\n# The name of an image file (relative to this directory) to place at the top of\n# the title page.\n#latex_logo = None\n\n# For \"manual\" documents, if this is true, then toplevel headings are parts,\n# not chapters.\n#latex_use_parts = False\n\n# If true, show page references after internal links.\n#latex_show_pagerefs = False\n\n# If true, show URL addresses after external links.\n#latex_show_urls = False\n\n# Documents to append as an appendix to all manuals.\n#latex_appendices = []\n\n# If false, no module index is generated.\n#latex_domain_indices = True\n\n\n# -- Options for manual page output --------------------------------------------\n\n# One entry per manual page. List of tuples\n# (source start file, name, description, authors, manual section).\n#man_pages = []\n\n# If true, show URL addresses after external links.\n#man_show_urls = False\n\n\n# -- Options for Texinfo output ------------------------------------------------\n\n# Grouping the document tree into Texinfo files. List of tuples\n# (source start file, target name, title, author,\n# dir menu entry, description, category)\ntexinfo_documents = [\n ('index', 'Qtile', u'Qtile Documentation',\n u'Aldo Cortesi', 'Qtile', 'A hackable tiling window manager.',\n 'Miscellaneous'),\n]\n\n# Documents to append as an appendix to all manuals.\n#texinfo_appendices = []\n\n# If false, no module index is generated.\n#texinfo_domain_indices = True\n\n# How to display URL addresses: 'footnote', 'no', or 'inline'.\n#texinfo_show_urls = 'footnote'\n\n# only import and set the theme if we're building docs locally\nif not os.environ.get('READTHEDOCS'):\n import sphinx_rtd_theme\n html_theme = 'sphinx_rtd_theme'\n html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]\n\n\ngraphviz_dot_args = ['-Lg']\n\n# A workaround for the responsive tables always having annoying scrollbars.\ndef setup(app):\n app.add_css_file(\"no_scrollbars.css\")\n", "path": "docs/conf.py"}]} | 3,944 | 96 |
gh_patches_debug_33522 | rasdani/github-patches | git_diff | getsentry__sentry-python-153 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
RQ: Job shutdown problems
RQ forks, so each job will have its own transport. This is not a great situation as we would have to block each job to send out pending events.
Right now this can mean that some events of a job go missing.
Idea would be to use `multiprocessing.Queue` inside of the transport, but unclear if we can pull that off without disrupting other usecases.
</issue>
<code>
[start of setup.py]
1 #!/usr/bin/env python
2
3 """
4 Sentry-Python - Sentry SDK for Python
5 =====================================
6
7 **Sentry-Python is an SDK for Sentry.** Check out `GitHub
8 <https://github.com/getsentry/sentry-python>`_ to find out more.
9 """
10
11 from setuptools import setup, find_packages
12
13 setup(
14 name="sentry-sdk",
15 version="0.5.1",
16 author="Sentry Team and Contributors",
17 author_email="[email protected]",
18 url="https://github.com/getsentry/sentry-python",
19 description="Python client for Sentry (https://getsentry.com)",
20 long_description=__doc__,
21 packages=find_packages(exclude=("tests", "tests.*")),
22 zip_safe=False,
23 license="BSD",
24 install_requires=["urllib3", "certifi"],
25 extras_require={"flask": ["flask>=0.8", "blinker>=1.1"]},
26 classifiers=[
27 'Development Status :: 5 - Production/Stable',
28 'Environment :: Web Environment',
29 'Intended Audience :: Developers',
30 'License :: OSI Approved :: BSD License',
31 'Operating System :: OS Independent',
32 'Programming Language :: Python',
33 'Programming Language :: Python :: 2',
34 'Programming Language :: Python :: 2.7',
35 'Programming Language :: Python :: 3',
36 'Programming Language :: Python :: 3.4',
37 'Programming Language :: Python :: 3.5',
38 'Programming Language :: Python :: 3.6',
39 'Programming Language :: Python :: 3.7',
40 'Topic :: Software Development :: Libraries :: Python Modules',
41 ],
42 )
43
[end of setup.py]
[start of sentry_sdk/integrations/rq.py]
1 from __future__ import absolute_import
2
3 import weakref
4
5 from sentry_sdk.hub import Hub
6 from sentry_sdk.integrations import Integration
7 from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
8
9 from rq.timeouts import JobTimeoutException
10 from rq.worker import Worker
11
12
13 class RqIntegration(Integration):
14 identifier = "rq"
15
16 @staticmethod
17 def setup_once():
18
19 old_perform_job = Worker.perform_job
20
21 def sentry_patched_perform_job(self, job, *args, **kwargs):
22 hub = Hub.current
23 integration = hub.get_integration(RqIntegration)
24
25 if integration is None:
26 return old_perform_job(self, job, *args, **kwargs)
27
28 with hub.push_scope() as scope:
29 scope.add_event_processor(_make_event_processor(weakref.ref(job)))
30 return old_perform_job(self, job, *args, **kwargs)
31
32 Worker.perform_job = sentry_patched_perform_job
33
34 old_handle_exception = Worker.handle_exception
35
36 def sentry_patched_handle_exception(self, job, *exc_info, **kwargs):
37 _capture_exception(exc_info)
38 return old_handle_exception(self, job, *exc_info, **kwargs)
39
40 Worker.handle_exception = sentry_patched_handle_exception
41
42
43 def _make_event_processor(weak_job):
44 def event_processor(event, hint):
45 job = weak_job()
46 if job is not None:
47 with capture_internal_exceptions():
48 if "transaction" not in event:
49 event["transaction"] = job.func_name
50
51 with capture_internal_exceptions():
52 extra = event.setdefault("extra", {})
53 extra["rq-job"] = {
54 "job_id": job.id,
55 "func": job.func_name,
56 "args": job.args,
57 "kwargs": job.kwargs,
58 "description": job.description,
59 }
60
61 if "exc_info" in hint:
62 with capture_internal_exceptions():
63 if issubclass(hint["exc_info"][0], JobTimeoutException):
64 event["fingerprint"] = ["rq", "JobTimeoutException", job.func_name]
65
66 return event
67
68 return event_processor
69
70
71 def _capture_exception(exc_info, **kwargs):
72 hub = Hub.current
73 if hub.get_integration(RqIntegration) is None:
74 return
75 event, hint = event_from_exception(
76 exc_info,
77 client_options=hub.client.options,
78 mechanism={"type": "rq", "handled": False},
79 )
80
81 hub.capture_event(event, hint=hint)
82
[end of sentry_sdk/integrations/rq.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/sentry_sdk/integrations/rq.py b/sentry_sdk/integrations/rq.py
--- a/sentry_sdk/integrations/rq.py
+++ b/sentry_sdk/integrations/rq.py
@@ -27,7 +27,18 @@
with hub.push_scope() as scope:
scope.add_event_processor(_make_event_processor(weakref.ref(job)))
- return old_perform_job(self, job, *args, **kwargs)
+ rv = old_perform_job(self, job, *args, **kwargs)
+
+ if self.is_horse:
+ # We're inside of a forked process and RQ is
+ # about to call `os._exit`. Make sure that our
+ # events get sent out.
+ #
+ # Closing the client should not affect other jobs since
+ # we're in a different process
+ hub.client.close()
+
+ return rv
Worker.perform_job = sentry_patched_perform_job
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -24,19 +24,19 @@
install_requires=["urllib3", "certifi"],
extras_require={"flask": ["flask>=0.8", "blinker>=1.1"]},
classifiers=[
- 'Development Status :: 5 - Production/Stable',
- 'Environment :: Web Environment',
- 'Intended Audience :: Developers',
- 'License :: OSI Approved :: BSD License',
- 'Operating System :: OS Independent',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.4',
- 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 3.6',
- 'Programming Language :: Python :: 3.7',
- 'Topic :: Software Development :: Libraries :: Python Modules',
+ "Development Status :: 5 - Production/Stable",
+ "Environment :: Web Environment",
+ "Intended Audience :: Developers",
+ "License :: OSI Approved :: BSD License",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 2",
+ "Programming Language :: Python :: 2.7",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.4",
+ "Programming Language :: Python :: 3.5",
+ "Programming Language :: Python :: 3.6",
+ "Programming Language :: Python :: 3.7",
+ "Topic :: Software Development :: Libraries :: Python Modules",
],
)
| {"golden_diff": "diff --git a/sentry_sdk/integrations/rq.py b/sentry_sdk/integrations/rq.py\n--- a/sentry_sdk/integrations/rq.py\n+++ b/sentry_sdk/integrations/rq.py\n@@ -27,7 +27,18 @@\n \n with hub.push_scope() as scope:\n scope.add_event_processor(_make_event_processor(weakref.ref(job)))\n- return old_perform_job(self, job, *args, **kwargs)\n+ rv = old_perform_job(self, job, *args, **kwargs)\n+\n+ if self.is_horse:\n+ # We're inside of a forked process and RQ is\n+ # about to call `os._exit`. Make sure that our\n+ # events get sent out.\n+ #\n+ # Closing the client should not affect other jobs since\n+ # we're in a different process\n+ hub.client.close()\n+\n+ return rv\n \n Worker.perform_job = sentry_patched_perform_job\n \ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -24,19 +24,19 @@\n install_requires=[\"urllib3\", \"certifi\"],\n extras_require={\"flask\": [\"flask>=0.8\", \"blinker>=1.1\"]},\n classifiers=[\n- 'Development Status :: 5 - Production/Stable',\n- 'Environment :: Web Environment',\n- 'Intended Audience :: Developers',\n- 'License :: OSI Approved :: BSD License',\n- 'Operating System :: OS Independent',\n- 'Programming Language :: Python',\n- 'Programming Language :: Python :: 2',\n- 'Programming Language :: Python :: 2.7',\n- 'Programming Language :: Python :: 3',\n- 'Programming Language :: Python :: 3.4',\n- 'Programming Language :: Python :: 3.5',\n- 'Programming Language :: Python :: 3.6',\n- 'Programming Language :: Python :: 3.7',\n- 'Topic :: Software Development :: Libraries :: Python Modules',\n+ \"Development Status :: 5 - Production/Stable\",\n+ \"Environment :: Web Environment\",\n+ \"Intended Audience :: Developers\",\n+ \"License :: OSI Approved :: BSD License\",\n+ \"Operating System :: OS Independent\",\n+ \"Programming Language :: Python\",\n+ \"Programming Language :: Python :: 2\",\n+ \"Programming Language :: Python :: 2.7\",\n+ \"Programming Language :: Python :: 3\",\n+ \"Programming Language :: Python :: 3.4\",\n+ \"Programming Language :: Python :: 3.5\",\n+ \"Programming Language :: Python :: 3.6\",\n+ \"Programming Language :: Python :: 3.7\",\n+ \"Topic :: Software Development :: Libraries :: Python Modules\",\n ],\n )\n", "issue": "RQ: Job shutdown problems\nRQ forks, so each job will have its own transport. This is not a great situation as we would have to block each job to send out pending events.\r\n\r\nRight now this can mean that some events of a job go missing.\r\n\r\nIdea would be to use `multiprocessing.Queue` inside of the transport, but unclear if we can pull that off without disrupting other usecases.\n", "before_files": [{"content": "#!/usr/bin/env python\n\n\"\"\"\nSentry-Python - Sentry SDK for Python\n=====================================\n\n**Sentry-Python is an SDK for Sentry.** Check out `GitHub\n<https://github.com/getsentry/sentry-python>`_ to find out more.\n\"\"\"\n\nfrom setuptools import setup, find_packages\n\nsetup(\n name=\"sentry-sdk\",\n version=\"0.5.1\",\n author=\"Sentry Team and Contributors\",\n author_email=\"[email protected]\",\n url=\"https://github.com/getsentry/sentry-python\",\n description=\"Python client for Sentry (https://getsentry.com)\",\n long_description=__doc__,\n packages=find_packages(exclude=(\"tests\", \"tests.*\")),\n zip_safe=False,\n license=\"BSD\",\n install_requires=[\"urllib3\", \"certifi\"],\n extras_require={\"flask\": [\"flask>=0.8\", \"blinker>=1.1\"]},\n classifiers=[\n 'Development Status :: 5 - Production/Stable',\n 'Environment :: Web Environment',\n 'Intended Audience :: Developers',\n 'License :: OSI Approved :: BSD License',\n 'Operating System :: OS Independent',\n 'Programming Language :: Python',\n 'Programming Language :: Python :: 2',\n 'Programming Language :: Python :: 2.7',\n 'Programming Language :: Python :: 3',\n 'Programming Language :: Python :: 3.4',\n 'Programming Language :: Python :: 3.5',\n 'Programming Language :: Python :: 3.6',\n 'Programming Language :: Python :: 3.7',\n 'Topic :: Software Development :: Libraries :: Python Modules',\n ],\n)\n", "path": "setup.py"}, {"content": "from __future__ import absolute_import\n\nimport weakref\n\nfrom sentry_sdk.hub import Hub\nfrom sentry_sdk.integrations import Integration\nfrom sentry_sdk.utils import capture_internal_exceptions, event_from_exception\n\nfrom rq.timeouts import JobTimeoutException\nfrom rq.worker import Worker\n\n\nclass RqIntegration(Integration):\n identifier = \"rq\"\n\n @staticmethod\n def setup_once():\n\n old_perform_job = Worker.perform_job\n\n def sentry_patched_perform_job(self, job, *args, **kwargs):\n hub = Hub.current\n integration = hub.get_integration(RqIntegration)\n\n if integration is None:\n return old_perform_job(self, job, *args, **kwargs)\n\n with hub.push_scope() as scope:\n scope.add_event_processor(_make_event_processor(weakref.ref(job)))\n return old_perform_job(self, job, *args, **kwargs)\n\n Worker.perform_job = sentry_patched_perform_job\n\n old_handle_exception = Worker.handle_exception\n\n def sentry_patched_handle_exception(self, job, *exc_info, **kwargs):\n _capture_exception(exc_info)\n return old_handle_exception(self, job, *exc_info, **kwargs)\n\n Worker.handle_exception = sentry_patched_handle_exception\n\n\ndef _make_event_processor(weak_job):\n def event_processor(event, hint):\n job = weak_job()\n if job is not None:\n with capture_internal_exceptions():\n if \"transaction\" not in event:\n event[\"transaction\"] = job.func_name\n\n with capture_internal_exceptions():\n extra = event.setdefault(\"extra\", {})\n extra[\"rq-job\"] = {\n \"job_id\": job.id,\n \"func\": job.func_name,\n \"args\": job.args,\n \"kwargs\": job.kwargs,\n \"description\": job.description,\n }\n\n if \"exc_info\" in hint:\n with capture_internal_exceptions():\n if issubclass(hint[\"exc_info\"][0], JobTimeoutException):\n event[\"fingerprint\"] = [\"rq\", \"JobTimeoutException\", job.func_name]\n\n return event\n\n return event_processor\n\n\ndef _capture_exception(exc_info, **kwargs):\n hub = Hub.current\n if hub.get_integration(RqIntegration) is None:\n return\n event, hint = event_from_exception(\n exc_info,\n client_options=hub.client.options,\n mechanism={\"type\": \"rq\", \"handled\": False},\n )\n\n hub.capture_event(event, hint=hint)\n", "path": "sentry_sdk/integrations/rq.py"}]} | 1,758 | 613 |
gh_patches_debug_50239 | rasdani/github-patches | git_diff | sopel-irc__sopel-1419 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
User objects aren't updated on NICK events
````
<Reptarsaurus> Okay, I just tested....I am doing users = chans[chan].users.values() after
a nick change, and 'for user in users: print(user.nick)' is showing the
nick pre-change.
````
This report from Sopel's IRC channel told me something was off in the code that keeps track of users, and indeed something is. Nowhere in the `coretasks` handler for `NICK` events does Sopel update the user object's `nick` property:
https://github.com/sopel-irc/sopel/blob/d4c4c16f850b63776b156fc8c9d3812287b15882/sopel/coretasks.py#L275-L284
`Channel.rename_user()` doesn't touch it either:
https://github.com/sopel-irc/sopel/blob/d4c4c16f850b63776b156fc8c9d3812287b15882/sopel/tools/target.py#L76-L80
I can't find any place in the code where this property gets updated, ever, and that's a bug. Thanks to Reptarsaurus for stumbling onto this, and it should be fixed in the next Sopel version.
</issue>
<code>
[start of sopel/tools/target.py]
1 # coding=utf-8
2 from __future__ import unicode_literals, absolute_import, print_function, division
3
4 import functools
5 from sopel.tools import Identifier
6
7
8 @functools.total_ordering
9 class User(object):
10 """A representation of a user Sopel is aware of."""
11 def __init__(self, nick, user, host):
12 assert isinstance(nick, Identifier)
13 self.nick = nick
14 """The user's nickname."""
15 self.user = user
16 """The user's local username."""
17 self.host = host
18 """The user's hostname."""
19 self.channels = {}
20 """The channels the user is in.
21
22 This maps channel name ``Identifier``\\s to ``Channel`` objects."""
23 self.account = None
24 """The IRC services account of the user.
25
26 This relies on IRCv3 account tracking being enabled."""
27 self.away = None
28 """Whether the user is marked as away."""
29
30 hostmask = property(lambda self: '{}!{}@{}'.format(self.nick, self.user,
31 self.host))
32 """The user's full hostmask."""
33
34 def __eq__(self, other):
35 if not isinstance(other, User):
36 return NotImplemented
37 return self.nick == other.nick
38
39 def __lt__(self, other):
40 if not isinstance(other, User):
41 return NotImplemented
42 return self.nick < other.nick
43
44
45 @functools.total_ordering
46 class Channel(object):
47 """A representation of a channel Sopel is in."""
48 def __init__(self, name):
49 assert isinstance(name, Identifier)
50 self.name = name
51 """The name of the channel."""
52 self.users = {}
53 """The users in the channel.
54
55 This maps username ``Identifier``\\s to channel objects."""
56 self.privileges = {}
57 """The permissions of the users in the channel.
58
59 This maps username ``Identifier``s to bitwise integer values. This can
60 be compared to appropriate constants from ``sopel.module``."""
61 self.topic = ''
62 """The topic of the channel."""
63
64 def clear_user(self, nick):
65 user = self.users.pop(nick, None)
66 self.privileges.pop(nick, None)
67 if user is not None:
68 user.channels.pop(self.name, None)
69
70 def add_user(self, user):
71 assert isinstance(user, User)
72 self.users[user.nick] = user
73 self.privileges[user.nick] = 0
74 user.channels[self.name] = self
75
76 def rename_user(self, old, new):
77 if old in self.users:
78 self.users[new] = self.users.pop(old)
79 if old in self.privileges:
80 self.privileges[new] = self.privileges.pop(old)
81
82 def __eq__(self, other):
83 if not isinstance(other, Channel):
84 return NotImplemented
85 return self.name == other.name
86
87 def __lt__(self, other):
88 if not isinstance(other, Channel):
89 return NotImplemented
90 return self.name < other.name
91
[end of sopel/tools/target.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/sopel/tools/target.py b/sopel/tools/target.py
--- a/sopel/tools/target.py
+++ b/sopel/tools/target.py
@@ -76,6 +76,7 @@
def rename_user(self, old, new):
if old in self.users:
self.users[new] = self.users.pop(old)
+ self.users[new].nick = new
if old in self.privileges:
self.privileges[new] = self.privileges.pop(old)
| {"golden_diff": "diff --git a/sopel/tools/target.py b/sopel/tools/target.py\n--- a/sopel/tools/target.py\n+++ b/sopel/tools/target.py\n@@ -76,6 +76,7 @@\n def rename_user(self, old, new):\n if old in self.users:\n self.users[new] = self.users.pop(old)\n+ self.users[new].nick = new\n if old in self.privileges:\n self.privileges[new] = self.privileges.pop(old)\n", "issue": "User objects aren't updated on NICK events\n````\r\n<Reptarsaurus> Okay, I just tested....I am doing users = chans[chan].users.values() after\r\n a nick change, and 'for user in users: print(user.nick)' is showing the\r\n nick pre-change.\r\n````\r\n\r\nThis report from Sopel's IRC channel told me something was off in the code that keeps track of users, and indeed something is. Nowhere in the `coretasks` handler for `NICK` events does Sopel update the user object's `nick` property:\r\n\r\nhttps://github.com/sopel-irc/sopel/blob/d4c4c16f850b63776b156fc8c9d3812287b15882/sopel/coretasks.py#L275-L284\r\n\r\n`Channel.rename_user()` doesn't touch it either:\r\n\r\nhttps://github.com/sopel-irc/sopel/blob/d4c4c16f850b63776b156fc8c9d3812287b15882/sopel/tools/target.py#L76-L80\r\n\r\nI can't find any place in the code where this property gets updated, ever, and that's a bug. Thanks to Reptarsaurus for stumbling onto this, and it should be fixed in the next Sopel version.\n", "before_files": [{"content": "# coding=utf-8\nfrom __future__ import unicode_literals, absolute_import, print_function, division\n\nimport functools\nfrom sopel.tools import Identifier\n\n\[email protected]_ordering\nclass User(object):\n \"\"\"A representation of a user Sopel is aware of.\"\"\"\n def __init__(self, nick, user, host):\n assert isinstance(nick, Identifier)\n self.nick = nick\n \"\"\"The user's nickname.\"\"\"\n self.user = user\n \"\"\"The user's local username.\"\"\"\n self.host = host\n \"\"\"The user's hostname.\"\"\"\n self.channels = {}\n \"\"\"The channels the user is in.\n\n This maps channel name ``Identifier``\\\\s to ``Channel`` objects.\"\"\"\n self.account = None\n \"\"\"The IRC services account of the user.\n\n This relies on IRCv3 account tracking being enabled.\"\"\"\n self.away = None\n \"\"\"Whether the user is marked as away.\"\"\"\n\n hostmask = property(lambda self: '{}!{}@{}'.format(self.nick, self.user,\n self.host))\n \"\"\"The user's full hostmask.\"\"\"\n\n def __eq__(self, other):\n if not isinstance(other, User):\n return NotImplemented\n return self.nick == other.nick\n\n def __lt__(self, other):\n if not isinstance(other, User):\n return NotImplemented\n return self.nick < other.nick\n\n\[email protected]_ordering\nclass Channel(object):\n \"\"\"A representation of a channel Sopel is in.\"\"\"\n def __init__(self, name):\n assert isinstance(name, Identifier)\n self.name = name\n \"\"\"The name of the channel.\"\"\"\n self.users = {}\n \"\"\"The users in the channel.\n\n This maps username ``Identifier``\\\\s to channel objects.\"\"\"\n self.privileges = {}\n \"\"\"The permissions of the users in the channel.\n\n This maps username ``Identifier``s to bitwise integer values. This can\n be compared to appropriate constants from ``sopel.module``.\"\"\"\n self.topic = ''\n \"\"\"The topic of the channel.\"\"\"\n\n def clear_user(self, nick):\n user = self.users.pop(nick, None)\n self.privileges.pop(nick, None)\n if user is not None:\n user.channels.pop(self.name, None)\n\n def add_user(self, user):\n assert isinstance(user, User)\n self.users[user.nick] = user\n self.privileges[user.nick] = 0\n user.channels[self.name] = self\n\n def rename_user(self, old, new):\n if old in self.users:\n self.users[new] = self.users.pop(old)\n if old in self.privileges:\n self.privileges[new] = self.privileges.pop(old)\n\n def __eq__(self, other):\n if not isinstance(other, Channel):\n return NotImplemented\n return self.name == other.name\n\n def __lt__(self, other):\n if not isinstance(other, Channel):\n return NotImplemented\n return self.name < other.name\n", "path": "sopel/tools/target.py"}]} | 1,664 | 107 |
gh_patches_debug_18934 | rasdani/github-patches | git_diff | readthedocs__readthedocs.org-8781 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Use `django-storages`'s manifest files class
`django-storages` already implemented the manifest files class (see https://github.com/jschneier/django-storages/issues/733#issuecomment-989005340) so we can use it directly and remove our override for this in:
https://github.com/readthedocs/readthedocs.org/blob/933c316f5228423f9f871b3da858a01491f79925/readthedocs/storage/s3_storage.py#L55-L61
</issue>
<code>
[start of readthedocs/storage/s3_storage.py]
1 """
2 AWS S3 Storage backends.
3
4 We override the backends provided by django-storages to add some small pieces
5 that we need to make our project to work as we want. For example, using
6 ManifestFilesMixin for static files and OverrideHostnameMixin to make it work
7 in our Docker Development environment.
8 """
9
10 # Disable abstract method because we are not overriding all the methods
11 # pylint: disable=abstract-method
12 from django.conf import settings
13 from django.contrib.staticfiles.storage import ManifestFilesMixin
14 from django.core.exceptions import ImproperlyConfigured
15 from storages.backends.s3boto3 import S3Boto3Storage
16
17 from readthedocs.builds.storage import BuildMediaStorageMixin
18
19 from .mixins import OverrideHostnameMixin, S3PrivateBucketMixin
20
21
22 class S3BuildMediaStorage(BuildMediaStorageMixin, OverrideHostnameMixin, S3Boto3Storage):
23
24 """An AWS S3 Storage backend for build artifacts."""
25
26 bucket_name = getattr(settings, 'S3_MEDIA_STORAGE_BUCKET', None)
27 override_hostname = getattr(settings, 'S3_MEDIA_STORAGE_OVERRIDE_HOSTNAME', None)
28
29 def __init__(self, *args, **kwargs):
30 super().__init__(*args, **kwargs)
31
32 if not self.bucket_name:
33 raise ImproperlyConfigured(
34 'AWS S3 not configured correctly. '
35 'Ensure S3_MEDIA_STORAGE_BUCKET is defined.',
36 )
37
38
39 class S3BuildCommandsStorage(S3PrivateBucketMixin, S3Boto3Storage):
40
41 """An AWS S3 Storage backend for build commands."""
42
43 bucket_name = getattr(settings, 'S3_BUILD_COMMANDS_STORAGE_BUCKET', None)
44
45 def __init__(self, *args, **kwargs):
46 super().__init__(*args, **kwargs)
47
48 if not self.bucket_name:
49 raise ImproperlyConfigured(
50 'AWS S3 not configured correctly. '
51 'Ensure S3_BUILD_COMMANDS_STORAGE_BUCKET is defined.',
52 )
53
54
55 class S3StaticStorage(OverrideHostnameMixin, ManifestFilesMixin, S3Boto3Storage):
56
57 """
58 An AWS S3 Storage backend for static media.
59
60 * Uses Django's ManifestFilesMixin to have unique file paths (eg. core.a6f5e2c.css)
61 """
62
63 bucket_name = getattr(settings, 'S3_STATIC_STORAGE_BUCKET', None)
64 override_hostname = getattr(settings, 'S3_STATIC_STORAGE_OVERRIDE_HOSTNAME', None)
65
66 def __init__(self, *args, **kwargs):
67 super().__init__(*args, **kwargs)
68
69 if not self.bucket_name:
70 raise ImproperlyConfigured(
71 'AWS S3 not configured correctly. '
72 'Ensure S3_STATIC_STORAGE_BUCKET is defined.',
73 )
74
75 self.bucket_acl = 'public-read'
76 self.default_acl = 'public-read'
77 self.querystring_auth = False
78
79
80 class S3BuildEnvironmentStorage(S3PrivateBucketMixin, BuildMediaStorageMixin, S3Boto3Storage):
81
82 bucket_name = getattr(settings, 'S3_BUILD_ENVIRONMENT_STORAGE_BUCKET', None)
83
84 def __init__(self, *args, **kwargs):
85 super().__init__(*args, **kwargs)
86
87 if not self.bucket_name:
88 raise ImproperlyConfigured(
89 'AWS S3 not configured correctly. '
90 'Ensure S3_BUILD_ENVIRONMENT_STORAGE_BUCKET is defined.',
91 )
92
93
94 class S3BuildToolsStorage(S3PrivateBucketMixin, BuildMediaStorageMixin, S3Boto3Storage):
95
96 bucket_name = getattr(settings, 'S3_BUILD_TOOLS_STORAGE_BUCKET', None)
97
98 def __init__(self, *args, **kwargs):
99 super().__init__(*args, **kwargs)
100
101 if not self.bucket_name:
102 raise ImproperlyConfigured(
103 'AWS S3 not configured correctly. '
104 'Ensure S3_BUILD_TOOLS_STORAGE_BUCKET is defined.',
105 )
106
[end of readthedocs/storage/s3_storage.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/storage/s3_storage.py b/readthedocs/storage/s3_storage.py
--- a/readthedocs/storage/s3_storage.py
+++ b/readthedocs/storage/s3_storage.py
@@ -10,9 +10,8 @@
# Disable abstract method because we are not overriding all the methods
# pylint: disable=abstract-method
from django.conf import settings
-from django.contrib.staticfiles.storage import ManifestFilesMixin
from django.core.exceptions import ImproperlyConfigured
-from storages.backends.s3boto3 import S3Boto3Storage
+from storages.backends.s3boto3 import S3Boto3Storage, S3ManifestStaticStorage
from readthedocs.builds.storage import BuildMediaStorageMixin
@@ -52,7 +51,11 @@
)
-class S3StaticStorage(OverrideHostnameMixin, ManifestFilesMixin, S3Boto3Storage):
+class S3StaticStorage(
+ OverrideHostnameMixin,
+ S3ManifestStaticStorage,
+ S3Boto3Storage
+): # pylint: disable=too-many-ancestors
"""
An AWS S3 Storage backend for static media.
| {"golden_diff": "diff --git a/readthedocs/storage/s3_storage.py b/readthedocs/storage/s3_storage.py\n--- a/readthedocs/storage/s3_storage.py\n+++ b/readthedocs/storage/s3_storage.py\n@@ -10,9 +10,8 @@\n # Disable abstract method because we are not overriding all the methods\n # pylint: disable=abstract-method\n from django.conf import settings\n-from django.contrib.staticfiles.storage import ManifestFilesMixin\n from django.core.exceptions import ImproperlyConfigured\n-from storages.backends.s3boto3 import S3Boto3Storage\n+from storages.backends.s3boto3 import S3Boto3Storage, S3ManifestStaticStorage\n \n from readthedocs.builds.storage import BuildMediaStorageMixin\n \n@@ -52,7 +51,11 @@\n )\n \n \n-class S3StaticStorage(OverrideHostnameMixin, ManifestFilesMixin, S3Boto3Storage):\n+class S3StaticStorage(\n+ OverrideHostnameMixin,\n+ S3ManifestStaticStorage,\n+ S3Boto3Storage\n+): # pylint: disable=too-many-ancestors\n \n \"\"\"\n An AWS S3 Storage backend for static media.\n", "issue": "Use `django-storages`'s manifest files class\n`django-storages` already implemented the manifest files class (see https://github.com/jschneier/django-storages/issues/733#issuecomment-989005340) so we can use it directly and remove our override for this in:\r\n\r\nhttps://github.com/readthedocs/readthedocs.org/blob/933c316f5228423f9f871b3da858a01491f79925/readthedocs/storage/s3_storage.py#L55-L61\n", "before_files": [{"content": "\"\"\"\nAWS S3 Storage backends.\n\nWe override the backends provided by django-storages to add some small pieces\nthat we need to make our project to work as we want. For example, using\nManifestFilesMixin for static files and OverrideHostnameMixin to make it work\nin our Docker Development environment.\n\"\"\"\n\n# Disable abstract method because we are not overriding all the methods\n# pylint: disable=abstract-method\nfrom django.conf import settings\nfrom django.contrib.staticfiles.storage import ManifestFilesMixin\nfrom django.core.exceptions import ImproperlyConfigured\nfrom storages.backends.s3boto3 import S3Boto3Storage\n\nfrom readthedocs.builds.storage import BuildMediaStorageMixin\n\nfrom .mixins import OverrideHostnameMixin, S3PrivateBucketMixin\n\n\nclass S3BuildMediaStorage(BuildMediaStorageMixin, OverrideHostnameMixin, S3Boto3Storage):\n\n \"\"\"An AWS S3 Storage backend for build artifacts.\"\"\"\n\n bucket_name = getattr(settings, 'S3_MEDIA_STORAGE_BUCKET', None)\n override_hostname = getattr(settings, 'S3_MEDIA_STORAGE_OVERRIDE_HOSTNAME', None)\n\n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n\n if not self.bucket_name:\n raise ImproperlyConfigured(\n 'AWS S3 not configured correctly. '\n 'Ensure S3_MEDIA_STORAGE_BUCKET is defined.',\n )\n\n\nclass S3BuildCommandsStorage(S3PrivateBucketMixin, S3Boto3Storage):\n\n \"\"\"An AWS S3 Storage backend for build commands.\"\"\"\n\n bucket_name = getattr(settings, 'S3_BUILD_COMMANDS_STORAGE_BUCKET', None)\n\n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n\n if not self.bucket_name:\n raise ImproperlyConfigured(\n 'AWS S3 not configured correctly. '\n 'Ensure S3_BUILD_COMMANDS_STORAGE_BUCKET is defined.',\n )\n\n\nclass S3StaticStorage(OverrideHostnameMixin, ManifestFilesMixin, S3Boto3Storage):\n\n \"\"\"\n An AWS S3 Storage backend for static media.\n\n * Uses Django's ManifestFilesMixin to have unique file paths (eg. core.a6f5e2c.css)\n \"\"\"\n\n bucket_name = getattr(settings, 'S3_STATIC_STORAGE_BUCKET', None)\n override_hostname = getattr(settings, 'S3_STATIC_STORAGE_OVERRIDE_HOSTNAME', None)\n\n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n\n if not self.bucket_name:\n raise ImproperlyConfigured(\n 'AWS S3 not configured correctly. '\n 'Ensure S3_STATIC_STORAGE_BUCKET is defined.',\n )\n\n self.bucket_acl = 'public-read'\n self.default_acl = 'public-read'\n self.querystring_auth = False\n\n\nclass S3BuildEnvironmentStorage(S3PrivateBucketMixin, BuildMediaStorageMixin, S3Boto3Storage):\n\n bucket_name = getattr(settings, 'S3_BUILD_ENVIRONMENT_STORAGE_BUCKET', None)\n\n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n\n if not self.bucket_name:\n raise ImproperlyConfigured(\n 'AWS S3 not configured correctly. '\n 'Ensure S3_BUILD_ENVIRONMENT_STORAGE_BUCKET is defined.',\n )\n\n\nclass S3BuildToolsStorage(S3PrivateBucketMixin, BuildMediaStorageMixin, S3Boto3Storage):\n\n bucket_name = getattr(settings, 'S3_BUILD_TOOLS_STORAGE_BUCKET', None)\n\n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n\n if not self.bucket_name:\n raise ImproperlyConfigured(\n 'AWS S3 not configured correctly. '\n 'Ensure S3_BUILD_TOOLS_STORAGE_BUCKET is defined.',\n )\n", "path": "readthedocs/storage/s3_storage.py"}]} | 1,719 | 254 |
gh_patches_debug_32625 | rasdani/github-patches | git_diff | kubeflow__pipelines-6404 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[feature] kfp CLI support 'kfp run get <run_id>' in detailed information
### Feature Area
/area sdk
### What feature would you like to see?
Currently, `kfp run get <run_id>` only shows ["run id", "name", "status", "created at"].
However, user could want to see other information of the run.
### What is the use case or pain point?
For my case, I want to fetch my **run's output metrics** with kfp CLI
### Is there a workaround currently?
Since `kfp.Client()` already have `get_run()` method in sdk, which have all information including metrics of run,
I think the UX is only what matters: Which information would be useful or useless, and how user could select them.
For example, I guess `pipeline_Spec.workflow_manifest` could always be omitted, since nobody wants such information.
Therefore, I think with `click.option('--detail')` in get() method in `pipelines/sdk/python/kfp/cli/run.py` shows all information except `pipeline_Spec.workflow_manifest` in json format would be fine.
However, if there is other suggestions, please let me know.
Also, If you guys are ok, I'd like to took this issue and implement this feature.
---
<!-- Don't delete message below to encourage users to support your feature request! -->
Love this idea? Give it a 👍. We prioritize fulfilling features with the most 👍.
</issue>
<code>
[start of sdk/python/kfp/cli/run.py]
1 # Copyright 2018 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
15
16 import sys
17 import subprocess
18 import time
19 import json
20 import click
21 import shutil
22
23 from kfp.cli.output import print_output, OutputFormat
24
25
26 @click.group()
27 def run():
28 """manage run resources"""
29 pass
30
31
32 @run.command()
33 @click.option('-e', '--experiment-id', help='Parent experiment ID of listed runs.')
34 @click.option('-m', '--max-size', default=100, help='Max size of the listed runs.')
35 @click.pass_context
36 def list(ctx, experiment_id, max_size):
37 """list recent KFP runs"""
38 client = ctx.obj['client']
39 output_format = ctx.obj['output']
40 response = client.list_runs(experiment_id=experiment_id, page_size=max_size, sort_by='created_at desc')
41 if response and response.runs:
42 _print_runs(response.runs, output_format)
43 else:
44 if output_format == OutputFormat.json.name:
45 msg = json.dumps([])
46 else:
47 msg = 'No runs found.'
48 click.echo(msg)
49
50
51 @run.command()
52 @click.option('-e', '--experiment-name', required=True, help='Experiment name of the run.')
53 @click.option('-r', '--run-name', help='Name of the run.')
54 @click.option('-f', '--package-file', type=click.Path(exists=True, dir_okay=False),
55 help='Path of the pipeline package file.')
56 @click.option('-p', '--pipeline-id', help='ID of the pipeline template.')
57 @click.option('-n', '--pipeline-name', help='Name of the pipeline template.')
58 @click.option('-w', '--watch', is_flag=True, default=False,
59 help='Watch the run status until it finishes.')
60 @click.option('-v', '--version', help='ID of the pipeline version.')
61 @click.option('-t', '--timeout', default=0, help='Wait for a run to complete until timeout in seconds.', type=int)
62 @click.argument('args', nargs=-1)
63 @click.pass_context
64 def submit(ctx, experiment_name, run_name, package_file, pipeline_id, pipeline_name, watch,
65 timeout, version, args):
66 """submit a KFP run"""
67 client = ctx.obj['client']
68 namespace = ctx.obj['namespace']
69 output_format = ctx.obj['output']
70 if not run_name:
71 run_name = experiment_name
72
73 if not pipeline_id and pipeline_name:
74 pipeline_id = client.get_pipeline_id(name=pipeline_name)
75
76 if not package_file and not pipeline_id and not version:
77 click.echo('You must provide one of [package_file, pipeline_id, version].', err=True)
78 sys.exit(1)
79
80 arg_dict = dict(arg.split('=', maxsplit=1) for arg in args)
81
82 experiment = client.create_experiment(experiment_name)
83 run = client.run_pipeline(experiment.id, run_name, package_file, arg_dict, pipeline_id,
84 version_id=version)
85 if timeout > 0:
86 _wait_for_run_completion(client, run.id, timeout, output_format)
87 else:
88 _display_run(client, namespace, run.id, watch, output_format)
89
90
91 @run.command()
92 @click.option('-w', '--watch', is_flag=True, default=False,
93 help='Watch the run status until it finishes.')
94 @click.argument('run-id')
95 @click.pass_context
96 def get(ctx, watch, run_id):
97 """display the details of a KFP run"""
98 client = ctx.obj['client']
99 namespace = ctx.obj['namespace']
100 output_format = ctx.obj['output']
101 _display_run(client, namespace, run_id, watch, output_format)
102
103
104 def _display_run(client, namespace, run_id, watch, output_format):
105 run = client.get_run(run_id).run
106 _print_runs([run], output_format)
107 if not watch:
108 return
109 argo_path = shutil.which('argo')
110 if not argo_path:
111 raise RuntimeError("argo isn't found in $PATH. It's necessary for watch. "
112 "Please make sure it's installed and available. "
113 "Installation instructions be found here - "
114 "https://github.com/argoproj/argo-workflows/releases")
115
116 argo_workflow_name = None
117 while True:
118 time.sleep(1)
119 run_detail = client.get_run(run_id)
120 run = run_detail.run
121 if run_detail.pipeline_runtime and run_detail.pipeline_runtime.workflow_manifest:
122 manifest = json.loads(run_detail.pipeline_runtime.workflow_manifest)
123 if manifest['metadata'] and manifest['metadata']['name']:
124 argo_workflow_name = manifest['metadata']['name']
125 break
126 if run_detail.run.status in ['Succeeded', 'Skipped', 'Failed', 'Error']:
127 click.echo('Run is finished with status {}.'.format(run_detail.run.status))
128 return
129 if argo_workflow_name:
130 subprocess.run([argo_path, 'watch', argo_workflow_name, '-n', namespace])
131 _print_runs([run], output_format)
132
133
134 def _wait_for_run_completion(client, run_id, timeout, output_format):
135 run_detail = client.wait_for_run_completion(run_id, timeout)
136 _print_runs([run_detail.run], output_format)
137
138
139 def _print_runs(runs, output_format):
140 headers = ['run id', 'name', 'status', 'created at']
141 data = [[run.id, run.name, run.status, run.created_at.isoformat()] for run in runs]
142 print_output(data, headers, output_format, table_format='grid')
143
[end of sdk/python/kfp/cli/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/sdk/python/kfp/cli/run.py b/sdk/python/kfp/cli/run.py
--- a/sdk/python/kfp/cli/run.py
+++ b/sdk/python/kfp/cli/run.py
@@ -11,15 +11,15 @@
# 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 sys
import subprocess
import time
import json
import click
import shutil
+import datetime
+import kfp
from kfp.cli.output import print_output, OutputFormat
@@ -91,18 +91,31 @@
@run.command()
@click.option('-w', '--watch', is_flag=True, default=False,
help='Watch the run status until it finishes.')
[email protected]('-d', '--detail', is_flag=True, default=False,
+ help='Get detailed information of the run in json format.')
@click.argument('run-id')
@click.pass_context
-def get(ctx, watch, run_id):
+def get(ctx, watch, detail, run_id):
"""display the details of a KFP run"""
client = ctx.obj['client']
namespace = ctx.obj['namespace']
output_format = ctx.obj['output']
- _display_run(client, namespace, run_id, watch, output_format)
+
+ _display_run(client, namespace, run_id, watch, output_format, detail)
-def _display_run(client, namespace, run_id, watch, output_format):
+def _display_run(client, namespace, run_id, watch, output_format, detail=False):
run = client.get_run(run_id).run
+
+ if detail:
+ data = {
+ key: value.isoformat() if isinstance(value, datetime.datetime) else value
+ for key, value in run.to_dict().items()
+ if key not in ['pipeline_spec'] # useless but too much detailed field
+ }
+ click.echo(data)
+ return
+
_print_runs([run], output_format)
if not watch:
return
| {"golden_diff": "diff --git a/sdk/python/kfp/cli/run.py b/sdk/python/kfp/cli/run.py\n--- a/sdk/python/kfp/cli/run.py\n+++ b/sdk/python/kfp/cli/run.py\n@@ -11,15 +11,15 @@\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 import sys\n import subprocess\n import time\n import json\n import click\n import shutil\n+import datetime\n \n+import kfp\n from kfp.cli.output import print_output, OutputFormat\n \n \n@@ -91,18 +91,31 @@\n @run.command()\n @click.option('-w', '--watch', is_flag=True, default=False,\n help='Watch the run status until it finishes.')\[email protected]('-d', '--detail', is_flag=True, default=False,\n+ help='Get detailed information of the run in json format.')\n @click.argument('run-id')\n @click.pass_context\n-def get(ctx, watch, run_id):\n+def get(ctx, watch, detail, run_id):\n \"\"\"display the details of a KFP run\"\"\"\n client = ctx.obj['client']\n namespace = ctx.obj['namespace']\n output_format = ctx.obj['output']\n- _display_run(client, namespace, run_id, watch, output_format)\n+\n+ _display_run(client, namespace, run_id, watch, output_format, detail)\n \n \n-def _display_run(client, namespace, run_id, watch, output_format):\n+def _display_run(client, namespace, run_id, watch, output_format, detail=False):\n run = client.get_run(run_id).run\n+\n+ if detail:\n+ data = {\n+ key: value.isoformat() if isinstance(value, datetime.datetime) else value\n+ for key, value in run.to_dict().items()\n+ if key not in ['pipeline_spec'] # useless but too much detailed field\n+ }\n+ click.echo(data)\n+ return\n+\n _print_runs([run], output_format)\n if not watch:\n return\n", "issue": "[feature] kfp CLI support 'kfp run get <run_id>' in detailed information\n### Feature Area\r\n\r\n/area sdk\r\n\r\n### What feature would you like to see?\r\nCurrently, `kfp run get <run_id>` only shows [\"run id\", \"name\", \"status\", \"created at\"].\r\nHowever, user could want to see other information of the run.\r\n\r\n### What is the use case or pain point?\r\nFor my case, I want to fetch my **run's output metrics** with kfp CLI\r\n\r\n\r\n### Is there a workaround currently?\r\n\r\nSince `kfp.Client()` already have `get_run()` method in sdk, which have all information including metrics of run,\r\nI think the UX is only what matters: Which information would be useful or useless, and how user could select them.\r\n\r\nFor example, I guess `pipeline_Spec.workflow_manifest` could always be omitted, since nobody wants such information.\r\n\r\nTherefore, I think with `click.option('--detail')` in get() method in `pipelines/sdk/python/kfp/cli/run.py` shows all information except `pipeline_Spec.workflow_manifest` in json format would be fine.\r\n\r\nHowever, if there is other suggestions, please let me know.\r\nAlso, If you guys are ok, I'd like to took this issue and implement this feature.\r\n\r\n---\r\n\r\n<!-- Don't delete message below to encourage users to support your feature request! -->\r\nLove this idea? Give it a \ud83d\udc4d. We prioritize fulfilling features with the most \ud83d\udc4d.\r\n\n", "before_files": [{"content": "# Copyright 2018 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\n\nimport sys\nimport subprocess\nimport time\nimport json\nimport click\nimport shutil\n\nfrom kfp.cli.output import print_output, OutputFormat\n\n\[email protected]()\ndef run():\n \"\"\"manage run resources\"\"\"\n pass\n\n\[email protected]()\[email protected]('-e', '--experiment-id', help='Parent experiment ID of listed runs.')\[email protected]('-m', '--max-size', default=100, help='Max size of the listed runs.')\[email protected]_context\ndef list(ctx, experiment_id, max_size):\n \"\"\"list recent KFP runs\"\"\"\n client = ctx.obj['client']\n output_format = ctx.obj['output']\n response = client.list_runs(experiment_id=experiment_id, page_size=max_size, sort_by='created_at desc')\n if response and response.runs:\n _print_runs(response.runs, output_format)\n else:\n if output_format == OutputFormat.json.name:\n msg = json.dumps([])\n else:\n msg = 'No runs found.'\n click.echo(msg)\n\n\[email protected]()\[email protected]('-e', '--experiment-name', required=True, help='Experiment name of the run.')\[email protected]('-r', '--run-name', help='Name of the run.')\[email protected]('-f', '--package-file', type=click.Path(exists=True, dir_okay=False),\n help='Path of the pipeline package file.')\[email protected]('-p', '--pipeline-id', help='ID of the pipeline template.')\[email protected]('-n', '--pipeline-name', help='Name of the pipeline template.')\[email protected]('-w', '--watch', is_flag=True, default=False,\n help='Watch the run status until it finishes.')\[email protected]('-v', '--version', help='ID of the pipeline version.')\[email protected]('-t', '--timeout', default=0, help='Wait for a run to complete until timeout in seconds.', type=int)\[email protected]('args', nargs=-1)\[email protected]_context\ndef submit(ctx, experiment_name, run_name, package_file, pipeline_id, pipeline_name, watch,\n timeout, version, args):\n \"\"\"submit a KFP run\"\"\"\n client = ctx.obj['client']\n namespace = ctx.obj['namespace']\n output_format = ctx.obj['output']\n if not run_name:\n run_name = experiment_name\n\n if not pipeline_id and pipeline_name:\n pipeline_id = client.get_pipeline_id(name=pipeline_name)\n\n if not package_file and not pipeline_id and not version:\n click.echo('You must provide one of [package_file, pipeline_id, version].', err=True)\n sys.exit(1)\n\n arg_dict = dict(arg.split('=', maxsplit=1) for arg in args)\n\n experiment = client.create_experiment(experiment_name)\n run = client.run_pipeline(experiment.id, run_name, package_file, arg_dict, pipeline_id,\n version_id=version)\n if timeout > 0:\n _wait_for_run_completion(client, run.id, timeout, output_format)\n else:\n _display_run(client, namespace, run.id, watch, output_format)\n\n\[email protected]()\[email protected]('-w', '--watch', is_flag=True, default=False,\n help='Watch the run status until it finishes.')\[email protected]('run-id')\[email protected]_context\ndef get(ctx, watch, run_id):\n \"\"\"display the details of a KFP run\"\"\"\n client = ctx.obj['client']\n namespace = ctx.obj['namespace']\n output_format = ctx.obj['output']\n _display_run(client, namespace, run_id, watch, output_format)\n\n\ndef _display_run(client, namespace, run_id, watch, output_format):\n run = client.get_run(run_id).run\n _print_runs([run], output_format)\n if not watch:\n return\n argo_path = shutil.which('argo')\n if not argo_path:\n raise RuntimeError(\"argo isn't found in $PATH. It's necessary for watch. \"\n \"Please make sure it's installed and available. \"\n \"Installation instructions be found here - \"\n \"https://github.com/argoproj/argo-workflows/releases\")\n\n argo_workflow_name = None\n while True:\n time.sleep(1)\n run_detail = client.get_run(run_id)\n run = run_detail.run\n if run_detail.pipeline_runtime and run_detail.pipeline_runtime.workflow_manifest:\n manifest = json.loads(run_detail.pipeline_runtime.workflow_manifest)\n if manifest['metadata'] and manifest['metadata']['name']:\n argo_workflow_name = manifest['metadata']['name']\n break\n if run_detail.run.status in ['Succeeded', 'Skipped', 'Failed', 'Error']:\n click.echo('Run is finished with status {}.'.format(run_detail.run.status))\n return\n if argo_workflow_name:\n subprocess.run([argo_path, 'watch', argo_workflow_name, '-n', namespace])\n _print_runs([run], output_format)\n\n\ndef _wait_for_run_completion(client, run_id, timeout, output_format):\n run_detail = client.wait_for_run_completion(run_id, timeout)\n _print_runs([run_detail.run], output_format)\n\n\ndef _print_runs(runs, output_format):\n headers = ['run id', 'name', 'status', 'created at']\n data = [[run.id, run.name, run.status, run.created_at.isoformat()] for run in runs]\n print_output(data, headers, output_format, table_format='grid')\n", "path": "sdk/python/kfp/cli/run.py"}]} | 2,467 | 451 |
gh_patches_debug_41670 | rasdani/github-patches | git_diff | WordPress__openverse-api-1027 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Move off of grequests
## Problem
<!-- Describe a problem solved by this feature; or delete the section entirely. -->
The API currently uses [the `grequests` library](https://github.com/spyoungtech/grequests) for handling some of the `head` requests it completes when returning results (specifically in [`validate_images.py`](https://github.com/WordPress/openverse-api/blob/main/api/catalog/api/utils/validate_images.py#L37)).
## Description
<!-- Describe the feature and how it solves the problem. -->
The README for the project says:
> Note: You should probably use requests-threads or requests-futures instead.
The project has also not had a release since 2020. We might want to consider using one of those proposed alternatives.
## Alternatives
<!-- Describe any alternative solutions or features you have considered. How is this feature better? -->
Leave as is and hope for the best!
## Additional context
<!-- Add any other context about the feature here; or delete the section entirely. -->
Some more context in Sentry: https://sentry.io/share/issue/061ba99fc3df4c23bdb7643d337bbda0/
## Implementation
<!-- Replace the [ ] with [x] to check the box. -->
- [ ] 🙋 I would be interested in implementing this feature.
</issue>
<code>
[start of api/catalog/api/utils/validate_images.py]
1 import logging
2 import time
3
4 from django.conf import settings
5
6 import django_redis
7 import grequests
8 from decouple import config
9
10 from catalog.api.utils.dead_link_mask import get_query_mask, save_query_mask
11
12
13 parent_logger = logging.getLogger(__name__)
14
15
16 CACHE_PREFIX = "valid:"
17 HEADERS = {
18 "User-Agent": settings.OUTBOUND_USER_AGENT_TEMPLATE.format(purpose="LinkValidation")
19 }
20
21
22 def _get_cached_statuses(redis, image_urls):
23 cached_statuses = redis.mget([CACHE_PREFIX + url for url in image_urls])
24 return [int(b.decode("utf-8")) if b is not None else None for b in cached_statuses]
25
26
27 def _get_expiry(status, default):
28 return config(f"LINK_VALIDATION_CACHE_EXPIRY__{status}", default=default, cast=int)
29
30
31 def validate_images(query_hash, start_slice, results, image_urls):
32 """
33 Make sure images exist before we display them. Treat redirects as broken
34 links since 99% of the time the redirect leads to a generic "not found"
35 placeholder.
36
37 Results are cached in redis and shared amongst all API servers in the
38 cluster.
39 """
40 logger = parent_logger.getChild("validate_images")
41 if not image_urls:
42 logger.info("no image urls to validate")
43 return
44
45 logger.debug("starting validation")
46 start_time = time.time()
47
48 # Pull matching images from the cache.
49 redis = django_redis.get_redis_connection("default")
50 cached_statuses = _get_cached_statuses(redis, image_urls)
51 logger.debug(f"len(cached_statuses)={len(cached_statuses)}")
52
53 # Anything that isn't in the cache needs to be validated via HEAD request.
54 to_verify = {}
55 for idx, url in enumerate(image_urls):
56 if cached_statuses[idx] is None:
57 to_verify[url] = idx
58 logger.debug(f"len(to_verify)={len(to_verify)}")
59
60 reqs = (
61 grequests.head(
62 url, headers=HEADERS, allow_redirects=False, timeout=2, verify=False
63 )
64 for url in to_verify.keys()
65 )
66 verified = grequests.map(reqs, exception_handler=_validation_failure)
67 # Cache newly verified image statuses.
68 to_cache = {}
69 # relies on the consistenct of the order returned by `dict::keys()` which
70 # is safe as of Python 3 dot something
71 for idx, url in enumerate(to_verify.keys()):
72 cache_key = CACHE_PREFIX + url
73 if verified[idx]:
74 status = verified[idx].status_code
75 # Response didn't arrive in time. Try again later.
76 else:
77 status = -1
78 to_cache[cache_key] = status
79
80 pipe = redis.pipeline()
81 if len(to_cache) > 0:
82 pipe.mset(to_cache)
83
84 for key, status in to_cache.items():
85 if status == 200:
86 logger.debug(f"healthy link key={key}")
87 elif status == -1:
88 logger.debug(f"no response from provider key={key}")
89 else:
90 logger.debug(f"broken link key={key}")
91
92 expiry = settings.LINK_VALIDATION_CACHE_EXPIRY_CONFIGURATION[status]
93 logger.debug(f"caching status={status} expiry={expiry}")
94 pipe.expire(key, expiry)
95
96 pipe.execute()
97
98 # Merge newly verified results with cached statuses
99 for idx, url in enumerate(to_verify):
100 cache_idx = to_verify[url]
101 if verified[idx] is not None:
102 cached_statuses[cache_idx] = verified[idx].status_code
103 else:
104 cached_statuses[cache_idx] = -1
105
106 # Create a new dead link mask
107 new_mask = [1] * len(results)
108
109 # Delete broken images from the search results response.
110 for idx, _ in enumerate(cached_statuses):
111 del_idx = len(cached_statuses) - idx - 1
112 status = cached_statuses[del_idx]
113 if status == 429 or status == 403:
114 logger.warning(
115 "Image validation failed due to rate limiting or blocking. "
116 f"url={image_urls[idx]} "
117 f"status={status} "
118 )
119 elif status != 200:
120 logger.info(
121 "Deleting broken image from results "
122 f"id={results[del_idx]['identifier']} "
123 f"status={status} "
124 )
125 # remove the result, mutating in place
126 del results[del_idx]
127 # update the result's position in the mask to indicate it is dead
128 new_mask[del_idx] = 0
129
130 # Merge and cache the new mask
131 mask = get_query_mask(query_hash)
132 if mask:
133 # skip the leading part of the mask that represents results that come before
134 # the results we've verified this time around. Overwrite everything after
135 # with our new results validation mask.
136 new_mask = mask[:start_slice] + new_mask
137 save_query_mask(query_hash, new_mask)
138
139 end_time = time.time()
140 logger.debug(
141 "end validation "
142 f"end_time={end_time} "
143 f"start_time={start_time} "
144 f"delta={end_time - start_time} "
145 )
146
147
148 def _validation_failure(request, exception):
149 logger = parent_logger.getChild("_validation_failure")
150 logger.warning(f"Failed to validate image! Reason: {exception}")
151
[end of api/catalog/api/utils/validate_images.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/utils/validate_images.py b/api/catalog/api/utils/validate_images.py
--- a/api/catalog/api/utils/validate_images.py
+++ b/api/catalog/api/utils/validate_images.py
@@ -1,11 +1,14 @@
+import asyncio
import logging
import time
from django.conf import settings
+import aiohttp
import django_redis
-import grequests
+from asgiref.sync import async_to_sync
from decouple import config
+from elasticsearch_dsl.response import Hit
from catalog.api.utils.dead_link_mask import get_query_mask, save_query_mask
@@ -28,7 +31,29 @@
return config(f"LINK_VALIDATION_CACHE_EXPIRY__{status}", default=default, cast=int)
-def validate_images(query_hash, start_slice, results, image_urls):
+async def _head(url: str, session: aiohttp.ClientSession) -> tuple[str, int]:
+ try:
+ async with session.head(url, timeout=2, allow_redirects=False) as response:
+ return url, response.status
+ except aiohttp.ClientError as exception:
+ _log_validation_failure(exception)
+ return url, -1
+
+
+# https://stackoverflow.com/q/55259755
+@async_to_sync
+async def _make_head_requests(urls: list[str]) -> list[tuple[str, int]]:
+ tasks = []
+ async with aiohttp.ClientSession(headers=HEADERS) as session:
+ tasks = [asyncio.ensure_future(_head(url, session)) for url in urls]
+ responses = asyncio.gather(*tasks)
+ await responses
+ return responses.result()
+
+
+def validate_images(
+ query_hash: str, start_slice: int, results: list[Hit], image_urls: list[str]
+) -> None:
"""
Make sure images exist before we display them. Treat redirects as broken
links since 99% of the time the redirect leads to a generic "not found"
@@ -57,25 +82,10 @@
to_verify[url] = idx
logger.debug(f"len(to_verify)={len(to_verify)}")
- reqs = (
- grequests.head(
- url, headers=HEADERS, allow_redirects=False, timeout=2, verify=False
- )
- for url in to_verify.keys()
- )
- verified = grequests.map(reqs, exception_handler=_validation_failure)
+ verified = _make_head_requests(to_verify.keys())
+
# Cache newly verified image statuses.
- to_cache = {}
- # relies on the consistenct of the order returned by `dict::keys()` which
- # is safe as of Python 3 dot something
- for idx, url in enumerate(to_verify.keys()):
- cache_key = CACHE_PREFIX + url
- if verified[idx]:
- status = verified[idx].status_code
- # Response didn't arrive in time. Try again later.
- else:
- status = -1
- to_cache[cache_key] = status
+ to_cache = {CACHE_PREFIX + url: status for url, status in verified}
pipe = redis.pipeline()
if len(to_cache) > 0:
@@ -98,10 +108,7 @@
# Merge newly verified results with cached statuses
for idx, url in enumerate(to_verify):
cache_idx = to_verify[url]
- if verified[idx] is not None:
- cached_statuses[cache_idx] = verified[idx].status_code
- else:
- cached_statuses[cache_idx] = -1
+ cached_statuses[cache_idx] = verified[idx][1]
# Create a new dead link mask
new_mask = [1] * len(results)
@@ -145,6 +152,6 @@
)
-def _validation_failure(request, exception):
- logger = parent_logger.getChild("_validation_failure")
+def _log_validation_failure(exception):
+ logger = parent_logger.getChild("_log_validation_failure")
logger.warning(f"Failed to validate image! Reason: {exception}")
| {"golden_diff": "diff --git a/api/catalog/api/utils/validate_images.py b/api/catalog/api/utils/validate_images.py\n--- a/api/catalog/api/utils/validate_images.py\n+++ b/api/catalog/api/utils/validate_images.py\n@@ -1,11 +1,14 @@\n+import asyncio\n import logging\n import time\n \n from django.conf import settings\n \n+import aiohttp\n import django_redis\n-import grequests\n+from asgiref.sync import async_to_sync\n from decouple import config\n+from elasticsearch_dsl.response import Hit\n \n from catalog.api.utils.dead_link_mask import get_query_mask, save_query_mask\n \n@@ -28,7 +31,29 @@\n return config(f\"LINK_VALIDATION_CACHE_EXPIRY__{status}\", default=default, cast=int)\n \n \n-def validate_images(query_hash, start_slice, results, image_urls):\n+async def _head(url: str, session: aiohttp.ClientSession) -> tuple[str, int]:\n+ try:\n+ async with session.head(url, timeout=2, allow_redirects=False) as response:\n+ return url, response.status\n+ except aiohttp.ClientError as exception:\n+ _log_validation_failure(exception)\n+ return url, -1\n+\n+\n+# https://stackoverflow.com/q/55259755\n+@async_to_sync\n+async def _make_head_requests(urls: list[str]) -> list[tuple[str, int]]:\n+ tasks = []\n+ async with aiohttp.ClientSession(headers=HEADERS) as session:\n+ tasks = [asyncio.ensure_future(_head(url, session)) for url in urls]\n+ responses = asyncio.gather(*tasks)\n+ await responses\n+ return responses.result()\n+\n+\n+def validate_images(\n+ query_hash: str, start_slice: int, results: list[Hit], image_urls: list[str]\n+) -> None:\n \"\"\"\n Make sure images exist before we display them. Treat redirects as broken\n links since 99% of the time the redirect leads to a generic \"not found\"\n@@ -57,25 +82,10 @@\n to_verify[url] = idx\n logger.debug(f\"len(to_verify)={len(to_verify)}\")\n \n- reqs = (\n- grequests.head(\n- url, headers=HEADERS, allow_redirects=False, timeout=2, verify=False\n- )\n- for url in to_verify.keys()\n- )\n- verified = grequests.map(reqs, exception_handler=_validation_failure)\n+ verified = _make_head_requests(to_verify.keys())\n+\n # Cache newly verified image statuses.\n- to_cache = {}\n- # relies on the consistenct of the order returned by `dict::keys()` which\n- # is safe as of Python 3 dot something\n- for idx, url in enumerate(to_verify.keys()):\n- cache_key = CACHE_PREFIX + url\n- if verified[idx]:\n- status = verified[idx].status_code\n- # Response didn't arrive in time. Try again later.\n- else:\n- status = -1\n- to_cache[cache_key] = status\n+ to_cache = {CACHE_PREFIX + url: status for url, status in verified}\n \n pipe = redis.pipeline()\n if len(to_cache) > 0:\n@@ -98,10 +108,7 @@\n # Merge newly verified results with cached statuses\n for idx, url in enumerate(to_verify):\n cache_idx = to_verify[url]\n- if verified[idx] is not None:\n- cached_statuses[cache_idx] = verified[idx].status_code\n- else:\n- cached_statuses[cache_idx] = -1\n+ cached_statuses[cache_idx] = verified[idx][1]\n \n # Create a new dead link mask\n new_mask = [1] * len(results)\n@@ -145,6 +152,6 @@\n )\n \n \n-def _validation_failure(request, exception):\n- logger = parent_logger.getChild(\"_validation_failure\")\n+def _log_validation_failure(exception):\n+ logger = parent_logger.getChild(\"_log_validation_failure\")\n logger.warning(f\"Failed to validate image! Reason: {exception}\")\n", "issue": "Move off of grequests\n## Problem\r\n<!-- Describe a problem solved by this feature; or delete the section entirely. -->\r\nThe API currently uses [the `grequests` library](https://github.com/spyoungtech/grequests) for handling some of the `head` requests it completes when returning results (specifically in [`validate_images.py`](https://github.com/WordPress/openverse-api/blob/main/api/catalog/api/utils/validate_images.py#L37)).\r\n\r\n## Description\r\n<!-- Describe the feature and how it solves the problem. -->\r\nThe README for the project says:\r\n\r\n> Note: You should probably use requests-threads or requests-futures instead.\r\n\r\nThe project has also not had a release since 2020. We might want to consider using one of those proposed alternatives.\r\n\r\n## Alternatives\r\n<!-- Describe any alternative solutions or features you have considered. How is this feature better? -->\r\nLeave as is and hope for the best!\r\n\r\n## Additional context\r\n<!-- Add any other context about the feature here; or delete the section entirely. -->\r\n\r\nSome more context in Sentry: https://sentry.io/share/issue/061ba99fc3df4c23bdb7643d337bbda0/\r\n\r\n## Implementation\r\n<!-- Replace the [ ] with [x] to check the box. -->\r\n- [ ] \ud83d\ude4b I would be interested in implementing this feature.\r\n\n", "before_files": [{"content": "import logging\nimport time\n\nfrom django.conf import settings\n\nimport django_redis\nimport grequests\nfrom decouple import config\n\nfrom catalog.api.utils.dead_link_mask import get_query_mask, save_query_mask\n\n\nparent_logger = logging.getLogger(__name__)\n\n\nCACHE_PREFIX = \"valid:\"\nHEADERS = {\n \"User-Agent\": settings.OUTBOUND_USER_AGENT_TEMPLATE.format(purpose=\"LinkValidation\")\n}\n\n\ndef _get_cached_statuses(redis, image_urls):\n cached_statuses = redis.mget([CACHE_PREFIX + url for url in image_urls])\n return [int(b.decode(\"utf-8\")) if b is not None else None for b in cached_statuses]\n\n\ndef _get_expiry(status, default):\n return config(f\"LINK_VALIDATION_CACHE_EXPIRY__{status}\", default=default, cast=int)\n\n\ndef validate_images(query_hash, start_slice, results, image_urls):\n \"\"\"\n Make sure images exist before we display them. Treat redirects as broken\n links since 99% of the time the redirect leads to a generic \"not found\"\n placeholder.\n\n Results are cached in redis and shared amongst all API servers in the\n cluster.\n \"\"\"\n logger = parent_logger.getChild(\"validate_images\")\n if not image_urls:\n logger.info(\"no image urls to validate\")\n return\n\n logger.debug(\"starting validation\")\n start_time = time.time()\n\n # Pull matching images from the cache.\n redis = django_redis.get_redis_connection(\"default\")\n cached_statuses = _get_cached_statuses(redis, image_urls)\n logger.debug(f\"len(cached_statuses)={len(cached_statuses)}\")\n\n # Anything that isn't in the cache needs to be validated via HEAD request.\n to_verify = {}\n for idx, url in enumerate(image_urls):\n if cached_statuses[idx] is None:\n to_verify[url] = idx\n logger.debug(f\"len(to_verify)={len(to_verify)}\")\n\n reqs = (\n grequests.head(\n url, headers=HEADERS, allow_redirects=False, timeout=2, verify=False\n )\n for url in to_verify.keys()\n )\n verified = grequests.map(reqs, exception_handler=_validation_failure)\n # Cache newly verified image statuses.\n to_cache = {}\n # relies on the consistenct of the order returned by `dict::keys()` which\n # is safe as of Python 3 dot something\n for idx, url in enumerate(to_verify.keys()):\n cache_key = CACHE_PREFIX + url\n if verified[idx]:\n status = verified[idx].status_code\n # Response didn't arrive in time. Try again later.\n else:\n status = -1\n to_cache[cache_key] = status\n\n pipe = redis.pipeline()\n if len(to_cache) > 0:\n pipe.mset(to_cache)\n\n for key, status in to_cache.items():\n if status == 200:\n logger.debug(f\"healthy link key={key}\")\n elif status == -1:\n logger.debug(f\"no response from provider key={key}\")\n else:\n logger.debug(f\"broken link key={key}\")\n\n expiry = settings.LINK_VALIDATION_CACHE_EXPIRY_CONFIGURATION[status]\n logger.debug(f\"caching status={status} expiry={expiry}\")\n pipe.expire(key, expiry)\n\n pipe.execute()\n\n # Merge newly verified results with cached statuses\n for idx, url in enumerate(to_verify):\n cache_idx = to_verify[url]\n if verified[idx] is not None:\n cached_statuses[cache_idx] = verified[idx].status_code\n else:\n cached_statuses[cache_idx] = -1\n\n # Create a new dead link mask\n new_mask = [1] * len(results)\n\n # Delete broken images from the search results response.\n for idx, _ in enumerate(cached_statuses):\n del_idx = len(cached_statuses) - idx - 1\n status = cached_statuses[del_idx]\n if status == 429 or status == 403:\n logger.warning(\n \"Image validation failed due to rate limiting or blocking. \"\n f\"url={image_urls[idx]} \"\n f\"status={status} \"\n )\n elif status != 200:\n logger.info(\n \"Deleting broken image from results \"\n f\"id={results[del_idx]['identifier']} \"\n f\"status={status} \"\n )\n # remove the result, mutating in place\n del results[del_idx]\n # update the result's position in the mask to indicate it is dead\n new_mask[del_idx] = 0\n\n # Merge and cache the new mask\n mask = get_query_mask(query_hash)\n if mask:\n # skip the leading part of the mask that represents results that come before\n # the results we've verified this time around. Overwrite everything after\n # with our new results validation mask.\n new_mask = mask[:start_slice] + new_mask\n save_query_mask(query_hash, new_mask)\n\n end_time = time.time()\n logger.debug(\n \"end validation \"\n f\"end_time={end_time} \"\n f\"start_time={start_time} \"\n f\"delta={end_time - start_time} \"\n )\n\n\ndef _validation_failure(request, exception):\n logger = parent_logger.getChild(\"_validation_failure\")\n logger.warning(f\"Failed to validate image! Reason: {exception}\")\n", "path": "api/catalog/api/utils/validate_images.py"}]} | 2,330 | 898 |
gh_patches_debug_38691 | rasdani/github-patches | git_diff | fidals__shopelectro-316 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Page-product rows duplication on search page
</issue>
<code>
[start of shopelectro/models.py]
1 from itertools import chain, groupby
2 from operator import attrgetter
3 from typing import List, Tuple
4 from uuid import uuid4
5
6 from django.conf import settings
7 from django.db import models
8 from django.urls import reverse
9 from django.utils.text import slugify
10 from django.utils.translation import ugettext_lazy as _
11 from mptt.querysets import TreeQuerySet
12 from unidecode import unidecode
13
14 from catalog.models import (
15 AbstractCategory,
16 AbstractProduct,
17 CategoryManager,
18 )
19 from ecommerce.models import Order as ecOrder
20 from pages.models import CustomPage, ModelPage, SyncPageMixin
21
22
23 class SECategoryQuerySet(TreeQuerySet):
24 def get_categories_tree_with_pictures(self) -> 'SECategoryQuerySet':
25 categories_with_pictures = (
26 self
27 .filter(products__page__images__isnull=False)
28 .distinct()
29 )
30
31 return categories_with_pictures.get_ancestors(include_self=True)
32
33
34 class SECategoryManager(CategoryManager.from_queryset(SECategoryQuerySet)):
35 pass
36
37
38 class Category(AbstractCategory, SyncPageMixin):
39
40 objects = SECategoryManager()
41 uuid = models.UUIDField(default=uuid4, editable=False)
42
43 @classmethod
44 def get_default_parent(cls):
45 return CustomPage.objects.filter(slug='catalog').first()
46
47 @property
48 def image(self):
49 products = self.products.all()
50 return products[0].image if products else None
51
52 def get_absolute_url(self):
53 return reverse('category', args=(self.page.slug,))
54
55
56 class Product(AbstractProduct, SyncPageMixin):
57
58 category = models.ForeignKey(
59 Category,
60 on_delete=models.CASCADE,
61 null=True,
62 related_name='products',
63 verbose_name=_('category'),
64 )
65
66 tags = models.ManyToManyField(
67 'Tag',
68 related_name='products',
69 blank=True,
70 verbose_name=_('tags'),
71 )
72
73 vendor_code = models.SmallIntegerField(verbose_name=_('vendor_code'))
74 uuid = models.UUIDField(default=uuid4, editable=False)
75 purchase_price = models.FloatField(
76 default=0, verbose_name=_('purchase_price'))
77 wholesale_small = models.FloatField(
78 default=0, verbose_name=_('wholesale_small'))
79 wholesale_medium = models.FloatField(
80 default=0, verbose_name=_('wholesale_medium'))
81 wholesale_large = models.FloatField(
82 default=0, verbose_name=_('wholesale_large'))
83
84 def get_absolute_url(self):
85 return reverse('product', args=(self.vendor_code,))
86
87 @property
88 def average_rate(self):
89 """Return rounded to first decimal averaged rating."""
90 rating = self.product_feedbacks.aggregate(
91 avg=models.Avg('rating')).get('avg', 0)
92 return round(rating, 1)
93
94 @property
95 def feedback_count(self):
96 return self.product_feedbacks.count()
97
98 @property
99 def feedback(self):
100 return self.product_feedbacks.all().order_by('-date')
101
102 @property
103 def params(self):
104 return Tag.objects.filter(products=self).get_group_tags_pairs()
105
106
107 class ProductFeedback(models.Model):
108 product = models.ForeignKey(
109 Product, on_delete=models.CASCADE, null=True,
110 related_name='product_feedbacks'
111 )
112
113 date = models.DateTimeField(
114 auto_now=True, db_index=True, verbose_name=_('date'))
115 name = models.CharField(
116 max_length=255, db_index=True, verbose_name=_('name'))
117 rating = models.PositiveSmallIntegerField(
118 default=1, db_index=True, verbose_name=_('rating'))
119 dignities = models.TextField(
120 default='', blank=True, verbose_name=_('dignities'))
121 limitations = models.TextField(
122 default='', blank=True, verbose_name=_('limitations'))
123 general = models.TextField(
124 default='', blank=True, verbose_name=_('limitations'))
125
126
127 def _default_payment():
128 """Default payment option is first element of first tuple in options."""
129 assert settings.PAYMENT_OPTIONS[0][0], 'No payment options!'
130 return settings.PAYMENT_OPTIONS[0][0]
131
132
133 class Order(ecOrder):
134 address = models.TextField(blank=True, default='')
135 payment_type = models.CharField(
136 max_length=255,
137 choices=settings.PAYMENT_OPTIONS,
138 default=_default_payment()
139 )
140 comment = models.TextField(blank=True, default='')
141
142 @property
143 def payment_type_name(self):
144 """Return name for an order's payment option."""
145 return next(
146 name for option, name in settings.PAYMENT_OPTIONS
147 if self.payment_type == option
148 )
149
150 def set_positions(self, cart):
151 """Save cart's state into Order instance."""
152 self.save()
153 for id_, position in cart:
154 self.positions.create(
155 order=self,
156 product_id=id_,
157 vendor_code=position['vendor_code'],
158 name=position['name'],
159 price=position['price'],
160 quantity=position['quantity']
161 )
162 return self
163
164
165 class CategoryPage(ModelPage):
166 """Create proxy model for Admin."""
167
168 class Meta(ModelPage.Meta): # Ignore PycodestyleBear (E303)
169 proxy = True
170
171 objects = ModelPage.create_model_page_managers(Category)
172
173
174 class ProductPage(ModelPage):
175 """Create proxy model for Admin."""
176
177 class Meta(ModelPage.Meta): # Ignore PycodestyleBear (E303)
178 proxy = True
179
180 objects = ModelPage.create_model_page_managers(Product)
181
182
183 class TagGroup(models.Model):
184
185 uuid = models.UUIDField(default=uuid4, editable=False) # Ignore CPDBear
186 name = models.CharField(
187 max_length=100, db_index=True, verbose_name=_('name'))
188 position = models.PositiveSmallIntegerField(
189 default=0, blank=True, db_index=True, verbose_name=_('position'),
190 )
191
192 def __str__(self):
193 return self.name
194
195
196 class TagQuerySet(models.QuerySet):
197
198 def get_group_tags_pairs(self) -> List[Tuple[TagGroup, List['Tag']]]:
199 ordering = settings.TAGS_ORDER
200 distinct = [order.lstrip('-') for order in ordering]
201
202 tags = (
203 self
204 .all()
205 .prefetch_related('group')
206 .order_by(*ordering)
207 .distinct(*distinct, 'id')
208 )
209
210 group_tags_pair = [
211 (group, list(tags_))
212 for group, tags_ in groupby(tags, key=attrgetter('group'))
213 ]
214
215 return group_tags_pair
216
217
218 class TagManager(models.Manager.from_queryset(TagQuerySet)):
219
220 def get_queryset(self):
221 return (
222 super().get_queryset()
223 .order_by(*settings.TAGS_ORDER)
224 )
225
226 def get_group_tags_pairs(self):
227 return self.get_queryset().get_group_tags_pairs()
228
229
230 class Tag(models.Model):
231
232 objects = TagManager()
233
234 uuid = models.UUIDField(default=uuid4, editable=False)
235 name = models.CharField(
236 max_length=100, db_index=True, verbose_name=_('name'))
237 position = models.PositiveSmallIntegerField(
238 default=0, blank=True, db_index=True, verbose_name=_('position'),
239 )
240
241 slug = models.SlugField(default='')
242
243 group = models.ForeignKey(
244 TagGroup, on_delete=models.CASCADE, null=True, related_name='tags',
245 )
246
247 def __str__(self):
248 return self.name
249
250 def save(self, *args, **kwargs):
251 if not self.slug:
252 # same slugify code used in PageMixin object
253 self.slug = slugify(
254 unidecode(self.name.replace('.', '-').replace('+', '-'))
255 )
256 super(Tag, self).save(*args, **kwargs)
257
258 @staticmethod
259 def parse_url_tags(tags: str) -> list:
260 groups = tags.split(settings.TAGS_URL_DELIMITER)
261 return set(chain.from_iterable(
262 group.split(settings.TAG_GROUPS_URL_DELIMITER) for group in groups
263 ))
264
265
266 def serialize_tags(
267 tags: TagQuerySet,
268 field_name: str,
269 type_delimiter: str,
270 group_delimiter: str,
271 ) -> str:
272 group_tags_map = tags.get_group_tags_pairs()
273
274 _, tags_by_group = zip(*group_tags_map)
275
276 return group_delimiter.join(
277 type_delimiter.join(getattr(tag, field_name) for tag in tags_list)
278 for tags_list in tags_by_group
279 )
280
281
282 def serialize_tags_to_url(tags: TagQuerySet) -> str:
283 return serialize_tags(
284 tags=tags,
285 field_name='slug',
286 type_delimiter=settings.TAGS_URL_DELIMITER,
287 group_delimiter=settings.TAG_GROUPS_URL_DELIMITER
288 )
289
290
291 def serialize_tags_to_title(tags: TagQuerySet) -> str:
292 return serialize_tags(
293 tags=tags,
294 field_name='name',
295 type_delimiter=settings.TAGS_TITLE_DELIMITER,
296 group_delimiter=settings.TAG_GROUPS_TITLE_DELIMITER
297 )
298
[end of shopelectro/models.py]
[start of shopelectro/views/search.py]
1 from django.conf import settings
2
3 from search import views as search_views, search as search_engine
4 from pages.models import Page
5
6 from shopelectro.models import Product, Category
7
8
9 class Search(search_views.SearchView):
10 def get_redirect_search_entity(self):
11 return next(s for s in self.search_entities if s.name == 'product')
12
13 # ignore CPDBear
14 search_entities = [
15 search_engine.Search(
16 name='category',
17 qs=Category.objects.all(),
18 fields=['name'],
19 min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
20 ),
21 search_engine.Search(
22 name='product',
23 qs=Product.objects.all(),
24 fields=['name'],
25 redirect_field='vendor_code',
26 min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
27 ),
28 search_engine.Search(
29 name='page',
30 qs=Page.objects.all(),
31 fields=['name'],
32 min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
33 )
34 ]
35
36 redirect_field = 'vendor_code'
37
38
39 class Autocomplete(search_views.AutocompleteView):
40
41 # ignore CPDBear
42 search_entities = [
43 search_engine.Search(
44 name='category',
45 qs=Category.objects.all(),
46 fields=['name', 'id'],
47 template_fields=['name', 'url'],
48 min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
49 ),
50 search_engine.Search(
51 name='product',
52 qs=Product.objects.all(),
53 fields=['name', 'id', 'vendor_code'],
54 template_fields=['name', 'price', 'url'],
55 min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
56 ),
57 search_engine.Search(
58 name='pages',
59 qs=Page.objects.all(),
60 fields=['name'],
61 template_fields=['name', 'url'],
62 min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
63 )
64 ]
65
66 see_all_label = settings.SEARCH_SEE_ALL_LABEL
67
68
69 class AdminAutocomplete(search_views.AdminAutocompleteView):
70
71 # ignore CPDBear
72 search_entities = [
73 search_engine.Search(
74 name='category',
75 qs=Category.objects.all(),
76 fields=['name'],
77 min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
78 ),
79 search_engine.Search(
80 name='product',
81 qs=Product.objects.all(),
82 fields=['name'],
83 min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
84 ),
85 search_engine.Search(
86 name='pages',
87 qs=Page.objects.all(),
88 fields=['name'],
89 min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
90 )
91 ]
92
[end of shopelectro/views/search.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/shopelectro/models.py b/shopelectro/models.py
--- a/shopelectro/models.py
+++ b/shopelectro/models.py
@@ -8,6 +8,7 @@
from django.urls import reverse
from django.utils.text import slugify
from django.utils.translation import ugettext_lazy as _
+from mptt.models import TreeManager
from mptt.querysets import TreeQuerySet
from unidecode import unidecode
@@ -17,7 +18,7 @@
CategoryManager,
)
from ecommerce.models import Order as ecOrder
-from pages.models import CustomPage, ModelPage, SyncPageMixin
+from pages.models import CustomPage, ModelPage, Page, SyncPageMixin
class SECategoryQuerySet(TreeQuerySet):
@@ -295,3 +296,17 @@
type_delimiter=settings.TAGS_TITLE_DELIMITER,
group_delimiter=settings.TAG_GROUPS_TITLE_DELIMITER
)
+
+
+class ExcludedModelTPageManager(TreeManager):
+
+ def get_queryset(self):
+ return super().get_queryset().exclude(type=Page.MODEL_TYPE)
+
+
+class ExcludedModelTPage(Page):
+
+ class Meta(Page.Meta): # Ignore PycodestyleBear (E303)
+ proxy = True
+
+ objects = ExcludedModelTPageManager()
diff --git a/shopelectro/views/search.py b/shopelectro/views/search.py
--- a/shopelectro/views/search.py
+++ b/shopelectro/views/search.py
@@ -3,7 +3,7 @@
from search import views as search_views, search as search_engine
from pages.models import Page
-from shopelectro.models import Product, Category
+from shopelectro.models import Category, Product, ExcludedModelTPage
class Search(search_views.SearchView):
@@ -27,7 +27,7 @@
),
search_engine.Search(
name='page',
- qs=Page.objects.all(),
+ qs=ExcludedModelTPage.objects.all(),
fields=['name'],
min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
)
@@ -56,7 +56,7 @@
),
search_engine.Search(
name='pages',
- qs=Page.objects.all(),
+ qs=ExcludedModelTPage.objects.all(),
fields=['name'],
template_fields=['name', 'url'],
min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
@@ -84,7 +84,7 @@
),
search_engine.Search(
name='pages',
- qs=Page.objects.all(),
+ qs=ExcludedModelTPage.objects.all(),
fields=['name'],
min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
)
| {"golden_diff": "diff --git a/shopelectro/models.py b/shopelectro/models.py\n--- a/shopelectro/models.py\n+++ b/shopelectro/models.py\n@@ -8,6 +8,7 @@\n from django.urls import reverse\n from django.utils.text import slugify\n from django.utils.translation import ugettext_lazy as _\n+from mptt.models import TreeManager\n from mptt.querysets import TreeQuerySet\n from unidecode import unidecode\n \n@@ -17,7 +18,7 @@\n CategoryManager,\n )\n from ecommerce.models import Order as ecOrder\n-from pages.models import CustomPage, ModelPage, SyncPageMixin\n+from pages.models import CustomPage, ModelPage, Page, SyncPageMixin\n \n \n class SECategoryQuerySet(TreeQuerySet):\n@@ -295,3 +296,17 @@\n type_delimiter=settings.TAGS_TITLE_DELIMITER,\n group_delimiter=settings.TAG_GROUPS_TITLE_DELIMITER\n )\n+\n+\n+class ExcludedModelTPageManager(TreeManager):\n+\n+ def get_queryset(self):\n+ return super().get_queryset().exclude(type=Page.MODEL_TYPE)\n+\n+\n+class ExcludedModelTPage(Page):\n+\n+ class Meta(Page.Meta): # Ignore PycodestyleBear (E303)\n+ proxy = True\n+\n+ objects = ExcludedModelTPageManager()\ndiff --git a/shopelectro/views/search.py b/shopelectro/views/search.py\n--- a/shopelectro/views/search.py\n+++ b/shopelectro/views/search.py\n@@ -3,7 +3,7 @@\n from search import views as search_views, search as search_engine\n from pages.models import Page\n \n-from shopelectro.models import Product, Category\n+from shopelectro.models import Category, Product, ExcludedModelTPage\n \n \n class Search(search_views.SearchView):\n@@ -27,7 +27,7 @@\n ),\n search_engine.Search(\n name='page',\n- qs=Page.objects.all(),\n+ qs=ExcludedModelTPage.objects.all(),\n fields=['name'],\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n )\n@@ -56,7 +56,7 @@\n ),\n search_engine.Search(\n name='pages',\n- qs=Page.objects.all(),\n+ qs=ExcludedModelTPage.objects.all(),\n fields=['name'],\n template_fields=['name', 'url'],\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n@@ -84,7 +84,7 @@\n ),\n search_engine.Search(\n name='pages',\n- qs=Page.objects.all(),\n+ qs=ExcludedModelTPage.objects.all(),\n fields=['name'],\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n )\n", "issue": "Page-product rows duplication on search page\n\r\n\n", "before_files": [{"content": "from itertools import chain, groupby\nfrom operator import attrgetter\nfrom typing import List, Tuple\nfrom uuid import uuid4\n\nfrom django.conf import settings\nfrom django.db import models\nfrom django.urls import reverse\nfrom django.utils.text import slugify\nfrom django.utils.translation import ugettext_lazy as _\nfrom mptt.querysets import TreeQuerySet\nfrom unidecode import unidecode\n\nfrom catalog.models import (\n AbstractCategory,\n AbstractProduct,\n CategoryManager,\n)\nfrom ecommerce.models import Order as ecOrder\nfrom pages.models import CustomPage, ModelPage, SyncPageMixin\n\n\nclass SECategoryQuerySet(TreeQuerySet):\n def get_categories_tree_with_pictures(self) -> 'SECategoryQuerySet':\n categories_with_pictures = (\n self\n .filter(products__page__images__isnull=False)\n .distinct()\n )\n\n return categories_with_pictures.get_ancestors(include_self=True)\n\n\nclass SECategoryManager(CategoryManager.from_queryset(SECategoryQuerySet)):\n pass\n\n\nclass Category(AbstractCategory, SyncPageMixin):\n\n objects = SECategoryManager()\n uuid = models.UUIDField(default=uuid4, editable=False)\n\n @classmethod\n def get_default_parent(cls):\n return CustomPage.objects.filter(slug='catalog').first()\n\n @property\n def image(self):\n products = self.products.all()\n return products[0].image if products else None\n\n def get_absolute_url(self):\n return reverse('category', args=(self.page.slug,))\n\n\nclass Product(AbstractProduct, SyncPageMixin):\n\n category = models.ForeignKey(\n Category,\n on_delete=models.CASCADE,\n null=True,\n related_name='products',\n verbose_name=_('category'),\n )\n\n tags = models.ManyToManyField(\n 'Tag',\n related_name='products',\n blank=True,\n verbose_name=_('tags'),\n )\n\n vendor_code = models.SmallIntegerField(verbose_name=_('vendor_code'))\n uuid = models.UUIDField(default=uuid4, editable=False)\n purchase_price = models.FloatField(\n default=0, verbose_name=_('purchase_price'))\n wholesale_small = models.FloatField(\n default=0, verbose_name=_('wholesale_small'))\n wholesale_medium = models.FloatField(\n default=0, verbose_name=_('wholesale_medium'))\n wholesale_large = models.FloatField(\n default=0, verbose_name=_('wholesale_large'))\n\n def get_absolute_url(self):\n return reverse('product', args=(self.vendor_code,))\n\n @property\n def average_rate(self):\n \"\"\"Return rounded to first decimal averaged rating.\"\"\"\n rating = self.product_feedbacks.aggregate(\n avg=models.Avg('rating')).get('avg', 0)\n return round(rating, 1)\n\n @property\n def feedback_count(self):\n return self.product_feedbacks.count()\n\n @property\n def feedback(self):\n return self.product_feedbacks.all().order_by('-date')\n\n @property\n def params(self):\n return Tag.objects.filter(products=self).get_group_tags_pairs()\n\n\nclass ProductFeedback(models.Model):\n product = models.ForeignKey(\n Product, on_delete=models.CASCADE, null=True,\n related_name='product_feedbacks'\n )\n\n date = models.DateTimeField(\n auto_now=True, db_index=True, verbose_name=_('date'))\n name = models.CharField(\n max_length=255, db_index=True, verbose_name=_('name'))\n rating = models.PositiveSmallIntegerField(\n default=1, db_index=True, verbose_name=_('rating'))\n dignities = models.TextField(\n default='', blank=True, verbose_name=_('dignities'))\n limitations = models.TextField(\n default='', blank=True, verbose_name=_('limitations'))\n general = models.TextField(\n default='', blank=True, verbose_name=_('limitations'))\n\n\ndef _default_payment():\n \"\"\"Default payment option is first element of first tuple in options.\"\"\"\n assert settings.PAYMENT_OPTIONS[0][0], 'No payment options!'\n return settings.PAYMENT_OPTIONS[0][0]\n\n\nclass Order(ecOrder):\n address = models.TextField(blank=True, default='')\n payment_type = models.CharField(\n max_length=255,\n choices=settings.PAYMENT_OPTIONS,\n default=_default_payment()\n )\n comment = models.TextField(blank=True, default='')\n\n @property\n def payment_type_name(self):\n \"\"\"Return name for an order's payment option.\"\"\"\n return next(\n name for option, name in settings.PAYMENT_OPTIONS\n if self.payment_type == option\n )\n\n def set_positions(self, cart):\n \"\"\"Save cart's state into Order instance.\"\"\"\n self.save()\n for id_, position in cart:\n self.positions.create(\n order=self,\n product_id=id_,\n vendor_code=position['vendor_code'],\n name=position['name'],\n price=position['price'],\n quantity=position['quantity']\n )\n return self\n\n\nclass CategoryPage(ModelPage):\n \"\"\"Create proxy model for Admin.\"\"\"\n\n class Meta(ModelPage.Meta): # Ignore PycodestyleBear (E303)\n proxy = True\n\n objects = ModelPage.create_model_page_managers(Category)\n\n\nclass ProductPage(ModelPage):\n \"\"\"Create proxy model for Admin.\"\"\"\n\n class Meta(ModelPage.Meta): # Ignore PycodestyleBear (E303)\n proxy = True\n\n objects = ModelPage.create_model_page_managers(Product)\n\n\nclass TagGroup(models.Model):\n\n uuid = models.UUIDField(default=uuid4, editable=False) # Ignore CPDBear\n name = models.CharField(\n max_length=100, db_index=True, verbose_name=_('name'))\n position = models.PositiveSmallIntegerField(\n default=0, blank=True, db_index=True, verbose_name=_('position'),\n )\n\n def __str__(self):\n return self.name\n\n\nclass TagQuerySet(models.QuerySet):\n\n def get_group_tags_pairs(self) -> List[Tuple[TagGroup, List['Tag']]]:\n ordering = settings.TAGS_ORDER\n distinct = [order.lstrip('-') for order in ordering]\n\n tags = (\n self\n .all()\n .prefetch_related('group')\n .order_by(*ordering)\n .distinct(*distinct, 'id')\n )\n\n group_tags_pair = [\n (group, list(tags_))\n for group, tags_ in groupby(tags, key=attrgetter('group'))\n ]\n\n return group_tags_pair\n\n\nclass TagManager(models.Manager.from_queryset(TagQuerySet)):\n\n def get_queryset(self):\n return (\n super().get_queryset()\n .order_by(*settings.TAGS_ORDER)\n )\n\n def get_group_tags_pairs(self):\n return self.get_queryset().get_group_tags_pairs()\n\n\nclass Tag(models.Model):\n\n objects = TagManager()\n\n uuid = models.UUIDField(default=uuid4, editable=False)\n name = models.CharField(\n max_length=100, db_index=True, verbose_name=_('name'))\n position = models.PositiveSmallIntegerField(\n default=0, blank=True, db_index=True, verbose_name=_('position'),\n )\n\n slug = models.SlugField(default='')\n\n group = models.ForeignKey(\n TagGroup, on_delete=models.CASCADE, null=True, related_name='tags',\n )\n\n def __str__(self):\n return self.name\n\n def save(self, *args, **kwargs):\n if not self.slug:\n # same slugify code used in PageMixin object\n self.slug = slugify(\n unidecode(self.name.replace('.', '-').replace('+', '-'))\n )\n super(Tag, self).save(*args, **kwargs)\n\n @staticmethod\n def parse_url_tags(tags: str) -> list:\n groups = tags.split(settings.TAGS_URL_DELIMITER)\n return set(chain.from_iterable(\n group.split(settings.TAG_GROUPS_URL_DELIMITER) for group in groups\n ))\n\n\ndef serialize_tags(\n tags: TagQuerySet,\n field_name: str,\n type_delimiter: str,\n group_delimiter: str,\n) -> str:\n group_tags_map = tags.get_group_tags_pairs()\n\n _, tags_by_group = zip(*group_tags_map)\n\n return group_delimiter.join(\n type_delimiter.join(getattr(tag, field_name) for tag in tags_list)\n for tags_list in tags_by_group\n )\n\n\ndef serialize_tags_to_url(tags: TagQuerySet) -> str:\n return serialize_tags(\n tags=tags,\n field_name='slug',\n type_delimiter=settings.TAGS_URL_DELIMITER,\n group_delimiter=settings.TAG_GROUPS_URL_DELIMITER\n )\n\n\ndef serialize_tags_to_title(tags: TagQuerySet) -> str:\n return serialize_tags(\n tags=tags,\n field_name='name',\n type_delimiter=settings.TAGS_TITLE_DELIMITER,\n group_delimiter=settings.TAG_GROUPS_TITLE_DELIMITER\n )\n", "path": "shopelectro/models.py"}, {"content": "from django.conf import settings\n\nfrom search import views as search_views, search as search_engine\nfrom pages.models import Page\n\nfrom shopelectro.models import Product, Category\n\n\nclass Search(search_views.SearchView):\n def get_redirect_search_entity(self):\n return next(s for s in self.search_entities if s.name == 'product')\n\n # ignore CPDBear\n search_entities = [\n search_engine.Search(\n name='category',\n qs=Category.objects.all(),\n fields=['name'],\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n ),\n search_engine.Search(\n name='product',\n qs=Product.objects.all(),\n fields=['name'],\n redirect_field='vendor_code',\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n ),\n search_engine.Search(\n name='page',\n qs=Page.objects.all(),\n fields=['name'],\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n )\n ]\n\n redirect_field = 'vendor_code'\n\n\nclass Autocomplete(search_views.AutocompleteView):\n\n # ignore CPDBear\n search_entities = [\n search_engine.Search(\n name='category',\n qs=Category.objects.all(),\n fields=['name', 'id'],\n template_fields=['name', 'url'],\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n ),\n search_engine.Search(\n name='product',\n qs=Product.objects.all(),\n fields=['name', 'id', 'vendor_code'],\n template_fields=['name', 'price', 'url'],\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n ),\n search_engine.Search(\n name='pages',\n qs=Page.objects.all(),\n fields=['name'],\n template_fields=['name', 'url'],\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n )\n ]\n\n see_all_label = settings.SEARCH_SEE_ALL_LABEL\n\n\nclass AdminAutocomplete(search_views.AdminAutocompleteView):\n\n # ignore CPDBear\n search_entities = [\n search_engine.Search(\n name='category',\n qs=Category.objects.all(),\n fields=['name'],\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n ),\n search_engine.Search(\n name='product',\n qs=Product.objects.all(),\n fields=['name'],\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n ),\n search_engine.Search(\n name='pages',\n qs=Page.objects.all(),\n fields=['name'],\n min_similarity=settings.TRIGRAM_MIN_SIMILARITY,\n )\n ]\n", "path": "shopelectro/views/search.py"}]} | 4,028 | 598 |
gh_patches_debug_38362 | rasdani/github-patches | git_diff | alltheplaces__alltheplaces-3623 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Spider argos is broken
During the global build at 2021-08-25-14-42-15, spider **argos** failed with **0 features** and **0 errors**.
Here's [the log](https://data.alltheplaces.xyz/runs/2021-08-25-14-42-15/logs/argos.txt) and [the output](https://data.alltheplaces.xyz/runs/2021-08-25-14-42-15/output/argos.geojson) ([on a map](https://data.alltheplaces.xyz/map.html?show=https://data.alltheplaces.xyz/runs/2021-08-25-14-42-15/output/argos.geojson))
Spider argos is broken
During the global build at 2021-05-26-14-42-23, spider **argos** failed with **0 features** and **0 errors**.
Here's [the log](https://data.alltheplaces.xyz/runs/2021-05-26-14-42-23/logs/argos.log) and [the output](https://data.alltheplaces.xyz/runs/2021-05-26-14-42-23/output/argos.geojson) ([on a map](https://data.alltheplaces.xyz/map.html?show=https://data.alltheplaces.xyz/runs/2021-05-26-14-42-23/output/argos.geojson))
</issue>
<code>
[start of locations/spiders/argos.py]
1 import scrapy
2 import re
3 import json
4 from locations.items import GeojsonPointItem
5
6
7 class ArgosSpider(scrapy.Spider):
8
9 name = "argos"
10 item_attributes = {"brand": "Argos"}
11 allowed_domains = ["www.argos.co.uk"]
12 download_delay = 0.5
13 start_urls = ("http://www.argos.co.uk/stores/",)
14
15 def parse_stores(self, response):
16 data = re.findall(r"window.INITIAL_STATE =[^<]+", response.text)
17 json_data = json.loads(data[0].replace("window.INITIAL_STATE =", ""))
18 properties = {
19 "addr_full": json_data["store"]["store"]["address"],
20 "phone": json_data["store"]["store"]["tel"],
21 "city": json_data["store"]["store"]["town"],
22 "state": "",
23 "postcode": json_data["store"]["store"]["postcode"],
24 "ref": json_data["store"]["store"]["id"],
25 "website": response.url,
26 "lat": float(json_data["store"]["store"]["lat"]),
27 "lon": float(json_data["store"]["store"]["lng"]),
28 }
29
30 open_hours = ""
31 for item in json_data["store"]["store"]["storeTimes"]:
32 open_hours = open_hours + item["date"][:2] + " " + item["time"] + " ;"
33 if open_hours:
34 properties["opening_hours"] = open_hours
35
36 yield GeojsonPointItem(**properties)
37
38 def parse(self, response):
39 urls = response.xpath('//div/div[@class="azsl-panel"]/ul/li/a/@href').extract()
40 for path in urls:
41 yield scrapy.Request(response.urljoin(path), callback=self.parse_stores)
42
[end of locations/spiders/argos.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/argos.py b/locations/spiders/argos.py
--- a/locations/spiders/argos.py
+++ b/locations/spiders/argos.py
@@ -1,41 +1,58 @@
-import scrapy
import re
import json
-from locations.items import GeojsonPointItem
+from locations.items import GeojsonPointItem
+from locations.hours import OpeningHours
+from scrapy.spiders import SitemapSpider
-class ArgosSpider(scrapy.Spider):
+class ArgosSpider(SitemapSpider):
name = "argos"
- item_attributes = {"brand": "Argos"}
+ item_attributes = {"brand": "Argos", "brand_wikidata": "Q4789707"}
allowed_domains = ["www.argos.co.uk"]
download_delay = 0.5
- start_urls = ("http://www.argos.co.uk/stores/",)
+ sitemap_urls = [
+ "https://www.argos.co.uk/stores_sitemap.xml",
+ ]
+ sitemap_rules = [
+ (
+ r"https://www.argos.co.uk/stores/([\d]+)-([\w-]+)",
+ "parse",
+ ),
+ ]
+ custom_settings = {
+ "USER_AGENT": "Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/99.0"
+ }
- def parse_stores(self, response):
+ def parse(self, response):
data = re.findall(r"window.INITIAL_STATE =[^<]+", response.text)
json_data = json.loads(data[0].replace("window.INITIAL_STATE =", ""))
properties = {
- "addr_full": json_data["store"]["store"]["address"],
+ "street_address": json_data["store"]["store"]["address"],
"phone": json_data["store"]["store"]["tel"],
"city": json_data["store"]["store"]["town"],
- "state": "",
+ "name": json_data["store"]["store"]["name"],
"postcode": json_data["store"]["store"]["postcode"],
"ref": json_data["store"]["store"]["id"],
"website": response.url,
"lat": float(json_data["store"]["store"]["lat"]),
"lon": float(json_data["store"]["store"]["lng"]),
+ "extras": {
+ "store_type": json_data["store"]["store"]["type"],
+ },
}
- open_hours = ""
+ oh = OpeningHours()
for item in json_data["store"]["store"]["storeTimes"]:
- open_hours = open_hours + item["date"][:2] + " " + item["time"] + " ;"
- if open_hours:
- properties["opening_hours"] = open_hours
+ open_time, close_time = item["time"].split(" - ")
+ if (
+ open_time
+ and not open_time.isspace()
+ and close_time
+ and not close_time.isspace()
+ ):
+ oh.add_range(item["date"][:2], open_time, close_time)
- yield GeojsonPointItem(**properties)
+ properties["opening_hours"] = oh.as_opening_hours()
- def parse(self, response):
- urls = response.xpath('//div/div[@class="azsl-panel"]/ul/li/a/@href').extract()
- for path in urls:
- yield scrapy.Request(response.urljoin(path), callback=self.parse_stores)
+ yield GeojsonPointItem(**properties)
| {"golden_diff": "diff --git a/locations/spiders/argos.py b/locations/spiders/argos.py\n--- a/locations/spiders/argos.py\n+++ b/locations/spiders/argos.py\n@@ -1,41 +1,58 @@\n-import scrapy\n import re\n import json\n-from locations.items import GeojsonPointItem\n \n+from locations.items import GeojsonPointItem\n+from locations.hours import OpeningHours\n+from scrapy.spiders import SitemapSpider\n \n-class ArgosSpider(scrapy.Spider):\n \n+class ArgosSpider(SitemapSpider):\n name = \"argos\"\n- item_attributes = {\"brand\": \"Argos\"}\n+ item_attributes = {\"brand\": \"Argos\", \"brand_wikidata\": \"Q4789707\"}\n allowed_domains = [\"www.argos.co.uk\"]\n download_delay = 0.5\n- start_urls = (\"http://www.argos.co.uk/stores/\",)\n+ sitemap_urls = [\n+ \"https://www.argos.co.uk/stores_sitemap.xml\",\n+ ]\n+ sitemap_rules = [\n+ (\n+ r\"https://www.argos.co.uk/stores/([\\d]+)-([\\w-]+)\",\n+ \"parse\",\n+ ),\n+ ]\n+ custom_settings = {\n+ \"USER_AGENT\": \"Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/99.0\"\n+ }\n \n- def parse_stores(self, response):\n+ def parse(self, response):\n data = re.findall(r\"window.INITIAL_STATE =[^<]+\", response.text)\n json_data = json.loads(data[0].replace(\"window.INITIAL_STATE =\", \"\"))\n properties = {\n- \"addr_full\": json_data[\"store\"][\"store\"][\"address\"],\n+ \"street_address\": json_data[\"store\"][\"store\"][\"address\"],\n \"phone\": json_data[\"store\"][\"store\"][\"tel\"],\n \"city\": json_data[\"store\"][\"store\"][\"town\"],\n- \"state\": \"\",\n+ \"name\": json_data[\"store\"][\"store\"][\"name\"],\n \"postcode\": json_data[\"store\"][\"store\"][\"postcode\"],\n \"ref\": json_data[\"store\"][\"store\"][\"id\"],\n \"website\": response.url,\n \"lat\": float(json_data[\"store\"][\"store\"][\"lat\"]),\n \"lon\": float(json_data[\"store\"][\"store\"][\"lng\"]),\n+ \"extras\": {\n+ \"store_type\": json_data[\"store\"][\"store\"][\"type\"],\n+ },\n }\n \n- open_hours = \"\"\n+ oh = OpeningHours()\n for item in json_data[\"store\"][\"store\"][\"storeTimes\"]:\n- open_hours = open_hours + item[\"date\"][:2] + \" \" + item[\"time\"] + \" ;\"\n- if open_hours:\n- properties[\"opening_hours\"] = open_hours\n+ open_time, close_time = item[\"time\"].split(\" - \")\n+ if (\n+ open_time\n+ and not open_time.isspace()\n+ and close_time\n+ and not close_time.isspace()\n+ ):\n+ oh.add_range(item[\"date\"][:2], open_time, close_time)\n \n- yield GeojsonPointItem(**properties)\n+ properties[\"opening_hours\"] = oh.as_opening_hours()\n \n- def parse(self, response):\n- urls = response.xpath('//div/div[@class=\"azsl-panel\"]/ul/li/a/@href').extract()\n- for path in urls:\n- yield scrapy.Request(response.urljoin(path), callback=self.parse_stores)\n+ yield GeojsonPointItem(**properties)\n", "issue": "Spider argos is broken\nDuring the global build at 2021-08-25-14-42-15, spider **argos** failed with **0 features** and **0 errors**.\n\nHere's [the log](https://data.alltheplaces.xyz/runs/2021-08-25-14-42-15/logs/argos.txt) and [the output](https://data.alltheplaces.xyz/runs/2021-08-25-14-42-15/output/argos.geojson) ([on a map](https://data.alltheplaces.xyz/map.html?show=https://data.alltheplaces.xyz/runs/2021-08-25-14-42-15/output/argos.geojson))\nSpider argos is broken\nDuring the global build at 2021-05-26-14-42-23, spider **argos** failed with **0 features** and **0 errors**.\n\nHere's [the log](https://data.alltheplaces.xyz/runs/2021-05-26-14-42-23/logs/argos.log) and [the output](https://data.alltheplaces.xyz/runs/2021-05-26-14-42-23/output/argos.geojson) ([on a map](https://data.alltheplaces.xyz/map.html?show=https://data.alltheplaces.xyz/runs/2021-05-26-14-42-23/output/argos.geojson))\n", "before_files": [{"content": "import scrapy\nimport re\nimport json\nfrom locations.items import GeojsonPointItem\n\n\nclass ArgosSpider(scrapy.Spider):\n\n name = \"argos\"\n item_attributes = {\"brand\": \"Argos\"}\n allowed_domains = [\"www.argos.co.uk\"]\n download_delay = 0.5\n start_urls = (\"http://www.argos.co.uk/stores/\",)\n\n def parse_stores(self, response):\n data = re.findall(r\"window.INITIAL_STATE =[^<]+\", response.text)\n json_data = json.loads(data[0].replace(\"window.INITIAL_STATE =\", \"\"))\n properties = {\n \"addr_full\": json_data[\"store\"][\"store\"][\"address\"],\n \"phone\": json_data[\"store\"][\"store\"][\"tel\"],\n \"city\": json_data[\"store\"][\"store\"][\"town\"],\n \"state\": \"\",\n \"postcode\": json_data[\"store\"][\"store\"][\"postcode\"],\n \"ref\": json_data[\"store\"][\"store\"][\"id\"],\n \"website\": response.url,\n \"lat\": float(json_data[\"store\"][\"store\"][\"lat\"]),\n \"lon\": float(json_data[\"store\"][\"store\"][\"lng\"]),\n }\n\n open_hours = \"\"\n for item in json_data[\"store\"][\"store\"][\"storeTimes\"]:\n open_hours = open_hours + item[\"date\"][:2] + \" \" + item[\"time\"] + \" ;\"\n if open_hours:\n properties[\"opening_hours\"] = open_hours\n\n yield GeojsonPointItem(**properties)\n\n def parse(self, response):\n urls = response.xpath('//div/div[@class=\"azsl-panel\"]/ul/li/a/@href').extract()\n for path in urls:\n yield scrapy.Request(response.urljoin(path), callback=self.parse_stores)\n", "path": "locations/spiders/argos.py"}]} | 1,348 | 790 |
gh_patches_debug_41926 | rasdani/github-patches | git_diff | Kinto__kinto-914 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Permissions endpoint does not expose perms specified in settings
Ex:
- Set `kinto.bucket_write_principals = system.Authenticated`
- `GET /permissions` should mention every buckets
Related #892 #350
Permissions endpoint does not expose perms specified in settings
Ex:
- Set `kinto.bucket_write_principals = system.Authenticated`
- `GET /permissions` should mention every buckets
Related #892 #350
</issue>
<code>
[start of kinto/views/permissions.py]
1 import colander
2 from pyramid.security import NO_PERMISSION_REQUIRED, Authenticated
3
4 from kinto.authorization import PERMISSIONS_INHERITANCE_TREE
5 from kinto.core import utils as core_utils, resource
6 from kinto.core.storage.memory import extract_record_set
7
8
9 class PermissionsModel(object):
10 id_field = 'id'
11 modified_field = 'last_modified'
12 deleted_field = 'deleted'
13
14 def __init__(self, request):
15 self.request = request
16
17 def get_records(self, filters=None, sorting=None, pagination_rules=None,
18 limit=None, include_deleted=False, parent_id=None):
19 # Invert the permissions inheritance tree.
20 perms_descending_tree = {}
21 for on_resource, tree in PERMISSIONS_INHERITANCE_TREE.items():
22 for obtained_perm, obtained_from in tree.items():
23 for from_resource, perms in obtained_from.items():
24 for perm in perms:
25 perms_descending_tree.setdefault(from_resource, {})\
26 .setdefault(perm, {})\
27 .setdefault(on_resource, set())\
28 .add(obtained_perm)
29
30 # Obtain current principals.
31 principals = self.request.effective_principals
32 if Authenticated in principals:
33 # Since this view does not require any permission (can be used to
34 # obtain public users permissions), we have to add the prefixed
35 # userid among the principals
36 # (see :mod:`kinto.core.authentication`)
37 userid = self.request.prefixed_userid
38 principals.append(userid)
39
40 # Query every possible permission of the current user from backend.
41 backend = self.request.registry.permission
42 perms_by_object_uri = backend.get_accessible_objects(principals)
43
44 entries = []
45 for object_uri, perms in perms_by_object_uri.items():
46 try:
47 # Obtain associated resource from object URI
48 resource_name, matchdict = core_utils.view_lookup(self.request,
49 object_uri)
50 except ValueError:
51 # Skip permissions entries that are not linked to an object URI
52 continue
53
54 # For consistency with event payloads, prefix id with resource name
55 matchdict[resource_name + '_id'] = matchdict.get('id')
56
57 # Expand implicit permissions using descending tree.
58 permissions = set(perms)
59 for perm in perms:
60 obtained = perms_descending_tree[resource_name][perm]
61 # Related to same resource only and not every sub-objects.
62 # (e.g "bucket:write" gives "bucket:read" but not "group:read")
63 permissions |= obtained[resource_name]
64
65 entry = dict(uri=object_uri,
66 resource_name=resource_name,
67 permissions=list(permissions),
68 **matchdict)
69 entries.append(entry)
70
71 return extract_record_set(entries, filters=filters, sorting=sorting,
72 pagination_rules=pagination_rules,
73 limit=limit)
74
75
76 class PermissionsSchema(resource.ResourceSchema):
77 uri = colander.SchemaNode(colander.String())
78 resource_name = colander.SchemaNode(colander.String())
79 permissions = colander.Sequence(colander.SchemaNode(colander.String()))
80 bucket_id = colander.SchemaNode(colander.String())
81 collection_id = colander.SchemaNode(colander.String(),
82 missing=colander.drop)
83 group_id = colander.SchemaNode(colander.String(),
84 missing=colander.drop)
85 record_id = colander.SchemaNode(colander.String(),
86 missing=colander.drop)
87
88 class Options:
89 preserve_unknown = False
90
91
92 @resource.register(name='permissions',
93 description='List of user permissions',
94 collection_path='/permissions',
95 record_path=None,
96 collection_methods=('GET',),
97 permission=NO_PERMISSION_REQUIRED)
98 class Permissions(resource.ShareableResource):
99
100 schema = PermissionsSchema
101
102 def __init__(self, request, context=None):
103 super(Permissions, self).__init__(request, context)
104 self.model = PermissionsModel(request)
105
106 def _extract_sorting(self, limit):
107 # Permissions entries are not stored with timestamp, so do not
108 # force it.
109 result = super(Permissions, self)._extract_sorting(limit)
110 without_last_modified = [s for s in result
111 if s.field != self.model.modified_field]
112 return without_last_modified
113
114 def _extract_filters(self, queryparams=None):
115 result = super(Permissions, self)._extract_filters(queryparams)
116 without_last_modified = [s for s in result
117 if s.field != self.model.modified_field]
118 return without_last_modified
119
[end of kinto/views/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/kinto/views/permissions.py b/kinto/views/permissions.py
--- a/kinto/views/permissions.py
+++ b/kinto/views/permissions.py
@@ -1,11 +1,51 @@
import colander
from pyramid.security import NO_PERMISSION_REQUIRED, Authenticated
+from pyramid.settings import aslist
from kinto.authorization import PERMISSIONS_INHERITANCE_TREE
from kinto.core import utils as core_utils, resource
from kinto.core.storage.memory import extract_record_set
+def allowed_from_settings(settings, principals):
+ """Returns every permissions allowed from settings for the current user.
+ :param settings dict: app settings
+ :param principals list: list of principals of current user
+ :rtype: dict
+
+ Result example::
+
+ {
+ "bucket": {"write", "collection:create"},
+ "collection": {"read"}
+ }
+
+ XXX: This helper will be useful for Kinto/kinto#894
+ """
+ perms_settings = {k: aslist(v) for k, v in settings.items()
+ if k.endswith('_principals')}
+ from_settings = {}
+ for key, allowed_principals in perms_settings.items():
+ resource_name, permission, _ = key.split('_')
+ # Keep the known permissions only.
+ if resource_name not in PERMISSIONS_INHERITANCE_TREE.keys():
+ continue
+ # Keep the permissions of the current user only.
+ if not bool(set(principals) & set(allowed_principals)):
+ continue
+ # ``collection_create_principals`` means ``collection:create`` in bucket.
+ if permission == 'create':
+ permission = '%s:%s' % (resource_name, permission)
+ resource_name = { # resource parents.
+ 'bucket': '',
+ 'collection': 'bucket',
+ 'group': 'bucket',
+ 'record': 'collection'}[resource_name]
+ # Store them in a convenient way.
+ from_settings.setdefault(resource_name, set()).add(permission)
+ return from_settings
+
+
class PermissionsModel(object):
id_field = 'id'
modified_field = 'last_modified'
@@ -41,10 +81,35 @@
backend = self.request.registry.permission
perms_by_object_uri = backend.get_accessible_objects(principals)
+ # Check settings for every allowed resources.
+ from_settings = allowed_from_settings(self.request.registry.settings, principals)
+
+ # Expand permissions obtained from backend with the object URIs that
+ # correspond to permissions allowed from settings.
+ allowed_resources = {'bucket', 'collection', 'group'} & set(from_settings.keys())
+ if allowed_resources:
+ storage = self.request.registry.storage
+ every_bucket, _ = storage.get_all(parent_id='', collection_id='bucket')
+ for bucket in every_bucket:
+ bucket_uri = '/buckets/{id}'.format(**bucket)
+ for res in allowed_resources:
+ resource_perms = from_settings[res]
+ # Bucket is always fetched.
+ if res == 'bucket':
+ perms_by_object_uri.setdefault(bucket_uri, []).extend(resource_perms)
+ continue
+ # Fetch bucket collections and groups.
+ # XXX: wrong approach: query in a loop!
+ every_subobjects, _ = storage.get_all(parent_id=bucket_uri,
+ collection_id=res)
+ for subobject in every_subobjects:
+ subobj_uri = bucket_uri + '/{0}s/{1}'.format(res, subobject['id'])
+ perms_by_object_uri.setdefault(subobj_uri, []).extend(resource_perms)
+
entries = []
for object_uri, perms in perms_by_object_uri.items():
try:
- # Obtain associated resource from object URI
+ # Obtain associated res from object URI
resource_name, matchdict = core_utils.view_lookup(self.request,
object_uri)
except ValueError:
| {"golden_diff": "diff --git a/kinto/views/permissions.py b/kinto/views/permissions.py\n--- a/kinto/views/permissions.py\n+++ b/kinto/views/permissions.py\n@@ -1,11 +1,51 @@\n import colander\n from pyramid.security import NO_PERMISSION_REQUIRED, Authenticated\n+from pyramid.settings import aslist\n \n from kinto.authorization import PERMISSIONS_INHERITANCE_TREE\n from kinto.core import utils as core_utils, resource\n from kinto.core.storage.memory import extract_record_set\n \n \n+def allowed_from_settings(settings, principals):\n+ \"\"\"Returns every permissions allowed from settings for the current user.\n+ :param settings dict: app settings\n+ :param principals list: list of principals of current user\n+ :rtype: dict\n+\n+ Result example::\n+\n+ {\n+ \"bucket\": {\"write\", \"collection:create\"},\n+ \"collection\": {\"read\"}\n+ }\n+\n+ XXX: This helper will be useful for Kinto/kinto#894\n+ \"\"\"\n+ perms_settings = {k: aslist(v) for k, v in settings.items()\n+ if k.endswith('_principals')}\n+ from_settings = {}\n+ for key, allowed_principals in perms_settings.items():\n+ resource_name, permission, _ = key.split('_')\n+ # Keep the known permissions only.\n+ if resource_name not in PERMISSIONS_INHERITANCE_TREE.keys():\n+ continue\n+ # Keep the permissions of the current user only.\n+ if not bool(set(principals) & set(allowed_principals)):\n+ continue\n+ # ``collection_create_principals`` means ``collection:create`` in bucket.\n+ if permission == 'create':\n+ permission = '%s:%s' % (resource_name, permission)\n+ resource_name = { # resource parents.\n+ 'bucket': '',\n+ 'collection': 'bucket',\n+ 'group': 'bucket',\n+ 'record': 'collection'}[resource_name]\n+ # Store them in a convenient way.\n+ from_settings.setdefault(resource_name, set()).add(permission)\n+ return from_settings\n+\n+\n class PermissionsModel(object):\n id_field = 'id'\n modified_field = 'last_modified'\n@@ -41,10 +81,35 @@\n backend = self.request.registry.permission\n perms_by_object_uri = backend.get_accessible_objects(principals)\n \n+ # Check settings for every allowed resources.\n+ from_settings = allowed_from_settings(self.request.registry.settings, principals)\n+\n+ # Expand permissions obtained from backend with the object URIs that\n+ # correspond to permissions allowed from settings.\n+ allowed_resources = {'bucket', 'collection', 'group'} & set(from_settings.keys())\n+ if allowed_resources:\n+ storage = self.request.registry.storage\n+ every_bucket, _ = storage.get_all(parent_id='', collection_id='bucket')\n+ for bucket in every_bucket:\n+ bucket_uri = '/buckets/{id}'.format(**bucket)\n+ for res in allowed_resources:\n+ resource_perms = from_settings[res]\n+ # Bucket is always fetched.\n+ if res == 'bucket':\n+ perms_by_object_uri.setdefault(bucket_uri, []).extend(resource_perms)\n+ continue\n+ # Fetch bucket collections and groups.\n+ # XXX: wrong approach: query in a loop!\n+ every_subobjects, _ = storage.get_all(parent_id=bucket_uri,\n+ collection_id=res)\n+ for subobject in every_subobjects:\n+ subobj_uri = bucket_uri + '/{0}s/{1}'.format(res, subobject['id'])\n+ perms_by_object_uri.setdefault(subobj_uri, []).extend(resource_perms)\n+\n entries = []\n for object_uri, perms in perms_by_object_uri.items():\n try:\n- # Obtain associated resource from object URI\n+ # Obtain associated res from object URI\n resource_name, matchdict = core_utils.view_lookup(self.request,\n object_uri)\n except ValueError:\n", "issue": "Permissions endpoint does not expose perms specified in settings\nEx:\r\n- Set `kinto.bucket_write_principals = system.Authenticated`\r\n- `GET /permissions` should mention every buckets\r\n\r\nRelated #892 #350 \nPermissions endpoint does not expose perms specified in settings\nEx:\r\n- Set `kinto.bucket_write_principals = system.Authenticated`\r\n- `GET /permissions` should mention every buckets\r\n\r\nRelated #892 #350 \n", "before_files": [{"content": "import colander\nfrom pyramid.security import NO_PERMISSION_REQUIRED, Authenticated\n\nfrom kinto.authorization import PERMISSIONS_INHERITANCE_TREE\nfrom kinto.core import utils as core_utils, resource\nfrom kinto.core.storage.memory import extract_record_set\n\n\nclass PermissionsModel(object):\n id_field = 'id'\n modified_field = 'last_modified'\n deleted_field = 'deleted'\n\n def __init__(self, request):\n self.request = request\n\n def get_records(self, filters=None, sorting=None, pagination_rules=None,\n limit=None, include_deleted=False, parent_id=None):\n # Invert the permissions inheritance tree.\n perms_descending_tree = {}\n for on_resource, tree in PERMISSIONS_INHERITANCE_TREE.items():\n for obtained_perm, obtained_from in tree.items():\n for from_resource, perms in obtained_from.items():\n for perm in perms:\n perms_descending_tree.setdefault(from_resource, {})\\\n .setdefault(perm, {})\\\n .setdefault(on_resource, set())\\\n .add(obtained_perm)\n\n # Obtain current principals.\n principals = self.request.effective_principals\n if Authenticated in principals:\n # Since this view does not require any permission (can be used to\n # obtain public users permissions), we have to add the prefixed\n # userid among the principals\n # (see :mod:`kinto.core.authentication`)\n userid = self.request.prefixed_userid\n principals.append(userid)\n\n # Query every possible permission of the current user from backend.\n backend = self.request.registry.permission\n perms_by_object_uri = backend.get_accessible_objects(principals)\n\n entries = []\n for object_uri, perms in perms_by_object_uri.items():\n try:\n # Obtain associated resource from object URI\n resource_name, matchdict = core_utils.view_lookup(self.request,\n object_uri)\n except ValueError:\n # Skip permissions entries that are not linked to an object URI\n continue\n\n # For consistency with event payloads, prefix id with resource name\n matchdict[resource_name + '_id'] = matchdict.get('id')\n\n # Expand implicit permissions using descending tree.\n permissions = set(perms)\n for perm in perms:\n obtained = perms_descending_tree[resource_name][perm]\n # Related to same resource only and not every sub-objects.\n # (e.g \"bucket:write\" gives \"bucket:read\" but not \"group:read\")\n permissions |= obtained[resource_name]\n\n entry = dict(uri=object_uri,\n resource_name=resource_name,\n permissions=list(permissions),\n **matchdict)\n entries.append(entry)\n\n return extract_record_set(entries, filters=filters, sorting=sorting,\n pagination_rules=pagination_rules,\n limit=limit)\n\n\nclass PermissionsSchema(resource.ResourceSchema):\n uri = colander.SchemaNode(colander.String())\n resource_name = colander.SchemaNode(colander.String())\n permissions = colander.Sequence(colander.SchemaNode(colander.String()))\n bucket_id = colander.SchemaNode(colander.String())\n collection_id = colander.SchemaNode(colander.String(),\n missing=colander.drop)\n group_id = colander.SchemaNode(colander.String(),\n missing=colander.drop)\n record_id = colander.SchemaNode(colander.String(),\n missing=colander.drop)\n\n class Options:\n preserve_unknown = False\n\n\[email protected](name='permissions',\n description='List of user permissions',\n collection_path='/permissions',\n record_path=None,\n collection_methods=('GET',),\n permission=NO_PERMISSION_REQUIRED)\nclass Permissions(resource.ShareableResource):\n\n schema = PermissionsSchema\n\n def __init__(self, request, context=None):\n super(Permissions, self).__init__(request, context)\n self.model = PermissionsModel(request)\n\n def _extract_sorting(self, limit):\n # Permissions entries are not stored with timestamp, so do not\n # force it.\n result = super(Permissions, self)._extract_sorting(limit)\n without_last_modified = [s for s in result\n if s.field != self.model.modified_field]\n return without_last_modified\n\n def _extract_filters(self, queryparams=None):\n result = super(Permissions, self)._extract_filters(queryparams)\n without_last_modified = [s for s in result\n if s.field != self.model.modified_field]\n return without_last_modified\n", "path": "kinto/views/permissions.py"}]} | 1,816 | 855 |
gh_patches_debug_8452 | rasdani/github-patches | git_diff | alltheplaces__alltheplaces-8361 | 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/lane_bryant_us.py]
1 from locations.storefinders.yext import YextSpider
2
3
4 class LaneBryantUSSpider(YextSpider):
5 name = "lane_bryant_us"
6 item_attributes = {"brand": "Lane Bryant", "brand_wikidata": "Q6485350"}
7 api_key = "ccfe136898dfe236489c4f9fb0b91ded"
8 api_version = "20220511"
9
[end of locations/spiders/lane_bryant_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/lane_bryant_us.py b/locations/spiders/lane_bryant_us.py
--- a/locations/spiders/lane_bryant_us.py
+++ b/locations/spiders/lane_bryant_us.py
@@ -1,8 +1,9 @@
-from locations.storefinders.yext import YextSpider
+from locations.categories import Categories
+from locations.storefinders.yext_answers import YextAnswersSpider
-class LaneBryantUSSpider(YextSpider):
+class LaneBryantUSSpider(YextAnswersSpider):
name = "lane_bryant_us"
- item_attributes = {"brand": "Lane Bryant", "brand_wikidata": "Q6485350"}
+ item_attributes = {"brand": "Lane Bryant", "brand_wikidata": "Q6485350", "extras": Categories.SHOP_CLOTHES.value}
api_key = "ccfe136898dfe236489c4f9fb0b91ded"
- api_version = "20220511"
+ experience_key = "lane-bryant-locator"
| {"golden_diff": "diff --git a/locations/spiders/lane_bryant_us.py b/locations/spiders/lane_bryant_us.py\n--- a/locations/spiders/lane_bryant_us.py\n+++ b/locations/spiders/lane_bryant_us.py\n@@ -1,8 +1,9 @@\n-from locations.storefinders.yext import YextSpider\n+from locations.categories import Categories\n+from locations.storefinders.yext_answers import YextAnswersSpider\n \n \n-class LaneBryantUSSpider(YextSpider):\n+class LaneBryantUSSpider(YextAnswersSpider):\n name = \"lane_bryant_us\"\n- item_attributes = {\"brand\": \"Lane Bryant\", \"brand_wikidata\": \"Q6485350\"}\n+ item_attributes = {\"brand\": \"Lane Bryant\", \"brand_wikidata\": \"Q6485350\", \"extras\": Categories.SHOP_CLOTHES.value}\n api_key = \"ccfe136898dfe236489c4f9fb0b91ded\"\n- api_version = \"20220511\"\n+ experience_key = \"lane-bryant-locator\"\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.storefinders.yext import YextSpider\n\n\nclass LaneBryantUSSpider(YextSpider):\n name = \"lane_bryant_us\"\n item_attributes = {\"brand\": \"Lane Bryant\", \"brand_wikidata\": \"Q6485350\"}\n api_key = \"ccfe136898dfe236489c4f9fb0b91ded\"\n api_version = \"20220511\"\n", "path": "locations/spiders/lane_bryant_us.py"}]} | 805 | 267 |
gh_patches_debug_20602 | rasdani/github-patches | git_diff | searxng__searxng-2914 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Time duration for piped videos
<!-- PLEASE FILL THESE FIELDS, IT REALLY HELPS THE MAINTAINERS OF SearXNG -->
**Is your feature request related to a problem? Please describe.**
Like piped music feature, it il possible to add time video duration please ?
**Additional context**
With music whe can see Length :
With video we can not see Length :
Could you add this feature please ?
Thanks :)
</issue>
<code>
[start of searx/engines/piped.py]
1 # SPDX-License-Identifier: AGPL-3.0-or-later
2 # lint: pylint
3 """An alternative privacy-friendly YouTube frontend which is efficient by
4 design. `Piped’s architecture`_ consists of 3 components:
5
6 - :py:obj:`backend <backend_url>`
7 - :py:obj:`frontend <frontend_url>`
8 - proxy
9
10 .. _Piped’s architecture: https://docs.piped.video/docs/architecture/
11
12 Configuration
13 =============
14
15 The :py:obj:`backend_url` and :py:obj:`frontend_url` has to be set in the engine
16 named `piped` and are used by all piped engines
17
18 .. code:: yaml
19
20 - name: piped
21 engine: piped
22 piped_filter: videos
23 ...
24 frontend_url: https://..
25 backend_url:
26 - https://..
27 - https://..
28
29 - name: piped.music
30 engine: piped
31 network: piped
32 shortcut: ppdm
33 piped_filter: music_songs
34 ...
35
36 Known Quirks
37 ============
38
39 The implementation to support :py:obj:`paging <searx.enginelib.Engine.paging>`
40 is based on the *nextpage* method of Piped's REST API / the :py:obj:`frontend
41 API <frontend_url>`. This feature is *next page driven* and plays well with the
42 :ref:`infinite_scroll <settings ui>` setting in SearXNG but it does not really
43 fit into SearXNG's UI to select a page by number.
44
45 Implementations
46 ===============
47 """
48
49 from __future__ import annotations
50
51 import time
52 import random
53 from urllib.parse import urlencode
54 import datetime
55 from dateutil import parser
56
57 # about
58 about = {
59 "website": 'https://github.com/TeamPiped/Piped/',
60 "wikidata_id": 'Q107565255',
61 "official_api_documentation": 'https://docs.piped.video/docs/api-documentation/',
62 "use_official_api": True,
63 "require_api_key": False,
64 "results": 'JSON',
65 }
66
67 # engine dependent config
68 categories = []
69 paging = True
70
71 # search-url
72 backend_url: list | str = "https://pipedapi.kavin.rocks"
73 """Piped-Backend_: The core component behind Piped. The value is an URL or a
74 list of URLs. In the latter case instance will be selected randomly. For a
75 complete list of official instances see Piped-Instances (`JSON
76 <https://piped-instances.kavin.rocks/>`__)
77
78 .. _Piped-Instances: https://github.com/TeamPiped/Piped/wiki/Instances
79 .. _Piped-Backend: https://github.com/TeamPiped/Piped-Backend
80
81 """
82
83 frontend_url: str = "https://piped.video"
84 """Piped-Frontend_: URL to use as link and for embeds.
85
86 .. _Piped-Frontend: https://github.com/TeamPiped/Piped
87 """
88
89 piped_filter = 'all'
90 """Content filter ``music_songs`` or ``videos``"""
91
92
93 def _backend_url() -> str:
94 from searx.engines import engines # pylint: disable=import-outside-toplevel
95
96 url = engines['piped'].backend_url # type: ignore
97 if isinstance(url, list):
98 url = random.choice(url)
99 return url
100
101
102 def _frontend_url() -> str:
103 from searx.engines import engines # pylint: disable=import-outside-toplevel
104
105 return engines['piped'].frontend_url # type: ignore
106
107
108 def request(query, params):
109
110 args = {
111 'q': query,
112 'filter': piped_filter,
113 }
114
115 path = "/search"
116 if params['pageno'] > 1:
117 # don't use nextpage when user selected to jump back to page 1
118 nextpage = params['engine_data'].get('nextpage')
119 if nextpage:
120 path = "/nextpage/search"
121 args['nextpage'] = nextpage
122
123 params["url"] = _backend_url() + f"{path}?" + urlencode(args)
124 return params
125
126
127 def response(resp):
128 results = []
129
130 json = resp.json()
131
132 for result in json["items"]:
133 # note: piped returns -1 for all upload times when filtering for music
134 uploaded = result.get("uploaded", -1)
135
136 item = {
137 # the api url differs from the frontend, hence use piped.video as default
138 "url": _frontend_url() + result.get("url", ""),
139 "title": result.get("title", ""),
140 "publishedDate": parser.parse(time.ctime(uploaded / 1000)) if uploaded != -1 else None,
141 "iframe_src": _frontend_url() + '/embed' + result.get("url", ""),
142 }
143
144 if piped_filter == 'videos':
145 item["template"] = "videos.html"
146 # if the value of shortDescription set, but is None, return empty string
147 item["content"] = result.get("shortDescription", "") or ""
148 item["thumbnail"] = result.get("thumbnail", "")
149
150 elif piped_filter == 'music_songs':
151 item["template"] = "default.html"
152 item["img_src"] = result.get("thumbnail", "")
153 item["content"] = result.get("uploaderName", "") or ""
154 length = result.get("duration")
155 if length:
156 item["length"] = datetime.timedelta(seconds=length)
157
158 results.append(item)
159
160 results.append(
161 {
162 "engine_data": json["nextpage"],
163 "key": "nextpage",
164 }
165 )
166 return results
167
[end of searx/engines/piped.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/searx/engines/piped.py b/searx/engines/piped.py
--- a/searx/engines/piped.py
+++ b/searx/engines/piped.py
@@ -140,6 +140,9 @@
"publishedDate": parser.parse(time.ctime(uploaded / 1000)) if uploaded != -1 else None,
"iframe_src": _frontend_url() + '/embed' + result.get("url", ""),
}
+ length = result.get("duration")
+ if length:
+ item["length"] = datetime.timedelta(seconds=length)
if piped_filter == 'videos':
item["template"] = "videos.html"
@@ -151,9 +154,6 @@
item["template"] = "default.html"
item["img_src"] = result.get("thumbnail", "")
item["content"] = result.get("uploaderName", "") or ""
- length = result.get("duration")
- if length:
- item["length"] = datetime.timedelta(seconds=length)
results.append(item)
| {"golden_diff": "diff --git a/searx/engines/piped.py b/searx/engines/piped.py\n--- a/searx/engines/piped.py\n+++ b/searx/engines/piped.py\n@@ -140,6 +140,9 @@\n \"publishedDate\": parser.parse(time.ctime(uploaded / 1000)) if uploaded != -1 else None,\n \"iframe_src\": _frontend_url() + '/embed' + result.get(\"url\", \"\"),\n }\n+ length = result.get(\"duration\")\n+ if length:\n+ item[\"length\"] = datetime.timedelta(seconds=length)\n \n if piped_filter == 'videos':\n item[\"template\"] = \"videos.html\"\n@@ -151,9 +154,6 @@\n item[\"template\"] = \"default.html\"\n item[\"img_src\"] = result.get(\"thumbnail\", \"\")\n item[\"content\"] = result.get(\"uploaderName\", \"\") or \"\"\n- length = result.get(\"duration\")\n- if length:\n- item[\"length\"] = datetime.timedelta(seconds=length)\n \n results.append(item)\n", "issue": "Time duration for piped videos\n<!-- PLEASE FILL THESE FIELDS, IT REALLY HELPS THE MAINTAINERS OF SearXNG -->\r\n\r\n**Is your feature request related to a problem? Please describe.**\r\nLike piped music feature, it il possible to add time video duration please ?\r\n\r\n**Additional context**\r\nWith music whe can see Length : \r\n\r\n\r\nWith video we can not see Length : \r\n\r\n\r\nCould you add this feature please ?\r\nThanks :)\r\n\n", "before_files": [{"content": "# SPDX-License-Identifier: AGPL-3.0-or-later\n# lint: pylint\n\"\"\"An alternative privacy-friendly YouTube frontend which is efficient by\ndesign. `Piped\u2019s architecture`_ consists of 3 components:\n\n- :py:obj:`backend <backend_url>`\n- :py:obj:`frontend <frontend_url>`\n- proxy\n\n.. _Piped\u2019s architecture: https://docs.piped.video/docs/architecture/\n\nConfiguration\n=============\n\nThe :py:obj:`backend_url` and :py:obj:`frontend_url` has to be set in the engine\nnamed `piped` and are used by all piped engines\n\n.. code:: yaml\n\n - name: piped\n engine: piped\n piped_filter: videos\n ...\n frontend_url: https://..\n backend_url:\n - https://..\n - https://..\n\n - name: piped.music\n engine: piped\n network: piped\n shortcut: ppdm\n piped_filter: music_songs\n ...\n\nKnown Quirks\n============\n\nThe implementation to support :py:obj:`paging <searx.enginelib.Engine.paging>`\nis based on the *nextpage* method of Piped's REST API / the :py:obj:`frontend\nAPI <frontend_url>`. This feature is *next page driven* and plays well with the\n:ref:`infinite_scroll <settings ui>` setting in SearXNG but it does not really\nfit into SearXNG's UI to select a page by number.\n\nImplementations\n===============\n\"\"\"\n\nfrom __future__ import annotations\n\nimport time\nimport random\nfrom urllib.parse import urlencode\nimport datetime\nfrom dateutil import parser\n\n# about\nabout = {\n \"website\": 'https://github.com/TeamPiped/Piped/',\n \"wikidata_id\": 'Q107565255',\n \"official_api_documentation\": 'https://docs.piped.video/docs/api-documentation/',\n \"use_official_api\": True,\n \"require_api_key\": False,\n \"results\": 'JSON',\n}\n\n# engine dependent config\ncategories = []\npaging = True\n\n# search-url\nbackend_url: list | str = \"https://pipedapi.kavin.rocks\"\n\"\"\"Piped-Backend_: The core component behind Piped. The value is an URL or a\nlist of URLs. In the latter case instance will be selected randomly. For a\ncomplete list of official instances see Piped-Instances (`JSON\n<https://piped-instances.kavin.rocks/>`__)\n\n.. _Piped-Instances: https://github.com/TeamPiped/Piped/wiki/Instances\n.. _Piped-Backend: https://github.com/TeamPiped/Piped-Backend\n\n\"\"\"\n\nfrontend_url: str = \"https://piped.video\"\n\"\"\"Piped-Frontend_: URL to use as link and for embeds.\n\n.. _Piped-Frontend: https://github.com/TeamPiped/Piped\n\"\"\"\n\npiped_filter = 'all'\n\"\"\"Content filter ``music_songs`` or ``videos``\"\"\"\n\n\ndef _backend_url() -> str:\n from searx.engines import engines # pylint: disable=import-outside-toplevel\n\n url = engines['piped'].backend_url # type: ignore\n if isinstance(url, list):\n url = random.choice(url)\n return url\n\n\ndef _frontend_url() -> str:\n from searx.engines import engines # pylint: disable=import-outside-toplevel\n\n return engines['piped'].frontend_url # type: ignore\n\n\ndef request(query, params):\n\n args = {\n 'q': query,\n 'filter': piped_filter,\n }\n\n path = \"/search\"\n if params['pageno'] > 1:\n # don't use nextpage when user selected to jump back to page 1\n nextpage = params['engine_data'].get('nextpage')\n if nextpage:\n path = \"/nextpage/search\"\n args['nextpage'] = nextpage\n\n params[\"url\"] = _backend_url() + f\"{path}?\" + urlencode(args)\n return params\n\n\ndef response(resp):\n results = []\n\n json = resp.json()\n\n for result in json[\"items\"]:\n # note: piped returns -1 for all upload times when filtering for music\n uploaded = result.get(\"uploaded\", -1)\n\n item = {\n # the api url differs from the frontend, hence use piped.video as default\n \"url\": _frontend_url() + result.get(\"url\", \"\"),\n \"title\": result.get(\"title\", \"\"),\n \"publishedDate\": parser.parse(time.ctime(uploaded / 1000)) if uploaded != -1 else None,\n \"iframe_src\": _frontend_url() + '/embed' + result.get(\"url\", \"\"),\n }\n\n if piped_filter == 'videos':\n item[\"template\"] = \"videos.html\"\n # if the value of shortDescription set, but is None, return empty string\n item[\"content\"] = result.get(\"shortDescription\", \"\") or \"\"\n item[\"thumbnail\"] = result.get(\"thumbnail\", \"\")\n\n elif piped_filter == 'music_songs':\n item[\"template\"] = \"default.html\"\n item[\"img_src\"] = result.get(\"thumbnail\", \"\")\n item[\"content\"] = result.get(\"uploaderName\", \"\") or \"\"\n length = result.get(\"duration\")\n if length:\n item[\"length\"] = datetime.timedelta(seconds=length)\n\n results.append(item)\n\n results.append(\n {\n \"engine_data\": json[\"nextpage\"],\n \"key\": \"nextpage\",\n }\n )\n return results\n", "path": "searx/engines/piped.py"}]} | 2,396 | 241 |
gh_patches_debug_39090 | rasdani/github-patches | git_diff | conan-io__conan-4158 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Store verify-ssl option in conan.conf after conan config install
Only the custom user args are stored in conan.conf, and it would make sense to store the verify-ssl argument too, to make ``conan config install`` complete.
cc/ @danimtb
</issue>
<code>
[start of conans/client/conf/config_installer.py]
1 import os
2 import shutil
3
4 from six.moves.urllib.parse import urlparse
5
6 from conans import load
7 from conans.client import tools
8 from conans.client.remote_registry import load_registry_txt
9 from conans.client.tools import Git
10 from conans.client.tools.files import unzip
11 from conans.errors import ConanException
12 from conans.util.files import mkdir, rmdir, walk
13
14
15 def _hide_password(resource):
16 """
17 Hide password from url/file path
18
19 :param resource: string with url or file path
20 :return: resource with hidden password if present
21 """
22 password = urlparse(resource).password
23 return resource.replace(password, "<hidden>") if password else resource
24
25
26 def _handle_remotes(client_cache, remote_file):
27 # FIXME: Should we encourage to pass the remotes in json?
28 remotes, _ = load_registry_txt(load(remote_file))
29 registry = client_cache.registry
30 registry.remotes.define(remotes)
31
32
33 def _handle_profiles(source_folder, target_folder, output):
34 mkdir(target_folder)
35 for root, _, files in walk(source_folder):
36 relative_path = os.path.relpath(root, source_folder)
37 if relative_path == ".":
38 relative_path = ""
39 for f in files:
40 profile = os.path.join(relative_path, f)
41 output.info(" - %s" % profile)
42 shutil.copy(os.path.join(root, f), os.path.join(target_folder, profile))
43
44
45 def _process_git_repo(repo_url, client_cache, output, tmp_folder, verify_ssl, args=None):
46 output.info("Trying to clone repo: %s" % repo_url)
47
48 with tools.chdir(tmp_folder):
49 try:
50 args = args or ""
51 git = Git(verify_ssl=verify_ssl, output=output)
52 git.clone(repo_url, args=args)
53 output.info("Repo cloned!")
54 except Exception as e:
55 raise ConanException("Can't clone repo: %s" % str(e))
56 _process_folder(tmp_folder, client_cache, output)
57
58
59 def _process_zip_file(zippath, client_cache, output, tmp_folder, remove=False):
60 unzip(zippath, tmp_folder, output=output)
61 if remove:
62 os.unlink(zippath)
63 _process_folder(tmp_folder, client_cache, output)
64
65
66 def _handle_conan_conf(current_conan_conf, new_conan_conf_path):
67 current_conan_conf.read(new_conan_conf_path)
68 with open(current_conan_conf.filename, "w") as f:
69 current_conan_conf.write(f)
70
71
72 def _process_folder(folder, client_cache, output):
73 for root, dirs, files in walk(folder):
74 for f in files:
75 if f == "settings.yml":
76 output.info("Installing settings.yml")
77 settings_path = client_cache.settings_path
78 shutil.copy(os.path.join(root, f), settings_path)
79 elif f == "conan.conf":
80 output.info("Processing conan.conf")
81 conan_conf = client_cache.conan_config
82 _handle_conan_conf(conan_conf, os.path.join(root, f))
83 elif f == "remotes.txt":
84 output.info("Defining remotes from remotes.txt")
85 _handle_remotes(client_cache, os.path.join(root, f))
86 else:
87 relpath = os.path.relpath(root, folder)
88 target_folder = os.path.join(client_cache.conan_folder, relpath)
89 mkdir(target_folder)
90 output.info("Copying file %s to %s" % (f, target_folder))
91 shutil.copy(os.path.join(root, f), target_folder)
92 for d in dirs:
93 if d == "profiles":
94 output.info("Installing profiles:")
95 profiles_path = client_cache.profiles_path
96 _handle_profiles(os.path.join(root, d), profiles_path, output)
97 break
98 dirs[:] = [d for d in dirs if d not in ("profiles", ".git")]
99
100
101 def _process_download(item, client_cache, output, tmp_folder, verify_ssl, requester):
102 output.info("Trying to download %s" % _hide_password(item))
103 zippath = os.path.join(tmp_folder, "config.zip")
104 try:
105 tools.download(item, zippath, out=output, verify=verify_ssl, requester=requester)
106 _process_zip_file(zippath, client_cache, output, tmp_folder, remove=True)
107 except Exception as e:
108 raise ConanException("Error while installing config from %s\n%s" % (item, str(e)))
109
110
111 def configuration_install(path_or_url, client_cache, output, verify_ssl, requester,
112 config_type=None, args=None):
113 if path_or_url is None:
114 try:
115 item = client_cache.conan_config.get_item("general.config_install")
116 _config_type, path_or_url, _args = _process_config_install_item(item)
117 except ConanException:
118 raise ConanException("Called config install without arguments and "
119 "'general.config_install' not defined in conan.conf")
120 else:
121 _config_type, path_or_url, _args = _process_config_install_item(path_or_url)
122
123 config_type = config_type or _config_type
124 args = args or _args
125
126 if os.path.exists(path_or_url):
127 path_or_url = os.path.abspath(path_or_url)
128
129 tmp_folder = os.path.join(client_cache.conan_folder, "tmp_config_install")
130 # necessary for Mac OSX, where the temp folders in /var/ are symlinks to /private/var/
131 tmp_folder = os.path.realpath(tmp_folder)
132 mkdir(tmp_folder)
133 try:
134
135 if config_type == "git":
136 _process_git_repo(path_or_url, client_cache, output, tmp_folder, verify_ssl, args)
137 elif config_type == "dir":
138 args = None
139 _process_folder(path_or_url, client_cache, output)
140 elif config_type == "file":
141 args = None
142 _process_zip_file(path_or_url, client_cache, output, tmp_folder)
143 elif config_type == "url":
144 args = None
145 _process_download(path_or_url, client_cache, output, tmp_folder, verify_ssl,
146 requester=requester)
147 else:
148 raise ConanException("Unable to process config install: %s" % path_or_url)
149 finally:
150 if config_type is not None and path_or_url is not None:
151 value = "%s:[%s, %s]" % (config_type, path_or_url, args)
152 client_cache.conan_config.set_item("general.config_install", value)
153 rmdir(tmp_folder)
154
155
156 def _process_config_install_item(item):
157 """
158 Processes a config_install item and outputs a tuple with the configuration type, the path/url
159 and additional args
160
161 :param item: config_install item value from conan.conf with a simple path/url or a string
162 following this pattern: "<config_type>:[<path_or_url>, <args>]"
163 :return: configuration source type (git, url, dir or file), path to file/dir or git/http url and
164 additional arguments
165 """
166 config_type, path_or_url, args = None, None, None
167 if not item.startswith(("git:", "dir:", "url:", "file:")):
168 path_or_url = item
169 if path_or_url.endswith(".git"):
170 config_type = "git"
171 elif os.path.isdir(path_or_url):
172 config_type = "dir"
173 elif os.path.isfile(path_or_url):
174 config_type = "file"
175 elif path_or_url.startswith("http"):
176 config_type = "url"
177 else:
178 raise ConanException("Unable to process config install: %s" % path_or_url)
179 else:
180 config_type, rest = item.split(":", 1)
181 path_or_url, args = [item.strip() for item in rest[1:-1].rstrip().split(",", 1)]
182 args = None if "none" in args.lower() else args
183 return config_type, path_or_url, args
184
[end of conans/client/conf/config_installer.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/conans/client/conf/config_installer.py b/conans/client/conf/config_installer.py
--- a/conans/client/conf/config_installer.py
+++ b/conans/client/conf/config_installer.py
@@ -114,14 +114,15 @@
if path_or_url is None:
try:
item = client_cache.conan_config.get_item("general.config_install")
- _config_type, path_or_url, _args = _process_config_install_item(item)
+ _config_type, path_or_url, _verify_ssl, _args = _process_config_install_item(item)
except ConanException:
raise ConanException("Called config install without arguments and "
"'general.config_install' not defined in conan.conf")
else:
- _config_type, path_or_url, _args = _process_config_install_item(path_or_url)
+ _config_type, path_or_url, _verify_ssl, _args = _process_config_install_item(path_or_url)
config_type = config_type or _config_type
+ verify_ssl = verify_ssl or _verify_ssl
args = args or _args
if os.path.exists(path_or_url):
@@ -149,7 +150,7 @@
raise ConanException("Unable to process config install: %s" % path_or_url)
finally:
if config_type is not None and path_or_url is not None:
- value = "%s:[%s, %s]" % (config_type, path_or_url, args)
+ value = "%s, %s, %s, %s" % (config_type, path_or_url, verify_ssl, args)
client_cache.conan_config.set_item("general.config_install", value)
rmdir(tmp_folder)
@@ -164,8 +165,8 @@
:return: configuration source type (git, url, dir or file), path to file/dir or git/http url and
additional arguments
"""
- config_type, path_or_url, args = None, None, None
- if not item.startswith(("git:", "dir:", "url:", "file:")):
+ config_type, path_or_url, verify_ssl, args = None, None, None, None
+ if not item.startswith(("git,", "dir,", "url,", "file,")):
path_or_url = item
if path_or_url.endswith(".git"):
config_type = "git"
@@ -178,7 +179,7 @@
else:
raise ConanException("Unable to process config install: %s" % path_or_url)
else:
- config_type, rest = item.split(":", 1)
- path_or_url, args = [item.strip() for item in rest[1:-1].rstrip().split(",", 1)]
+ config_type, path_or_url, verify_ssl, args = [r.strip() for r in item.split(",")]
+ verify_ssl = "true" in verify_ssl.lower()
args = None if "none" in args.lower() else args
- return config_type, path_or_url, args
+ return config_type, path_or_url, verify_ssl, args
| {"golden_diff": "diff --git a/conans/client/conf/config_installer.py b/conans/client/conf/config_installer.py\n--- a/conans/client/conf/config_installer.py\n+++ b/conans/client/conf/config_installer.py\n@@ -114,14 +114,15 @@\n if path_or_url is None:\n try:\n item = client_cache.conan_config.get_item(\"general.config_install\")\n- _config_type, path_or_url, _args = _process_config_install_item(item)\n+ _config_type, path_or_url, _verify_ssl, _args = _process_config_install_item(item)\n except ConanException:\n raise ConanException(\"Called config install without arguments and \"\n \"'general.config_install' not defined in conan.conf\")\n else:\n- _config_type, path_or_url, _args = _process_config_install_item(path_or_url)\n+ _config_type, path_or_url, _verify_ssl, _args = _process_config_install_item(path_or_url)\n \n config_type = config_type or _config_type\n+ verify_ssl = verify_ssl or _verify_ssl\n args = args or _args\n \n if os.path.exists(path_or_url):\n@@ -149,7 +150,7 @@\n raise ConanException(\"Unable to process config install: %s\" % path_or_url)\n finally:\n if config_type is not None and path_or_url is not None:\n- value = \"%s:[%s, %s]\" % (config_type, path_or_url, args)\n+ value = \"%s, %s, %s, %s\" % (config_type, path_or_url, verify_ssl, args)\n client_cache.conan_config.set_item(\"general.config_install\", value)\n rmdir(tmp_folder)\n \n@@ -164,8 +165,8 @@\n :return: configuration source type (git, url, dir or file), path to file/dir or git/http url and\n additional arguments\n \"\"\"\n- config_type, path_or_url, args = None, None, None\n- if not item.startswith((\"git:\", \"dir:\", \"url:\", \"file:\")):\n+ config_type, path_or_url, verify_ssl, args = None, None, None, None\n+ if not item.startswith((\"git,\", \"dir,\", \"url,\", \"file,\")):\n path_or_url = item\n if path_or_url.endswith(\".git\"):\n config_type = \"git\"\n@@ -178,7 +179,7 @@\n else:\n raise ConanException(\"Unable to process config install: %s\" % path_or_url)\n else:\n- config_type, rest = item.split(\":\", 1)\n- path_or_url, args = [item.strip() for item in rest[1:-1].rstrip().split(\",\", 1)]\n+ config_type, path_or_url, verify_ssl, args = [r.strip() for r in item.split(\",\")]\n+ verify_ssl = \"true\" in verify_ssl.lower()\n args = None if \"none\" in args.lower() else args\n- return config_type, path_or_url, args\n+ return config_type, path_or_url, verify_ssl, args\n", "issue": "Store verify-ssl option in conan.conf after conan config install\nOnly the custom user args are stored in conan.conf, and it would make sense to store the verify-ssl argument too, to make ``conan config install`` complete.\r\n\r\ncc/ @danimtb \n", "before_files": [{"content": "import os\nimport shutil\n\nfrom six.moves.urllib.parse import urlparse\n\nfrom conans import load\nfrom conans.client import tools\nfrom conans.client.remote_registry import load_registry_txt\nfrom conans.client.tools import Git\nfrom conans.client.tools.files import unzip\nfrom conans.errors import ConanException\nfrom conans.util.files import mkdir, rmdir, walk\n\n\ndef _hide_password(resource):\n \"\"\"\n Hide password from url/file path\n\n :param resource: string with url or file path\n :return: resource with hidden password if present\n \"\"\"\n password = urlparse(resource).password\n return resource.replace(password, \"<hidden>\") if password else resource\n\n\ndef _handle_remotes(client_cache, remote_file):\n # FIXME: Should we encourage to pass the remotes in json?\n remotes, _ = load_registry_txt(load(remote_file))\n registry = client_cache.registry\n registry.remotes.define(remotes)\n\n\ndef _handle_profiles(source_folder, target_folder, output):\n mkdir(target_folder)\n for root, _, files in walk(source_folder):\n relative_path = os.path.relpath(root, source_folder)\n if relative_path == \".\":\n relative_path = \"\"\n for f in files:\n profile = os.path.join(relative_path, f)\n output.info(\" - %s\" % profile)\n shutil.copy(os.path.join(root, f), os.path.join(target_folder, profile))\n\n\ndef _process_git_repo(repo_url, client_cache, output, tmp_folder, verify_ssl, args=None):\n output.info(\"Trying to clone repo: %s\" % repo_url)\n\n with tools.chdir(tmp_folder):\n try:\n args = args or \"\"\n git = Git(verify_ssl=verify_ssl, output=output)\n git.clone(repo_url, args=args)\n output.info(\"Repo cloned!\")\n except Exception as e:\n raise ConanException(\"Can't clone repo: %s\" % str(e))\n _process_folder(tmp_folder, client_cache, output)\n\n\ndef _process_zip_file(zippath, client_cache, output, tmp_folder, remove=False):\n unzip(zippath, tmp_folder, output=output)\n if remove:\n os.unlink(zippath)\n _process_folder(tmp_folder, client_cache, output)\n\n\ndef _handle_conan_conf(current_conan_conf, new_conan_conf_path):\n current_conan_conf.read(new_conan_conf_path)\n with open(current_conan_conf.filename, \"w\") as f:\n current_conan_conf.write(f)\n\n\ndef _process_folder(folder, client_cache, output):\n for root, dirs, files in walk(folder):\n for f in files:\n if f == \"settings.yml\":\n output.info(\"Installing settings.yml\")\n settings_path = client_cache.settings_path\n shutil.copy(os.path.join(root, f), settings_path)\n elif f == \"conan.conf\":\n output.info(\"Processing conan.conf\")\n conan_conf = client_cache.conan_config\n _handle_conan_conf(conan_conf, os.path.join(root, f))\n elif f == \"remotes.txt\":\n output.info(\"Defining remotes from remotes.txt\")\n _handle_remotes(client_cache, os.path.join(root, f))\n else:\n relpath = os.path.relpath(root, folder)\n target_folder = os.path.join(client_cache.conan_folder, relpath)\n mkdir(target_folder)\n output.info(\"Copying file %s to %s\" % (f, target_folder))\n shutil.copy(os.path.join(root, f), target_folder)\n for d in dirs:\n if d == \"profiles\":\n output.info(\"Installing profiles:\")\n profiles_path = client_cache.profiles_path\n _handle_profiles(os.path.join(root, d), profiles_path, output)\n break\n dirs[:] = [d for d in dirs if d not in (\"profiles\", \".git\")]\n\n\ndef _process_download(item, client_cache, output, tmp_folder, verify_ssl, requester):\n output.info(\"Trying to download %s\" % _hide_password(item))\n zippath = os.path.join(tmp_folder, \"config.zip\")\n try:\n tools.download(item, zippath, out=output, verify=verify_ssl, requester=requester)\n _process_zip_file(zippath, client_cache, output, tmp_folder, remove=True)\n except Exception as e:\n raise ConanException(\"Error while installing config from %s\\n%s\" % (item, str(e)))\n\n\ndef configuration_install(path_or_url, client_cache, output, verify_ssl, requester,\n config_type=None, args=None):\n if path_or_url is None:\n try:\n item = client_cache.conan_config.get_item(\"general.config_install\")\n _config_type, path_or_url, _args = _process_config_install_item(item)\n except ConanException:\n raise ConanException(\"Called config install without arguments and \"\n \"'general.config_install' not defined in conan.conf\")\n else:\n _config_type, path_or_url, _args = _process_config_install_item(path_or_url)\n\n config_type = config_type or _config_type\n args = args or _args\n\n if os.path.exists(path_or_url):\n path_or_url = os.path.abspath(path_or_url)\n\n tmp_folder = os.path.join(client_cache.conan_folder, \"tmp_config_install\")\n # necessary for Mac OSX, where the temp folders in /var/ are symlinks to /private/var/\n tmp_folder = os.path.realpath(tmp_folder)\n mkdir(tmp_folder)\n try:\n\n if config_type == \"git\":\n _process_git_repo(path_or_url, client_cache, output, tmp_folder, verify_ssl, args)\n elif config_type == \"dir\":\n args = None\n _process_folder(path_or_url, client_cache, output)\n elif config_type == \"file\":\n args = None\n _process_zip_file(path_or_url, client_cache, output, tmp_folder)\n elif config_type == \"url\":\n args = None\n _process_download(path_or_url, client_cache, output, tmp_folder, verify_ssl,\n requester=requester)\n else:\n raise ConanException(\"Unable to process config install: %s\" % path_or_url)\n finally:\n if config_type is not None and path_or_url is not None:\n value = \"%s:[%s, %s]\" % (config_type, path_or_url, args)\n client_cache.conan_config.set_item(\"general.config_install\", value)\n rmdir(tmp_folder)\n\n\ndef _process_config_install_item(item):\n \"\"\"\n Processes a config_install item and outputs a tuple with the configuration type, the path/url\n and additional args\n\n :param item: config_install item value from conan.conf with a simple path/url or a string\n following this pattern: \"<config_type>:[<path_or_url>, <args>]\"\n :return: configuration source type (git, url, dir or file), path to file/dir or git/http url and\n additional arguments\n \"\"\"\n config_type, path_or_url, args = None, None, None\n if not item.startswith((\"git:\", \"dir:\", \"url:\", \"file:\")):\n path_or_url = item\n if path_or_url.endswith(\".git\"):\n config_type = \"git\"\n elif os.path.isdir(path_or_url):\n config_type = \"dir\"\n elif os.path.isfile(path_or_url):\n config_type = \"file\"\n elif path_or_url.startswith(\"http\"):\n config_type = \"url\"\n else:\n raise ConanException(\"Unable to process config install: %s\" % path_or_url)\n else:\n config_type, rest = item.split(\":\", 1)\n path_or_url, args = [item.strip() for item in rest[1:-1].rstrip().split(\",\", 1)]\n args = None if \"none\" in args.lower() else args\n return config_type, path_or_url, args\n", "path": "conans/client/conf/config_installer.py"}]} | 2,731 | 687 |
gh_patches_debug_24496 | rasdani/github-patches | git_diff | optuna__optuna-3443 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Improve multi-objective optimization tutorial regarding `Study.best_trials`
### What is an issue?
## Background
https://github.com/optuna/optuna/issues/3397 added a note about `study.best_trials` to the [reuse the best trial tutorial](https://optuna.readthedocs.io/en/latest/tutorial/20_recipes/010_reuse_best_trial.html). During the discussion, we found that the [multi-objective optimization tutorial](https://optuna.readthedocs.io/en/latest/tutorial/20_recipes/002_multi_objective.html) does not fetch the trials on the Pareto front (i.e., `Study.best_trials`) while it visualize the Pareto front.
## Description
I think readers can understand how to use the trials on Pareto front more easily if we mention `Study.best_trials` in the tutorial page. We may have some possible scenarios. For example,
1. Show the Pareto front as can be seen in the current tutorial
2. Explain how to get the trials on the Pareto front by using `Study.best_trials`
3. Demonstrate how to get the desired trial from the Pareto front i.e., the trial whose accuracy is highest, and show the parameter values (or objective values)
</issue>
<code>
[start of tutorial/20_recipes/002_multi_objective.py]
1 """
2 .. _multi_objective:
3
4 Multi-objective Optimization with Optuna
5 ========================================
6
7 This tutorial showcases Optuna's multi-objective optimization feature by
8 optimizing the validation accuracy of Fashion MNIST dataset and the FLOPS of the model implemented in PyTorch.
9
10 We use `thop <https://github.com/Lyken17/pytorch-OpCounter>`_ to measure FLOPS.
11 """
12
13 import thop
14 import torch
15 import torch.nn as nn
16 import torch.nn.functional as F
17 import torchvision
18
19 import optuna
20
21
22 DEVICE = torch.device("cuda") if torch.cuda.is_available() else torch.device("cpu")
23 DIR = ".."
24 BATCHSIZE = 128
25 N_TRAIN_EXAMPLES = BATCHSIZE * 30
26 N_VALID_EXAMPLES = BATCHSIZE * 10
27
28
29 def define_model(trial):
30 n_layers = trial.suggest_int("n_layers", 1, 3)
31 layers = []
32
33 in_features = 28 * 28
34 for i in range(n_layers):
35 out_features = trial.suggest_int("n_units_l{}".format(i), 4, 128)
36 layers.append(nn.Linear(in_features, out_features))
37 layers.append(nn.ReLU())
38 p = trial.suggest_float("dropout_{}".format(i), 0.2, 0.5)
39 layers.append(nn.Dropout(p))
40
41 in_features = out_features
42
43 layers.append(nn.Linear(in_features, 10))
44 layers.append(nn.LogSoftmax(dim=1))
45
46 return nn.Sequential(*layers)
47
48
49 # Defines training and evaluation.
50 def train_model(model, optimizer, train_loader):
51 model.train()
52 for batch_idx, (data, target) in enumerate(train_loader):
53 data, target = data.view(-1, 28 * 28).to(DEVICE), target.to(DEVICE)
54 optimizer.zero_grad()
55 F.nll_loss(model(data), target).backward()
56 optimizer.step()
57
58
59 def eval_model(model, valid_loader):
60 model.eval()
61 correct = 0
62 with torch.no_grad():
63 for batch_idx, (data, target) in enumerate(valid_loader):
64 data, target = data.view(-1, 28 * 28).to(DEVICE), target.to(DEVICE)
65 pred = model(data).argmax(dim=1, keepdim=True)
66 correct += pred.eq(target.view_as(pred)).sum().item()
67
68 accuracy = correct / N_VALID_EXAMPLES
69
70 flops, _ = thop.profile(model, inputs=(torch.randn(1, 28 * 28).to(DEVICE),), verbose=False)
71 return flops, accuracy
72
73
74 ###################################################################################################
75 # Define multi-objective objective function.
76 # Objectives are FLOPS and accuracy.
77 def objective(trial):
78 train_dataset = torchvision.datasets.FashionMNIST(
79 DIR, train=True, download=True, transform=torchvision.transforms.ToTensor()
80 )
81 train_loader = torch.utils.data.DataLoader(
82 torch.utils.data.Subset(train_dataset, list(range(N_TRAIN_EXAMPLES))),
83 batch_size=BATCHSIZE,
84 shuffle=True,
85 )
86
87 val_dataset = torchvision.datasets.FashionMNIST(
88 DIR, train=False, transform=torchvision.transforms.ToTensor()
89 )
90 val_loader = torch.utils.data.DataLoader(
91 torch.utils.data.Subset(val_dataset, list(range(N_VALID_EXAMPLES))),
92 batch_size=BATCHSIZE,
93 shuffle=True,
94 )
95 model = define_model(trial).to(DEVICE)
96
97 optimizer = torch.optim.Adam(
98 model.parameters(), trial.suggest_float("lr", 1e-5, 1e-1, log=True)
99 )
100
101 for epoch in range(10):
102 train_model(model, optimizer, train_loader)
103 flops, accuracy = eval_model(model, val_loader)
104 return flops, accuracy
105
106
107 ###################################################################################################
108 # Run multi-objective optimization
109 # --------------------------------
110 #
111 # If your optimization problem is multi-objective,
112 # Optuna assumes that you will specify the optimization direction for each objective.
113 # Specifically, in this example, we want to minimize the FLOPS (we want a faster model)
114 # and maximize the accuracy. So we set ``directions`` to ``["minimize", "maximize"]``.
115 study = optuna.create_study(directions=["minimize", "maximize"])
116 study.optimize(objective, n_trials=30, timeout=300)
117
118 print("Number of finished trials: ", len(study.trials))
119
120
121 ###################################################################################################
122 # Check trials on pareto front visually
123 optuna.visualization.plot_pareto_front(study, target_names=["FLOPS", "accuracy"])
124
125
126 ###################################################################################################
127 # Learn which hyperparameters are affecting the flops most with hyperparameter importance.
128 optuna.visualization.plot_param_importances(
129 study, target=lambda t: t.values[0], target_name="flops"
130 )
131
[end of tutorial/20_recipes/002_multi_objective.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/tutorial/20_recipes/002_multi_objective.py b/tutorial/20_recipes/002_multi_objective.py
--- a/tutorial/20_recipes/002_multi_objective.py
+++ b/tutorial/20_recipes/002_multi_objective.py
@@ -119,10 +119,23 @@
###################################################################################################
-# Check trials on pareto front visually
+# Check trials on Pareto front visually.
optuna.visualization.plot_pareto_front(study, target_names=["FLOPS", "accuracy"])
+###################################################################################################
+# Fetch the list of trials on the Pareto front with :attr:`~optuna.study.Study.best_trials`.
+#
+# For example, the following code shows the number of trials on the Pareto front and picks the trial with the highest accuracy.
+
+print(f"Number of trials on the Pareto front: {len(study.best_trials)}")
+
+trial_with_highest_accuracy = max(study.best_trials, key=lambda t: t.values[1])
+print(f"Trial with highest accuracy: ")
+print(f"\tnumber: {trial_with_highest_accuracy.number}")
+print(f"\tparams: {trial_with_highest_accuracy.params}")
+print(f"\tvalues: {trial_with_highest_accuracy.values}")
+
###################################################################################################
# Learn which hyperparameters are affecting the flops most with hyperparameter importance.
optuna.visualization.plot_param_importances(
| {"golden_diff": "diff --git a/tutorial/20_recipes/002_multi_objective.py b/tutorial/20_recipes/002_multi_objective.py\n--- a/tutorial/20_recipes/002_multi_objective.py\n+++ b/tutorial/20_recipes/002_multi_objective.py\n@@ -119,10 +119,23 @@\n \n \n ###################################################################################################\n-# Check trials on pareto front visually\n+# Check trials on Pareto front visually.\n optuna.visualization.plot_pareto_front(study, target_names=[\"FLOPS\", \"accuracy\"])\n \n \n+###################################################################################################\n+# Fetch the list of trials on the Pareto front with :attr:`~optuna.study.Study.best_trials`.\n+#\n+# For example, the following code shows the number of trials on the Pareto front and picks the trial with the highest accuracy.\n+\n+print(f\"Number of trials on the Pareto front: {len(study.best_trials)}\")\n+\n+trial_with_highest_accuracy = max(study.best_trials, key=lambda t: t.values[1])\n+print(f\"Trial with highest accuracy: \")\n+print(f\"\\tnumber: {trial_with_highest_accuracy.number}\")\n+print(f\"\\tparams: {trial_with_highest_accuracy.params}\")\n+print(f\"\\tvalues: {trial_with_highest_accuracy.values}\")\n+\n ###################################################################################################\n # Learn which hyperparameters are affecting the flops most with hyperparameter importance.\n optuna.visualization.plot_param_importances(\n", "issue": "Improve multi-objective optimization tutorial regarding `Study.best_trials`\n### What is an issue?\n\n## Background\r\n\r\nhttps://github.com/optuna/optuna/issues/3397 added a note about `study.best_trials` to the [reuse the best trial tutorial](https://optuna.readthedocs.io/en/latest/tutorial/20_recipes/010_reuse_best_trial.html). During the discussion, we found that the [multi-objective optimization tutorial](https://optuna.readthedocs.io/en/latest/tutorial/20_recipes/002_multi_objective.html) does not fetch the trials on the Pareto front (i.e., `Study.best_trials`) while it visualize the Pareto front.\r\n\r\n## Description\r\n\r\nI think readers can understand how to use the trials on Pareto front more easily if we mention `Study.best_trials` in the tutorial page. We may have some possible scenarios. For example,\r\n\r\n1. Show the Pareto front as can be seen in the current tutorial\r\n2. Explain how to get the trials on the Pareto front by using `Study.best_trials`\r\n3. Demonstrate how to get the desired trial from the Pareto front i.e., the trial whose accuracy is highest, and show the parameter values (or objective values)\r\n\r\n\r\n\n", "before_files": [{"content": "\"\"\"\n.. _multi_objective:\n\nMulti-objective Optimization with Optuna\n========================================\n\nThis tutorial showcases Optuna's multi-objective optimization feature by\noptimizing the validation accuracy of Fashion MNIST dataset and the FLOPS of the model implemented in PyTorch.\n\nWe use `thop <https://github.com/Lyken17/pytorch-OpCounter>`_ to measure FLOPS.\n\"\"\"\n\nimport thop\nimport torch\nimport torch.nn as nn\nimport torch.nn.functional as F\nimport torchvision\n\nimport optuna\n\n\nDEVICE = torch.device(\"cuda\") if torch.cuda.is_available() else torch.device(\"cpu\")\nDIR = \"..\"\nBATCHSIZE = 128\nN_TRAIN_EXAMPLES = BATCHSIZE * 30\nN_VALID_EXAMPLES = BATCHSIZE * 10\n\n\ndef define_model(trial):\n n_layers = trial.suggest_int(\"n_layers\", 1, 3)\n layers = []\n\n in_features = 28 * 28\n for i in range(n_layers):\n out_features = trial.suggest_int(\"n_units_l{}\".format(i), 4, 128)\n layers.append(nn.Linear(in_features, out_features))\n layers.append(nn.ReLU())\n p = trial.suggest_float(\"dropout_{}\".format(i), 0.2, 0.5)\n layers.append(nn.Dropout(p))\n\n in_features = out_features\n\n layers.append(nn.Linear(in_features, 10))\n layers.append(nn.LogSoftmax(dim=1))\n\n return nn.Sequential(*layers)\n\n\n# Defines training and evaluation.\ndef train_model(model, optimizer, train_loader):\n model.train()\n for batch_idx, (data, target) in enumerate(train_loader):\n data, target = data.view(-1, 28 * 28).to(DEVICE), target.to(DEVICE)\n optimizer.zero_grad()\n F.nll_loss(model(data), target).backward()\n optimizer.step()\n\n\ndef eval_model(model, valid_loader):\n model.eval()\n correct = 0\n with torch.no_grad():\n for batch_idx, (data, target) in enumerate(valid_loader):\n data, target = data.view(-1, 28 * 28).to(DEVICE), target.to(DEVICE)\n pred = model(data).argmax(dim=1, keepdim=True)\n correct += pred.eq(target.view_as(pred)).sum().item()\n\n accuracy = correct / N_VALID_EXAMPLES\n\n flops, _ = thop.profile(model, inputs=(torch.randn(1, 28 * 28).to(DEVICE),), verbose=False)\n return flops, accuracy\n\n\n###################################################################################################\n# Define multi-objective objective function.\n# Objectives are FLOPS and accuracy.\ndef objective(trial):\n train_dataset = torchvision.datasets.FashionMNIST(\n DIR, train=True, download=True, transform=torchvision.transforms.ToTensor()\n )\n train_loader = torch.utils.data.DataLoader(\n torch.utils.data.Subset(train_dataset, list(range(N_TRAIN_EXAMPLES))),\n batch_size=BATCHSIZE,\n shuffle=True,\n )\n\n val_dataset = torchvision.datasets.FashionMNIST(\n DIR, train=False, transform=torchvision.transforms.ToTensor()\n )\n val_loader = torch.utils.data.DataLoader(\n torch.utils.data.Subset(val_dataset, list(range(N_VALID_EXAMPLES))),\n batch_size=BATCHSIZE,\n shuffle=True,\n )\n model = define_model(trial).to(DEVICE)\n\n optimizer = torch.optim.Adam(\n model.parameters(), trial.suggest_float(\"lr\", 1e-5, 1e-1, log=True)\n )\n\n for epoch in range(10):\n train_model(model, optimizer, train_loader)\n flops, accuracy = eval_model(model, val_loader)\n return flops, accuracy\n\n\n###################################################################################################\n# Run multi-objective optimization\n# --------------------------------\n#\n# If your optimization problem is multi-objective,\n# Optuna assumes that you will specify the optimization direction for each objective.\n# Specifically, in this example, we want to minimize the FLOPS (we want a faster model)\n# and maximize the accuracy. So we set ``directions`` to ``[\"minimize\", \"maximize\"]``.\nstudy = optuna.create_study(directions=[\"minimize\", \"maximize\"])\nstudy.optimize(objective, n_trials=30, timeout=300)\n\nprint(\"Number of finished trials: \", len(study.trials))\n\n\n###################################################################################################\n# Check trials on pareto front visually\noptuna.visualization.plot_pareto_front(study, target_names=[\"FLOPS\", \"accuracy\"])\n\n\n###################################################################################################\n# Learn which hyperparameters are affecting the flops most with hyperparameter importance.\noptuna.visualization.plot_param_importances(\n study, target=lambda t: t.values[0], target_name=\"flops\"\n)\n", "path": "tutorial/20_recipes/002_multi_objective.py"}]} | 2,209 | 312 |
gh_patches_debug_23670 | rasdani/github-patches | git_diff | Project-MONAI__MONAI-907 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
sliding_window_inference() in monai.inferers went wrong when roi_size=(M,N,1)
**Describe the bug**
sliding_window_inference() gives NaN when roi_size=(M,N,1)
**To Reproduce**
Steps to reproduce the behavior:
1. Go to sliding_window_inference() in monai.inferers
2. Go to the line: run
slices = dense_patch_slices( image_size=(450, 344, 450), roi_size=(96, 96, 1), scan_interval=(72,72,0))
**Expected behavior**
You will get len(slices)=30, which should be 30*450 instead.
- MONAI latest
- docker monai:latest
</issue>
<code>
[start of monai/inferers/utils.py]
1 # Copyright 2020 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 Callable, Optional, Sequence, Tuple, Union
13
14 import torch
15 import torch.nn.functional as F
16
17 from monai.data.utils import compute_importance_map, dense_patch_slices, get_valid_patch_size
18 from monai.utils import BlendMode, PytorchPadMode, fall_back_tuple
19
20
21 def sliding_window_inference(
22 inputs: torch.Tensor,
23 roi_size: Union[Sequence[int], int],
24 sw_batch_size: int,
25 predictor: Callable[[torch.Tensor], torch.Tensor],
26 overlap: float = 0.25,
27 mode: Union[BlendMode, str] = BlendMode.CONSTANT,
28 padding_mode: Union[PytorchPadMode, str] = PytorchPadMode.CONSTANT,
29 cval: float = 0.0,
30 device: Optional[torch.device] = None,
31 ) -> torch.Tensor:
32 """
33 Sliding window inference on `inputs` with `predictor`.
34
35 When roi_size is larger than the inputs' spatial size, the input image are padded during inference.
36 To maintain the same spatial sizes, the output image will be cropped to the original input size.
37
38 Args:
39 inputs: input image to be processed (assuming NCHW[D])
40 roi_size: the spatial window size for inferences.
41 When its components have None or non-positives, the corresponding inputs dimension will be used.
42 if the components of the `roi_size` are non-positive values, the transform will use the
43 corresponding components of img size. For example, `roi_size=(32, -1)` will be adapted
44 to `(32, 64)` if the second spatial dimension size of img is `64`.
45 sw_batch_size: the batch size to run window slices.
46 predictor: given input tensor `patch_data` in shape NCHW[D], `predictor(patch_data)`
47 should return a prediction with the same spatial shape and batch_size, i.e. NMHW[D];
48 where HW[D] represents the patch spatial size, M is the number of output channels, N is `sw_batch_size`.
49 overlap: Amount of overlap between scans.
50 mode: {``"constant"``, ``"gaussian"``}
51 How to blend output of overlapping windows. Defaults to ``"constant"``.
52
53 - ``"constant``": gives equal weight to all predictions.
54 - ``"gaussian``": gives less weight to predictions on edges of windows.
55
56 padding_mode: {``"constant"``, ``"reflect"``, ``"replicate"``, ``"circular"``}
57 Padding mode when ``roi_size`` is larger than inputs. Defaults to ``"constant"``
58 See also: https://pytorch.org/docs/stable/nn.functional.html#pad
59 cval: fill value for 'constant' padding mode. Default: 0
60 device: device running the concatenation of the windows.
61 By default the device and accordingly the memory of the input device is used. If for example
62 set to device=torch.device('cpu') the gpu memory consumption is less and independent of the
63 input and roi_size parameter. Output is on the device set or if not set the inputs device.
64
65 Raises:
66 NotImplementedError: When ``inputs`` does not have batch size = 1.
67
68 Note:
69 - input must be channel-first and have a batch dim, support both spatial 2D and 3D.
70 - currently only supports `inputs` with batch_size=1.
71
72 """
73 num_spatial_dims = len(inputs.shape) - 2
74 assert 0 <= overlap < 1, "overlap must be >= 0 and < 1."
75
76 # determine image spatial size and batch size
77 # Note: all input images must have the same image size and batch size
78 image_size_ = list(inputs.shape[2:])
79 batch_size = inputs.shape[0]
80
81 # TODO: Enable batch sizes > 1 in future
82 if batch_size > 1:
83 raise NotImplementedError("Currently only inputs with batch size = 1 are supported.")
84
85 if device is None:
86 device = inputs.device
87
88 roi_size = fall_back_tuple(roi_size, image_size_)
89 # in case that image size is smaller than roi size
90 image_size = tuple(max(image_size_[i], roi_size[i]) for i in range(num_spatial_dims))
91 pad_size = []
92 for k in range(len(inputs.shape) - 1, 1, -1):
93 diff = max(roi_size[k - 2] - inputs.shape[k], 0)
94 half = diff // 2
95 pad_size.extend([half, diff - half])
96 inputs = F.pad(inputs, pad=pad_size, mode=PytorchPadMode(padding_mode).value, value=cval)
97
98 scan_interval = _get_scan_interval(image_size, roi_size, num_spatial_dims, overlap)
99
100 # Store all slices in list
101 slices = dense_patch_slices(image_size, roi_size, scan_interval)
102
103 slice_batches = []
104 for slice_index in range(0, len(slices), sw_batch_size):
105 slice_index_range = range(slice_index, min(slice_index + sw_batch_size, len(slices)))
106 input_slices = []
107 for curr_index in slice_index_range:
108 curr_slice = slices[curr_index]
109 if len(curr_slice) == 3:
110 input_slices.append(inputs[0, :, curr_slice[0], curr_slice[1], curr_slice[2]])
111 else:
112 input_slices.append(inputs[0, :, curr_slice[0], curr_slice[1]])
113 slice_batches.append(torch.stack(input_slices))
114
115 # Perform predictions
116 output_rois = list()
117 for data in slice_batches:
118 seg_prob = predictor(data) # batched patch segmentation
119 output_rois.append(seg_prob.to(device))
120
121 # stitching output image
122 output_classes = output_rois[0].shape[1]
123 output_shape = [batch_size, output_classes] + list(image_size)
124
125 # Create importance map
126 importance_map = compute_importance_map(get_valid_patch_size(image_size, roi_size), mode=mode, device=device)
127
128 # allocate memory to store the full output and the count for overlapping parts
129 output_image = torch.zeros(output_shape, dtype=torch.float32, device=device)
130 count_map = torch.zeros(output_shape, dtype=torch.float32, device=device)
131
132 for window_id, slice_index in enumerate(range(0, len(slices), sw_batch_size)):
133 slice_index_range = range(slice_index, min(slice_index + sw_batch_size, len(slices)))
134
135 # store the result in the proper location of the full output. Apply weights from importance map.
136 for curr_index in slice_index_range:
137 curr_slice = slices[curr_index]
138 if len(curr_slice) == 3:
139 output_image[0, :, curr_slice[0], curr_slice[1], curr_slice[2]] += (
140 importance_map * output_rois[window_id][curr_index - slice_index, :]
141 )
142 count_map[0, :, curr_slice[0], curr_slice[1], curr_slice[2]] += importance_map
143 else:
144 output_image[0, :, curr_slice[0], curr_slice[1]] += (
145 importance_map * output_rois[window_id][curr_index - slice_index, :]
146 )
147 count_map[0, :, curr_slice[0], curr_slice[1]] += importance_map
148
149 # account for any overlapping sections
150 output_image = output_image / count_map
151
152 if num_spatial_dims == 3:
153 return output_image[
154 ...,
155 pad_size[4] : image_size_[0] + pad_size[4],
156 pad_size[2] : image_size_[1] + pad_size[2],
157 pad_size[0] : image_size_[2] + pad_size[0],
158 ]
159 return output_image[
160 ..., pad_size[2] : image_size_[0] + pad_size[2], pad_size[0] : image_size_[1] + pad_size[0]
161 ] # 2D
162
163
164 def _get_scan_interval(
165 image_size: Sequence[int], roi_size: Sequence[int], num_spatial_dims: int, overlap: float
166 ) -> Tuple[int, ...]:
167 assert len(image_size) == num_spatial_dims, "image coord different from spatial dims."
168 assert len(roi_size) == num_spatial_dims, "roi coord different from spatial dims."
169
170 scan_interval = []
171 for i in range(num_spatial_dims):
172 if roi_size[i] == image_size[i]:
173 scan_interval.append(int(roi_size[i]))
174 else:
175 # scan interval is (1-overlap)*roi_size
176 scan_interval.append(int(roi_size[i] * (1 - overlap)))
177 return tuple(scan_interval)
178
[end of monai/inferers/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/monai/inferers/utils.py b/monai/inferers/utils.py
--- a/monai/inferers/utils.py
+++ b/monai/inferers/utils.py
@@ -164,14 +164,22 @@
def _get_scan_interval(
image_size: Sequence[int], roi_size: Sequence[int], num_spatial_dims: int, overlap: float
) -> Tuple[int, ...]:
- assert len(image_size) == num_spatial_dims, "image coord different from spatial dims."
- assert len(roi_size) == num_spatial_dims, "roi coord different from spatial dims."
+ """
+ Compute scan interval according to the image size, roi size and overlap.
+ Scan interval will be `int((1 - overlap) * roi_size)`, if interval is 0,
+ use 1 instead to make sure sliding window works.
+
+ """
+ if len(image_size) != num_spatial_dims:
+ raise ValueError("image coord different from spatial dims.")
+ if len(roi_size) != num_spatial_dims:
+ raise ValueError("roi coord different from spatial dims.")
scan_interval = []
for i in range(num_spatial_dims):
if roi_size[i] == image_size[i]:
scan_interval.append(int(roi_size[i]))
else:
- # scan interval is (1-overlap)*roi_size
- scan_interval.append(int(roi_size[i] * (1 - overlap)))
+ interval = int(roi_size[i] * (1 - overlap))
+ scan_interval.append(interval if interval > 0 else 1)
return tuple(scan_interval)
| {"golden_diff": "diff --git a/monai/inferers/utils.py b/monai/inferers/utils.py\n--- a/monai/inferers/utils.py\n+++ b/monai/inferers/utils.py\n@@ -164,14 +164,22 @@\n def _get_scan_interval(\n image_size: Sequence[int], roi_size: Sequence[int], num_spatial_dims: int, overlap: float\n ) -> Tuple[int, ...]:\n- assert len(image_size) == num_spatial_dims, \"image coord different from spatial dims.\"\n- assert len(roi_size) == num_spatial_dims, \"roi coord different from spatial dims.\"\n+ \"\"\"\n+ Compute scan interval according to the image size, roi size and overlap.\n+ Scan interval will be `int((1 - overlap) * roi_size)`, if interval is 0,\n+ use 1 instead to make sure sliding window works.\n+\n+ \"\"\"\n+ if len(image_size) != num_spatial_dims:\n+ raise ValueError(\"image coord different from spatial dims.\")\n+ if len(roi_size) != num_spatial_dims:\n+ raise ValueError(\"roi coord different from spatial dims.\")\n \n scan_interval = []\n for i in range(num_spatial_dims):\n if roi_size[i] == image_size[i]:\n scan_interval.append(int(roi_size[i]))\n else:\n- # scan interval is (1-overlap)*roi_size\n- scan_interval.append(int(roi_size[i] * (1 - overlap)))\n+ interval = int(roi_size[i] * (1 - overlap))\n+ scan_interval.append(interval if interval > 0 else 1)\n return tuple(scan_interval)\n", "issue": "sliding_window_inference() in monai.inferers went wrong when roi_size=(M,N,1)\n**Describe the bug**\r\nsliding_window_inference() gives NaN when roi_size=(M,N,1)\r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n1. Go to sliding_window_inference() in monai.inferers\r\n2. Go to the line: run\r\nslices = dense_patch_slices( image_size=(450, 344, 450), roi_size=(96, 96, 1), scan_interval=(72,72,0))\r\n\r\n**Expected behavior**\r\nYou will get len(slices)=30, which should be 30*450 instead.\r\n\r\n\r\n - MONAI latest\r\n - docker monai:latest\r\n\n", "before_files": [{"content": "# Copyright 2020 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 Callable, Optional, Sequence, Tuple, Union\n\nimport torch\nimport torch.nn.functional as F\n\nfrom monai.data.utils import compute_importance_map, dense_patch_slices, get_valid_patch_size\nfrom monai.utils import BlendMode, PytorchPadMode, fall_back_tuple\n\n\ndef sliding_window_inference(\n inputs: torch.Tensor,\n roi_size: Union[Sequence[int], int],\n sw_batch_size: int,\n predictor: Callable[[torch.Tensor], torch.Tensor],\n overlap: float = 0.25,\n mode: Union[BlendMode, str] = BlendMode.CONSTANT,\n padding_mode: Union[PytorchPadMode, str] = PytorchPadMode.CONSTANT,\n cval: float = 0.0,\n device: Optional[torch.device] = None,\n) -> torch.Tensor:\n \"\"\"\n Sliding window inference on `inputs` with `predictor`.\n\n When roi_size is larger than the inputs' spatial size, the input image are padded during inference.\n To maintain the same spatial sizes, the output image will be cropped to the original input size.\n\n Args:\n inputs: input image to be processed (assuming NCHW[D])\n roi_size: the spatial window size for inferences.\n When its components have None or non-positives, the corresponding inputs dimension will be used.\n if the components of the `roi_size` are non-positive values, the transform will use the\n corresponding components of img size. For example, `roi_size=(32, -1)` will be adapted\n to `(32, 64)` if the second spatial dimension size of img is `64`.\n sw_batch_size: the batch size to run window slices.\n predictor: given input tensor `patch_data` in shape NCHW[D], `predictor(patch_data)`\n should return a prediction with the same spatial shape and batch_size, i.e. NMHW[D];\n where HW[D] represents the patch spatial size, M is the number of output channels, N is `sw_batch_size`.\n overlap: Amount of overlap between scans.\n mode: {``\"constant\"``, ``\"gaussian\"``}\n How to blend output of overlapping windows. Defaults to ``\"constant\"``.\n\n - ``\"constant``\": gives equal weight to all predictions.\n - ``\"gaussian``\": gives less weight to predictions on edges of windows.\n\n padding_mode: {``\"constant\"``, ``\"reflect\"``, ``\"replicate\"``, ``\"circular\"``}\n Padding mode when ``roi_size`` is larger than inputs. Defaults to ``\"constant\"``\n See also: https://pytorch.org/docs/stable/nn.functional.html#pad\n cval: fill value for 'constant' padding mode. Default: 0\n device: device running the concatenation of the windows.\n By default the device and accordingly the memory of the input device is used. If for example\n set to device=torch.device('cpu') the gpu memory consumption is less and independent of the\n input and roi_size parameter. Output is on the device set or if not set the inputs device.\n\n Raises:\n NotImplementedError: When ``inputs`` does not have batch size = 1.\n\n Note:\n - input must be channel-first and have a batch dim, support both spatial 2D and 3D.\n - currently only supports `inputs` with batch_size=1.\n\n \"\"\"\n num_spatial_dims = len(inputs.shape) - 2\n assert 0 <= overlap < 1, \"overlap must be >= 0 and < 1.\"\n\n # determine image spatial size and batch size\n # Note: all input images must have the same image size and batch size\n image_size_ = list(inputs.shape[2:])\n batch_size = inputs.shape[0]\n\n # TODO: Enable batch sizes > 1 in future\n if batch_size > 1:\n raise NotImplementedError(\"Currently only inputs with batch size = 1 are supported.\")\n\n if device is None:\n device = inputs.device\n\n roi_size = fall_back_tuple(roi_size, image_size_)\n # in case that image size is smaller than roi size\n image_size = tuple(max(image_size_[i], roi_size[i]) for i in range(num_spatial_dims))\n pad_size = []\n for k in range(len(inputs.shape) - 1, 1, -1):\n diff = max(roi_size[k - 2] - inputs.shape[k], 0)\n half = diff // 2\n pad_size.extend([half, diff - half])\n inputs = F.pad(inputs, pad=pad_size, mode=PytorchPadMode(padding_mode).value, value=cval)\n\n scan_interval = _get_scan_interval(image_size, roi_size, num_spatial_dims, overlap)\n\n # Store all slices in list\n slices = dense_patch_slices(image_size, roi_size, scan_interval)\n\n slice_batches = []\n for slice_index in range(0, len(slices), sw_batch_size):\n slice_index_range = range(slice_index, min(slice_index + sw_batch_size, len(slices)))\n input_slices = []\n for curr_index in slice_index_range:\n curr_slice = slices[curr_index]\n if len(curr_slice) == 3:\n input_slices.append(inputs[0, :, curr_slice[0], curr_slice[1], curr_slice[2]])\n else:\n input_slices.append(inputs[0, :, curr_slice[0], curr_slice[1]])\n slice_batches.append(torch.stack(input_slices))\n\n # Perform predictions\n output_rois = list()\n for data in slice_batches:\n seg_prob = predictor(data) # batched patch segmentation\n output_rois.append(seg_prob.to(device))\n\n # stitching output image\n output_classes = output_rois[0].shape[1]\n output_shape = [batch_size, output_classes] + list(image_size)\n\n # Create importance map\n importance_map = compute_importance_map(get_valid_patch_size(image_size, roi_size), mode=mode, device=device)\n\n # allocate memory to store the full output and the count for overlapping parts\n output_image = torch.zeros(output_shape, dtype=torch.float32, device=device)\n count_map = torch.zeros(output_shape, dtype=torch.float32, device=device)\n\n for window_id, slice_index in enumerate(range(0, len(slices), sw_batch_size)):\n slice_index_range = range(slice_index, min(slice_index + sw_batch_size, len(slices)))\n\n # store the result in the proper location of the full output. Apply weights from importance map.\n for curr_index in slice_index_range:\n curr_slice = slices[curr_index]\n if len(curr_slice) == 3:\n output_image[0, :, curr_slice[0], curr_slice[1], curr_slice[2]] += (\n importance_map * output_rois[window_id][curr_index - slice_index, :]\n )\n count_map[0, :, curr_slice[0], curr_slice[1], curr_slice[2]] += importance_map\n else:\n output_image[0, :, curr_slice[0], curr_slice[1]] += (\n importance_map * output_rois[window_id][curr_index - slice_index, :]\n )\n count_map[0, :, curr_slice[0], curr_slice[1]] += importance_map\n\n # account for any overlapping sections\n output_image = output_image / count_map\n\n if num_spatial_dims == 3:\n return output_image[\n ...,\n pad_size[4] : image_size_[0] + pad_size[4],\n pad_size[2] : image_size_[1] + pad_size[2],\n pad_size[0] : image_size_[2] + pad_size[0],\n ]\n return output_image[\n ..., pad_size[2] : image_size_[0] + pad_size[2], pad_size[0] : image_size_[1] + pad_size[0]\n ] # 2D\n\n\ndef _get_scan_interval(\n image_size: Sequence[int], roi_size: Sequence[int], num_spatial_dims: int, overlap: float\n) -> Tuple[int, ...]:\n assert len(image_size) == num_spatial_dims, \"image coord different from spatial dims.\"\n assert len(roi_size) == num_spatial_dims, \"roi coord different from spatial dims.\"\n\n scan_interval = []\n for i in range(num_spatial_dims):\n if roi_size[i] == image_size[i]:\n scan_interval.append(int(roi_size[i]))\n else:\n # scan interval is (1-overlap)*roi_size\n scan_interval.append(int(roi_size[i] * (1 - overlap)))\n return tuple(scan_interval)\n", "path": "monai/inferers/utils.py"}]} | 3,146 | 359 |
gh_patches_debug_66 | rasdani/github-patches | git_diff | streamlit__streamlit-2342 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Clicking on a text field in the sidebar (on mobile) causes the sidebar to close.
# Summary
When the window is too narrow, clicking on a text input in the sidebar causes the sidebar to disappear, making it impossible to type in text. [[video example](https://drive.google.com/file/d/1KetCBECPsg3UAiESZCRdm6W9M_zIrNkc/view?usp=sharing)]
# Steps to reproduce
1. Put a text input in the sidebar.
2. Make the Streamlit app window narrow.
3. Click the text input in the sidebar.
## Expected behavior:
Ideally, the sidebar would stay open and the text input box would have focus and you coudl type something in.
In fact, this _does_ happen when the window is a bit wider. [[video example](https://drive.google.com/file/d/1fObxQWIjkL_5VBJY_niltG489Ki8tRB8/view?usp=sharing)]
## Actual behavior:
Clicking on a text input in the sidebar causes the sidebar to disappear, making it impossible to type in text. [[video example](https://drive.google.com/file/d/1KetCBECPsg3UAiESZCRdm6W9M_zIrNkc/view?usp=sharing)]
## Is this a regression?
Unkown
# Debug info
- Streamlit version: `Streamlit, version 0.68.0`
- Python version: `Python 3.8.5`
- Using Conda? PipEnv? PyEnv? Pex? `pipenv, version 2020.8.13`
- OS version:
```
Distributor ID: Ubuntu
Description: Ubuntu 20.04.1 LTS
Release: 20.04
Codename: focal
```
- Browser version: `Safari on iPadOS 14`
</issue>
<code>
[start of e2e/scripts/st_sidebar.py]
1 # Copyright 2018-2020 Streamlit Inc.
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 datetime import datetime
17 from datetime import date
18
19 w1 = st.sidebar.date_input("Label 1", date(1970, 1, 1))
20 st.write("Value 1:", w1)
21
22 w2 = st.sidebar.date_input("Label 2", datetime(2019, 7, 6, 21, 15))
23 st.write("Value 2:", w2)
24
25 x = st.sidebar.text("overwrite me")
26 x.text("overwritten")
27
[end of e2e/scripts/st_sidebar.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_sidebar.py b/e2e/scripts/st_sidebar.py
--- a/e2e/scripts/st_sidebar.py
+++ b/e2e/scripts/st_sidebar.py
@@ -24,3 +24,5 @@
x = st.sidebar.text("overwrite me")
x.text("overwritten")
+
+y = st.sidebar.text_input("type here")
| {"golden_diff": "diff --git a/e2e/scripts/st_sidebar.py b/e2e/scripts/st_sidebar.py\n--- a/e2e/scripts/st_sidebar.py\n+++ b/e2e/scripts/st_sidebar.py\n@@ -24,3 +24,5 @@\n \n x = st.sidebar.text(\"overwrite me\")\n x.text(\"overwritten\")\n+\n+y = st.sidebar.text_input(\"type here\")\n", "issue": "Clicking on a text field in the sidebar (on mobile) causes the sidebar to close.\n# Summary\r\n\r\nWhen the window is too narrow, clicking on a text input in the sidebar causes the sidebar to disappear, making it impossible to type in text. [[video example](https://drive.google.com/file/d/1KetCBECPsg3UAiESZCRdm6W9M_zIrNkc/view?usp=sharing)]\r\n\r\n# Steps to reproduce\r\n\r\n1. Put a text input in the sidebar.\r\n2. Make the Streamlit app window narrow.\r\n3. Click the text input in the sidebar.\r\n\r\n## Expected behavior:\r\n\r\nIdeally, the sidebar would stay open and the text input box would have focus and you coudl type something in.\r\n\r\nIn fact, this _does_ happen when the window is a bit wider. [[video example](https://drive.google.com/file/d/1fObxQWIjkL_5VBJY_niltG489Ki8tRB8/view?usp=sharing)]\r\n\r\n## Actual behavior:\r\n\r\nClicking on a text input in the sidebar causes the sidebar to disappear, making it impossible to type in text. [[video example](https://drive.google.com/file/d/1KetCBECPsg3UAiESZCRdm6W9M_zIrNkc/view?usp=sharing)]\r\n\r\n## Is this a regression?\r\n\r\nUnkown\r\n\r\n# Debug info\r\n\r\n- Streamlit version: `Streamlit, version 0.68.0`\r\n- Python version: `Python 3.8.5`\r\n- Using Conda? PipEnv? PyEnv? Pex? `pipenv, version 2020.8.13`\r\n- OS version: \r\n```\r\nDistributor ID: Ubuntu\r\nDescription: Ubuntu 20.04.1 LTS\r\nRelease: 20.04\r\nCodename: focal\r\n```\r\n- Browser version: `Safari on iPadOS 14`\n", "before_files": [{"content": "# Copyright 2018-2020 Streamlit 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\nimport streamlit as st\nfrom datetime import datetime\nfrom datetime import date\n\nw1 = st.sidebar.date_input(\"Label 1\", date(1970, 1, 1))\nst.write(\"Value 1:\", w1)\n\nw2 = st.sidebar.date_input(\"Label 2\", datetime(2019, 7, 6, 21, 15))\nst.write(\"Value 2:\", w2)\n\nx = st.sidebar.text(\"overwrite me\")\nx.text(\"overwritten\")\n", "path": "e2e/scripts/st_sidebar.py"}]} | 1,251 | 79 |
gh_patches_debug_24062 | rasdani/github-patches | git_diff | rucio__rucio-4948 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
SRM to HTTPS optional compatibility
Motivation
----------
https://github.com/rucio/rucio/blob/882b662a24c75d515080606be635959566b17f14/lib/rucio/common/constants.py#L42
Defines a scheme_map between protocol compatibility in Rucio. We need an additional compatibility between `srm` and `https` (and vice-versa) which is only optionally (based on a config parameter) activated.
Modification
------------
Check if an option
```
[transfers]
srm_https_compatibility = True
```
is set and add it to the scheme_map.
</issue>
<code>
[start of lib/rucio/common/constants.py]
1 # -*- coding: utf-8 -*-
2 # Copyright 2013-2021 CERN
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 # You may obtain a copy of the License at
7 #
8 # http://www.apache.org/licenses/LICENSE-2.0
9 #
10 # Unless required by applicable law or agreed to in writing, software
11 # distributed under the License is distributed on an "AS IS" BASIS,
12 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 # See the License for the specific language governing permissions and
14 # limitations under the License.
15 #
16 # Authors:
17 # - Vincent Garonne <[email protected]>, 2013-2015
18 # - Cedric Serfon <[email protected]>, 2015-2021
19 # - Martin Barisits <[email protected]>, 2017
20 # - Mario Lassnig <[email protected]>, 2018-2021
21 # - Hannes Hansen <[email protected]>, 2018
22 # - Sahan Dilshan <[email protected]>, 2021
23 # - David Población Criado <[email protected]>, 2021
24 # - Rakshita Varadarajan <[email protected]>, 2021
25
26 from collections import namedtuple
27 from enum import Enum
28
29 """
30 Constants.
31
32 """
33
34 RESERVED_KEYS = ['scope', 'name', 'account', 'did_type', 'is_open', 'monotonic', 'obsolete', 'complete',
35 'availability', 'suppressed', 'bytes', 'length', 'md5', 'adler32', 'rule_evaluation_action',
36 'rule_evaluation_required', 'expired_at', 'deleted_at', 'created_at', 'updated_at']
37 # collection_keys =
38 # file_keys =
39
40 KEY_TYPES = ['ALL', 'COLLECTION', 'FILE', 'DERIVED']
41 # all(container, dataset, file), collection(dataset or container), file, derived(compute from file for collection)
42
43 SCHEME_MAP = {'srm': ['srm', 'gsiftp'],
44 'gsiftp': ['srm', 'gsiftp'],
45 'https': ['https', 'davs', 's3', 'srm+https'],
46 'davs': ['https', 'davs', 's3', 'srm+https'],
47 'root': ['root'],
48 's3': ['https', 'davs', 's3', 'srm+https'],
49 'srm+https': ['https', 'davs', 's3', 'srm+https'],
50 'scp': ['scp'],
51 'rsync': ['rsync'],
52 'rclone': ['rclone']}
53
54 SUPPORTED_PROTOCOLS = ['gsiftp', 'srm', 'root', 'davs', 'http', 'https', 'file', 's3', 's3+rucio', 's3+https', 'storm', 'srm+https', 'scp', 'rsync', 'rclone']
55
56 FTS_STATE = namedtuple('FTS_STATE', ['SUBMITTED', 'READY', 'ACTIVE', 'FAILED', 'FINISHED', 'FINISHEDDIRTY', 'NOT_USED',
57 'CANCELED'])('SUBMITTED', 'READY', 'ACTIVE', 'FAILED', 'FINISHED', 'FINISHEDDIRTY',
58 'NOT_USED', 'CANCELED')
59
60 FTS_COMPLETE_STATE = namedtuple('FTS_COMPLETE_STATE', ['OK', 'ERROR'])('Ok', 'Error')
61
62
63 class ReplicaState(Enum):
64 # From rucio.db.sqla.constants, update that file at the same time than this
65 AVAILABLE = 'A'
66 UNAVAILABLE = 'U'
67 COPYING = 'C'
68 BEING_DELETED = 'B'
69 BAD = 'D'
70 TEMPORARY_UNAVAILABLE = 'T'
71
[end of lib/rucio/common/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/lib/rucio/common/constants.py b/lib/rucio/common/constants.py
--- a/lib/rucio/common/constants.py
+++ b/lib/rucio/common/constants.py
@@ -21,11 +21,15 @@
# - Hannes Hansen <[email protected]>, 2018
# - Sahan Dilshan <[email protected]>, 2021
# - David Población Criado <[email protected]>, 2021
+# - Radu Carpa <[email protected]>, 2021
# - Rakshita Varadarajan <[email protected]>, 2021
+# - Joel Dierkes <[email protected]>, 2021
from collections import namedtuple
from enum import Enum
+from rucio.common.config import config_get
+
"""
Constants.
@@ -50,6 +54,9 @@
'scp': ['scp'],
'rsync': ['rsync'],
'rclone': ['rclone']}
+if config_get('transfers', 'srm_https_compatibility', raise_exception=False, default=False):
+ SCHEME_MAP['srm'].append('https')
+ SCHEME_MAP['https'].append('srm')
SUPPORTED_PROTOCOLS = ['gsiftp', 'srm', 'root', 'davs', 'http', 'https', 'file', 's3', 's3+rucio', 's3+https', 'storm', 'srm+https', 'scp', 'rsync', 'rclone']
| {"golden_diff": "diff --git a/lib/rucio/common/constants.py b/lib/rucio/common/constants.py\n--- a/lib/rucio/common/constants.py\n+++ b/lib/rucio/common/constants.py\n@@ -21,11 +21,15 @@\n # - Hannes Hansen <[email protected]>, 2018\n # - Sahan Dilshan <[email protected]>, 2021\n # - David Poblaci\u00f3n Criado <[email protected]>, 2021\n+# - Radu Carpa <[email protected]>, 2021\n # - Rakshita Varadarajan <[email protected]>, 2021\n+# - Joel Dierkes <[email protected]>, 2021\n \n from collections import namedtuple\n from enum import Enum\n \n+from rucio.common.config import config_get\n+\n \"\"\"\n Constants.\n \n@@ -50,6 +54,9 @@\n 'scp': ['scp'],\n 'rsync': ['rsync'],\n 'rclone': ['rclone']}\n+if config_get('transfers', 'srm_https_compatibility', raise_exception=False, default=False):\n+ SCHEME_MAP['srm'].append('https')\n+ SCHEME_MAP['https'].append('srm')\n \n SUPPORTED_PROTOCOLS = ['gsiftp', 'srm', 'root', 'davs', 'http', 'https', 'file', 's3', 's3+rucio', 's3+https', 'storm', 'srm+https', 'scp', 'rsync', 'rclone']\n", "issue": "SRM to HTTPS optional compatibility\nMotivation\r\n----------\r\nhttps://github.com/rucio/rucio/blob/882b662a24c75d515080606be635959566b17f14/lib/rucio/common/constants.py#L42\r\nDefines a scheme_map between protocol compatibility in Rucio. We need an additional compatibility between `srm` and `https` (and vice-versa) which is only optionally (based on a config parameter) activated.\r\n\r\nModification\r\n------------\r\nCheck if an option\r\n```\r\n[transfers]\r\nsrm_https_compatibility = True\r\n```\r\nis set and add it to the scheme_map.\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n# Copyright 2013-2021 CERN\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# Authors:\n# - Vincent Garonne <[email protected]>, 2013-2015\n# - Cedric Serfon <[email protected]>, 2015-2021\n# - Martin Barisits <[email protected]>, 2017\n# - Mario Lassnig <[email protected]>, 2018-2021\n# - Hannes Hansen <[email protected]>, 2018\n# - Sahan Dilshan <[email protected]>, 2021\n# - David Poblaci\u00f3n Criado <[email protected]>, 2021\n# - Rakshita Varadarajan <[email protected]>, 2021\n\nfrom collections import namedtuple\nfrom enum import Enum\n\n\"\"\"\nConstants.\n\n\"\"\"\n\nRESERVED_KEYS = ['scope', 'name', 'account', 'did_type', 'is_open', 'monotonic', 'obsolete', 'complete',\n 'availability', 'suppressed', 'bytes', 'length', 'md5', 'adler32', 'rule_evaluation_action',\n 'rule_evaluation_required', 'expired_at', 'deleted_at', 'created_at', 'updated_at']\n# collection_keys =\n# file_keys =\n\nKEY_TYPES = ['ALL', 'COLLECTION', 'FILE', 'DERIVED']\n# all(container, dataset, file), collection(dataset or container), file, derived(compute from file for collection)\n\nSCHEME_MAP = {'srm': ['srm', 'gsiftp'],\n 'gsiftp': ['srm', 'gsiftp'],\n 'https': ['https', 'davs', 's3', 'srm+https'],\n 'davs': ['https', 'davs', 's3', 'srm+https'],\n 'root': ['root'],\n 's3': ['https', 'davs', 's3', 'srm+https'],\n 'srm+https': ['https', 'davs', 's3', 'srm+https'],\n 'scp': ['scp'],\n 'rsync': ['rsync'],\n 'rclone': ['rclone']}\n\nSUPPORTED_PROTOCOLS = ['gsiftp', 'srm', 'root', 'davs', 'http', 'https', 'file', 's3', 's3+rucio', 's3+https', 'storm', 'srm+https', 'scp', 'rsync', 'rclone']\n\nFTS_STATE = namedtuple('FTS_STATE', ['SUBMITTED', 'READY', 'ACTIVE', 'FAILED', 'FINISHED', 'FINISHEDDIRTY', 'NOT_USED',\n 'CANCELED'])('SUBMITTED', 'READY', 'ACTIVE', 'FAILED', 'FINISHED', 'FINISHEDDIRTY',\n 'NOT_USED', 'CANCELED')\n\nFTS_COMPLETE_STATE = namedtuple('FTS_COMPLETE_STATE', ['OK', 'ERROR'])('Ok', 'Error')\n\n\nclass ReplicaState(Enum):\n # From rucio.db.sqla.constants, update that file at the same time than this\n AVAILABLE = 'A'\n UNAVAILABLE = 'U'\n COPYING = 'C'\n BEING_DELETED = 'B'\n BAD = 'D'\n TEMPORARY_UNAVAILABLE = 'T'\n", "path": "lib/rucio/common/constants.py"}]} | 1,725 | 383 |
gh_patches_debug_38615 | rasdani/github-patches | git_diff | OCHA-DAP__hdx-ckan-1670 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Change feedback button to link to http://docs.hdx.rwlabs.org/get-involved/
</issue>
<code>
[start of ckanext-hdx_theme/ckanext/hdx_theme/version.py]
1 hdx_version = 'v0.4.6'
2
[end of ckanext-hdx_theme/ckanext/hdx_theme/version.py]
[start of ckanext-sitemap/setup.py]
1 from setuptools import setup, find_packages
2 import sys
3 import os
4
5 version = '0.1'
6
7 setup(
8 name='ckanext-sitemap',
9 version=version,
10 description="Sitemap extension for CKAN",
11 long_description="""\
12 """,
13 classifiers=[
14 ], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
15 keywords='',
16 author='Aleksi Suomalainen',
17 author_email='[email protected]',
18 url='https://github.com/locusf/ckanext-sitemap',
19 license='AGPL',
20 packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
21 namespace_packages=['ckanext', 'ckanext.sitemap'],
22 include_package_data=True,
23 zip_safe=False,
24 install_requires=[
25 # -*- Extra requirements: -*-
26 ],
27 setup_requires=[
28 'nose'
29 ],
30 entry_points="""
31 [ckan.plugins]
32 # Add plugins here, eg
33 sitemap=ckanext.sitemap.plugin:SitemapPlugin
34 """,
35 )
36
[end of ckanext-sitemap/setup.py]
[start of ckanext-sitemap/ckanext/sitemap/controller.py]
1 '''
2 Controller for sitemap
3 '''
4 import logging
5
6 from ckan.lib.base import BaseController
7 from ckan.model import Session, Package
8 from ckan.lib.helpers import url_for
9 from lxml import etree
10 from pylons import config, response
11 from pylons.decorators.cache import beaker_cache
12
13 SITEMAP_NS = "http://www.sitemaps.org/schemas/sitemap/0.9"
14
15 log = logging.getLogger(__file__)
16
17 class SitemapController(BaseController):
18
19 @beaker_cache(expire=3600*24, type="dbm", invalidate_on_startup=True)
20 def _render_sitemap(self, page):
21 root = etree.Element("urlset", nsmap={None: SITEMAP_NS})
22 #pkgs = Session.query(Package).all()
23 pkgs = Session.query(Package).filter(Package.private == 0).offset(int(page)*25).limit(25)
24 for pkg in pkgs:
25 url = etree.SubElement(root, 'url')
26 loc = etree.SubElement(url, 'loc')
27 pkg_url = url_for(controller='package', action="read", id = pkg.name)
28 loc.text = config.get('ckan.site_url') + pkg_url
29 lastmod = etree.SubElement(url, 'lastmod')
30 lastmod.text = pkg.latest_related_revision.timestamp.strftime('%Y-%m-%d')
31 for res in pkg.resources:
32 url = etree.SubElement(root, 'url')
33 loc = etree.SubElement(url, 'loc')
34 loc.text = config.get('ckan.site_url') + url_for(controller="package", action="resource_read", id = pkg.name, resource_id = res.id)
35 lastmod = etree.SubElement(url, 'lastmod')
36 lastmod.text = res.created.strftime('%Y-%m-%d')
37 response.headers['Content-type'] = 'text/xml'
38 return etree.tostring(root, pretty_print=True)
39
40 def view(self):
41 #Sitemap Index
42 root = etree.Element("sitemapindex", nsmap={None: SITEMAP_NS})
43 pkgs = Session.query(Package).count()
44 count = pkgs/25
45 for i in range(1,count):
46 sitemap = etree.SubElement(root, 'sitemap')
47 loc = etree.SubElement(sitemap, 'loc')
48 loc.text = config.get('ckan.site_url') + url_for(controller="ckanext.sitemap.controller:SitemapController", action="index", page=i)
49 response.headers['Content-type'] = 'text/xml'
50 return etree.tostring(root, pretty_print=True)
51 #.limit() and .offset()
52 #return self._render_sitemap()
53
54 def index(self, page):
55 return self._render_sitemap(page)
[end of ckanext-sitemap/ckanext/sitemap/controller.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_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.5'
+hdx_version = 'v0.4.6'
diff --git a/ckanext-sitemap/ckanext/sitemap/controller.py b/ckanext-sitemap/ckanext/sitemap/controller.py
--- a/ckanext-sitemap/ckanext/sitemap/controller.py
+++ b/ckanext-sitemap/ckanext/sitemap/controller.py
@@ -20,7 +20,7 @@
def _render_sitemap(self, page):
root = etree.Element("urlset", nsmap={None: SITEMAP_NS})
#pkgs = Session.query(Package).all()
- pkgs = Session.query(Package).filter(Package.private == 0).offset(int(page)*25).limit(25)
+ pkgs = Session.query(Package).filter(Package.private == False).offset(int(page)*25).limit(25)
for pkg in pkgs:
url = etree.SubElement(root, 'url')
loc = etree.SubElement(url, 'loc')
@@ -40,7 +40,7 @@
def view(self):
#Sitemap Index
root = etree.Element("sitemapindex", nsmap={None: SITEMAP_NS})
- pkgs = Session.query(Package).count()
+ pkgs = Session.query(Package).filter(Package.private == False).count()
count = pkgs/25
for i in range(1,count):
sitemap = etree.SubElement(root, 'sitemap')
diff --git a/ckanext-sitemap/setup.py b/ckanext-sitemap/setup.py
--- a/ckanext-sitemap/setup.py
+++ b/ckanext-sitemap/setup.py
@@ -1,32 +1,33 @@
from setuptools import setup, find_packages
-import sys, os
+import sys
+import os
version = '0.1'
setup(
- name='ckanext-sitemap',
- version=version,
- description="Sitemap extension for CKAN",
- long_description="""\
+ name='ckanext-sitemap',
+ version=version,
+ description="Sitemap extension for CKAN",
+ long_description="""\
""",
- classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
- keywords='',
- author='Aleksi Suomalainen',
- author_email='[email protected]',
- url='https://github.com/locusf/ckanext-sitemap',
- license='AGPL',
- packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
- namespace_packages=['ckanext', 'ckanext.sitemap'],
- include_package_data=True,
- zip_safe=False,
- install_requires=[
- # -*- Extra requirements: -*-
- ],
- setup_requires=[
- 'nose'
- ],
- entry_points=\
- """
+ classifiers=[
+ ], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+ keywords='',
+ author='Aleksi Suomalainen',
+ author_email='[email protected]',
+ url='https://github.com/locusf/ckanext-sitemap',
+ license='AGPL',
+ packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+ namespace_packages=['ckanext', 'ckanext.sitemap'],
+ include_package_data=True,
+ zip_safe=False,
+ install_requires=[
+ # -*- Extra requirements: -*-
+ ],
+ setup_requires=[
+ 'nose'
+ ],
+ entry_points="""
[ckan.plugins]
# Add plugins here, eg
sitemap=ckanext.sitemap.plugin:SitemapPlugin
| {"golden_diff": "diff --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.5'\n+hdx_version = 'v0.4.6'\ndiff --git a/ckanext-sitemap/ckanext/sitemap/controller.py b/ckanext-sitemap/ckanext/sitemap/controller.py\n--- a/ckanext-sitemap/ckanext/sitemap/controller.py\n+++ b/ckanext-sitemap/ckanext/sitemap/controller.py\n@@ -20,7 +20,7 @@\n def _render_sitemap(self, page):\n root = etree.Element(\"urlset\", nsmap={None: SITEMAP_NS})\n #pkgs = Session.query(Package).all()\n- pkgs = Session.query(Package).filter(Package.private == 0).offset(int(page)*25).limit(25)\n+ pkgs = Session.query(Package).filter(Package.private == False).offset(int(page)*25).limit(25)\n for pkg in pkgs:\n url = etree.SubElement(root, 'url')\n loc = etree.SubElement(url, 'loc')\n@@ -40,7 +40,7 @@\n def view(self):\n #Sitemap Index\n root = etree.Element(\"sitemapindex\", nsmap={None: SITEMAP_NS})\n- pkgs = Session.query(Package).count()\n+ pkgs = Session.query(Package).filter(Package.private == False).count()\n count = pkgs/25\n for i in range(1,count):\n sitemap = etree.SubElement(root, 'sitemap')\ndiff --git a/ckanext-sitemap/setup.py b/ckanext-sitemap/setup.py\n--- a/ckanext-sitemap/setup.py\n+++ b/ckanext-sitemap/setup.py\n@@ -1,32 +1,33 @@\n from setuptools import setup, find_packages\n-import sys, os\n+import sys\n+import os\n \n version = '0.1'\n \n setup(\n-\tname='ckanext-sitemap',\n-\tversion=version,\n-\tdescription=\"Sitemap extension for CKAN\",\n-\tlong_description=\"\"\"\\\n+ name='ckanext-sitemap',\n+ version=version,\n+ description=\"Sitemap extension for CKAN\",\n+ long_description=\"\"\"\\\n \t\"\"\",\n-\tclassifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers\n-\tkeywords='',\n-\tauthor='Aleksi Suomalainen',\n-\tauthor_email='[email protected]',\n-\turl='https://github.com/locusf/ckanext-sitemap',\n-\tlicense='AGPL',\n-\tpackages=find_packages(exclude=['ez_setup', 'examples', 'tests']),\n-\tnamespace_packages=['ckanext', 'ckanext.sitemap'],\n-\tinclude_package_data=True,\n-\tzip_safe=False,\n-\tinstall_requires=[\n-\t\t# -*- Extra requirements: -*-\n-\t],\n-\tsetup_requires=[\n-\t\t'nose'\n-\t],\n-\tentry_points=\\\n-\t\"\"\"\n+ classifiers=[\n+ ], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers\n+ keywords='',\n+ author='Aleksi Suomalainen',\n+ author_email='[email protected]',\n+ url='https://github.com/locusf/ckanext-sitemap',\n+ license='AGPL',\n+ packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),\n+ namespace_packages=['ckanext', 'ckanext.sitemap'],\n+ include_package_data=True,\n+ zip_safe=False,\n+ install_requires=[\n+ # -*- Extra requirements: -*-\n+ ],\n+ setup_requires=[\n+ 'nose'\n+ ],\n+ entry_points=\"\"\"\n [ckan.plugins]\n \t# Add plugins here, eg\n \tsitemap=ckanext.sitemap.plugin:SitemapPlugin\n", "issue": "Change feedback button to link to http://docs.hdx.rwlabs.org/get-involved/\n\n", "before_files": [{"content": "hdx_version = 'v0.4.6'\n", "path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"}, {"content": "from setuptools import setup, find_packages\nimport sys\nimport os\n\nversion = '0.1'\n\nsetup(\n name='ckanext-sitemap',\n version=version,\n description=\"Sitemap extension for CKAN\",\n long_description=\"\"\"\\\n\t\"\"\",\n classifiers=[\n ], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers\n keywords='',\n author='Aleksi Suomalainen',\n author_email='[email protected]',\n url='https://github.com/locusf/ckanext-sitemap',\n license='AGPL',\n packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),\n namespace_packages=['ckanext', 'ckanext.sitemap'],\n include_package_data=True,\n zip_safe=False,\n install_requires=[\n # -*- Extra requirements: -*-\n ],\n setup_requires=[\n 'nose'\n ],\n entry_points=\"\"\"\n [ckan.plugins]\n\t# Add plugins here, eg\n\tsitemap=ckanext.sitemap.plugin:SitemapPlugin\n\t\"\"\",\n)\n", "path": "ckanext-sitemap/setup.py"}, {"content": "'''\nController for sitemap\n'''\nimport logging\n\nfrom ckan.lib.base import BaseController\nfrom ckan.model import Session, Package\nfrom ckan.lib.helpers import url_for\nfrom lxml import etree\nfrom pylons import config, response\nfrom pylons.decorators.cache import beaker_cache\n\nSITEMAP_NS = \"http://www.sitemaps.org/schemas/sitemap/0.9\"\n\nlog = logging.getLogger(__file__)\n\nclass SitemapController(BaseController):\n\n @beaker_cache(expire=3600*24, type=\"dbm\", invalidate_on_startup=True)\n def _render_sitemap(self, page):\n root = etree.Element(\"urlset\", nsmap={None: SITEMAP_NS})\n #pkgs = Session.query(Package).all()\n pkgs = Session.query(Package).filter(Package.private == 0).offset(int(page)*25).limit(25)\n for pkg in pkgs:\n url = etree.SubElement(root, 'url')\n loc = etree.SubElement(url, 'loc')\n pkg_url = url_for(controller='package', action=\"read\", id = pkg.name)\n loc.text = config.get('ckan.site_url') + pkg_url\n lastmod = etree.SubElement(url, 'lastmod')\n lastmod.text = pkg.latest_related_revision.timestamp.strftime('%Y-%m-%d')\n for res in pkg.resources:\n url = etree.SubElement(root, 'url')\n loc = etree.SubElement(url, 'loc')\n loc.text = config.get('ckan.site_url') + url_for(controller=\"package\", action=\"resource_read\", id = pkg.name, resource_id = res.id)\n lastmod = etree.SubElement(url, 'lastmod')\n lastmod.text = res.created.strftime('%Y-%m-%d')\n response.headers['Content-type'] = 'text/xml'\n return etree.tostring(root, pretty_print=True)\n\n def view(self):\n #Sitemap Index\n root = etree.Element(\"sitemapindex\", nsmap={None: SITEMAP_NS})\n pkgs = Session.query(Package).count()\n count = pkgs/25\n for i in range(1,count):\n sitemap = etree.SubElement(root, 'sitemap')\n loc = etree.SubElement(sitemap, 'loc')\n loc.text = config.get('ckan.site_url') + url_for(controller=\"ckanext.sitemap.controller:SitemapController\", action=\"index\", page=i)\n response.headers['Content-type'] = 'text/xml'\n return etree.tostring(root, pretty_print=True)\n #.limit() and .offset()\n #return self._render_sitemap()\n\n def index(self, page):\n return self._render_sitemap(page)", "path": "ckanext-sitemap/ckanext/sitemap/controller.py"}]} | 1,619 | 927 |
gh_patches_debug_16824 | rasdani/github-patches | git_diff | celery__celery-8984 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
New Django task with transaction atomic, return `None` instead of the task UUID
<!--
Please fill this template entirely and do not erase parts of it.
We reserve the right to close without a response
bug reports which are incomplete.
-->
# Checklist
<!--
To check an item on the list replace [ ] with [x].
-->
- [x] I have verified that the issue exists against the `main` branch of Celery.
- [ ] This has already been asked to the [discussions forum](https://github.com/celery/celery/discussions) first.
- [x] I have read the relevant section in the
[contribution guide](https://docs.celeryq.dev/en/main/contributing.html#other-bugs)
on reporting bugs.
- [x] I have checked the [issues list](https://github.com/celery/celery/issues?q=is%3Aissue+label%3A%22Issue+Type%3A+Bug+Report%22+-label%3A%22Category%3A+Documentation%22)
for similar or identical bug reports.
- [x] I have checked the [pull requests list](https://github.com/celery/celery/pulls?q=is%3Apr+label%3A%22PR+Type%3A+Bugfix%22+-label%3A%22Category%3A+Documentation%22)
for existing proposed fixes.
- [x] I have checked the [commit log](https://github.com/celery/celery/commits/main)
to find out if the bug was already fixed in the main branch.
- [ ] I have included all related issues and possible duplicate issues
in this issue (If there are none, check this box anyway).
- [ ] I have tried to reproduce the issue with [pytest-celery](https://docs.celeryq.dev/projects/pytest-celery/en/latest/userguide/celery-bug-report.html) and added the reproduction script below.
## Mandatory Debugging Information
- [ ] I have included the output of ``celery -A proj report`` in the issue.
(if you are not able to do this, then at least specify the Celery
version affected).
- [x] I have verified that the issue exists against the `main` branch of Celery.
- [ ] I have included the contents of ``pip freeze`` in the issue.
- [ ] I have included all the versions of all the external dependencies required
to reproduce this bug.
## Optional Debugging Information
<!--
Try some of the below if you think they are relevant.
It will help us figure out the scope of the bug and how many users it affects.
-->
- [ ] I have tried reproducing the issue on more than one Python version
and/or implementation.
- [ ] I have tried reproducing the issue on more than one message broker and/or
result backend.
- [ ] I have tried reproducing the issue on more than one version of the message
broker and/or result backend.
- [ ] I have tried reproducing the issue on more than one operating system.
- [ ] I have tried reproducing the issue on more than one workers pool.
- [ ] I have tried reproducing the issue with autoscaling, retries,
ETA/Countdown & rate limits disabled.
- [ ] I have tried reproducing the issue after downgrading
and/or upgrading Celery and its dependencies.
## Related Issues and Possible Duplicates
<!--
Please make sure to search and mention any related issues
or possible duplicates to this issue as requested by the checklist above.
This may or may not include issues in other repositories that the Celery project
maintains or other repositories that are dependencies of Celery.
If you don't know how to mention issues, please refer to Github's documentation
on the subject: https://help.github.com/en/articles/autolinked-references-and-urls#issues-and-pull-requests
-->
#### Related Issues
- None
#### Possible Duplicates
- None
## Environment & Settings
<!-- Include the contents of celery --version below -->
**Celery version**:
5.4.0
<!-- Include the output of celery -A proj report below -->
<details>
<summary><b><code>celery report</code> Output:</b></summary>
<p>
```
```
</p>
</details>
# Steps to Reproduce
## Required Dependencies
<!-- Please fill the required dependencies to reproduce this issue -->
- **Minimal Python Version**: N/A or Unknown
- **Minimal Celery Version**:5.4.0
- **Minimal Kombu Version**: N/A or Unknown
- **Minimal Broker Version**: N/A or Unknown
- **Minimal Result Backend Version**: N/A or Unknown
- **Minimal OS and/or Kernel Version**: N/A or Unknown
- **Minimal Broker Client Version**: N/A or Unknown
- **Minimal Result Backend Client Version**: N/A or Unknown
### Python Packages
<!-- Please fill the contents of pip freeze below -->
<details>
<summary><b><code>pip freeze</code> Output:</b></summary>
<p>
```
```
</p>
</details>
### Other Dependencies
<!--
Please provide system dependencies, configuration files
and other dependency information if applicable
-->
<details>
<p>
N/A
</p>
</details>
## Minimally Reproducible Test Case
<!--
Please provide a reproducible test case.
Refer to the Reporting Bugs section in our contribution guide.
We prefer submitting test cases in the form of a PR to our integration test suite.
If you can provide one, please mention the PR number below.
If not, please attach the most minimal code example required to reproduce the issue below.
If the test case is too large, please include a link to a gist or a repository below.
Alternatively, the pytest-celery plugin can be used to create standalone reproduction scripts
that can be added to this report. See the pytest-celery documentation for more information at
pytest-celery.readthedocs.io
-->
<details>
<p>
```python
```
</p>
</details>
# Expected Behavior
<!-- Describe in detail what you expect to happen -->
Return the correct task uuid like before the release 5.4.0
# Actual Behavior
<!--
Describe in detail what actually happened.
Please include a backtrace and surround it with triple backticks (```).
In addition, include the Celery daemon logs, the broker logs,
the result backend logs and system logs below if they will help us debug
the issue.
-->
## Issue ⚠️
`AttributeError: 'NoneType' object has no attribute 'id'
```python
@app.task
def example_task(id):
try:
obj = Model.objects.get(id=id)
obj.number += 1
obj.save(update_fields=["number"])
except ObjectDoesNotExist as e:
return "str(e)"
task = example_task.delay_on_commit(example_model_instance.id)
example_model_instance.task_uuid = task.id
```
Literally basic minimal task 😄 , but the `delay_on_commit` not return the task uuid for `AsyncResult`, and in my case django raise excpetion (rightly) AttributeError -> maybe the task with `delay_on_commit` return `None`?
docs:
```python
class DjangoTask(Task):
"""
Extend the base :class:`~celery.app.task.Task` for Django.
Provide a nicer API to trigger tasks at the end of the DB transaction.
"""
def delay_on_commit(self, *args, **kwargs):
"""Call :meth:`~celery.app.task.Task.delay` with Django's ``on_commit()``."""
return transaction.on_commit(functools.partial(self.delay, *args, **kwargs))
def apply_async_on_commit(self, *args, **kwargs):
"""Call :meth:`~celery.app.task.Task.apply_async` with Django's ``on_commit()``."""
return transaction.on_commit(functools.partial(self.apply_async, *args, **kwargs))
```
</issue>
<code>
[start of celery/contrib/django/task.py]
1 import functools
2
3 from django.db import transaction
4
5 from celery.app.task import Task
6
7
8 class DjangoTask(Task):
9 """
10 Extend the base :class:`~celery.app.task.Task` for Django.
11
12 Provide a nicer API to trigger tasks at the end of the DB transaction.
13 """
14
15 def delay_on_commit(self, *args, **kwargs):
16 """Call :meth:`~celery.app.task.Task.delay` with Django's ``on_commit()``."""
17 return transaction.on_commit(functools.partial(self.delay, *args, **kwargs))
18
19 def apply_async_on_commit(self, *args, **kwargs):
20 """Call :meth:`~celery.app.task.Task.apply_async` with Django's ``on_commit()``."""
21 return transaction.on_commit(functools.partial(self.apply_async, *args, **kwargs))
22
[end of celery/contrib/django/task.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/celery/contrib/django/task.py b/celery/contrib/django/task.py
--- a/celery/contrib/django/task.py
+++ b/celery/contrib/django/task.py
@@ -12,10 +12,10 @@
Provide a nicer API to trigger tasks at the end of the DB transaction.
"""
- def delay_on_commit(self, *args, **kwargs):
+ def delay_on_commit(self, *args, **kwargs) -> None:
"""Call :meth:`~celery.app.task.Task.delay` with Django's ``on_commit()``."""
- return transaction.on_commit(functools.partial(self.delay, *args, **kwargs))
+ transaction.on_commit(functools.partial(self.delay, *args, **kwargs))
- def apply_async_on_commit(self, *args, **kwargs):
+ def apply_async_on_commit(self, *args, **kwargs) -> None:
"""Call :meth:`~celery.app.task.Task.apply_async` with Django's ``on_commit()``."""
- return transaction.on_commit(functools.partial(self.apply_async, *args, **kwargs))
+ transaction.on_commit(functools.partial(self.apply_async, *args, **kwargs))
| {"golden_diff": "diff --git a/celery/contrib/django/task.py b/celery/contrib/django/task.py\n--- a/celery/contrib/django/task.py\n+++ b/celery/contrib/django/task.py\n@@ -12,10 +12,10 @@\n Provide a nicer API to trigger tasks at the end of the DB transaction.\n \"\"\"\n \n- def delay_on_commit(self, *args, **kwargs):\n+ def delay_on_commit(self, *args, **kwargs) -> None:\n \"\"\"Call :meth:`~celery.app.task.Task.delay` with Django's ``on_commit()``.\"\"\"\n- return transaction.on_commit(functools.partial(self.delay, *args, **kwargs))\n+ transaction.on_commit(functools.partial(self.delay, *args, **kwargs))\n \n- def apply_async_on_commit(self, *args, **kwargs):\n+ def apply_async_on_commit(self, *args, **kwargs) -> None:\n \"\"\"Call :meth:`~celery.app.task.Task.apply_async` with Django's ``on_commit()``.\"\"\"\n- return transaction.on_commit(functools.partial(self.apply_async, *args, **kwargs))\n+ transaction.on_commit(functools.partial(self.apply_async, *args, **kwargs))\n", "issue": "New Django task with transaction atomic, return `None` instead of the task UUID\n<!--\r\nPlease fill this template entirely and do not erase parts of it.\r\nWe reserve the right to close without a response\r\nbug reports which are incomplete.\r\n-->\r\n# Checklist\r\n<!--\r\nTo check an item on the list replace [ ] with [x].\r\n-->\r\n- [x] I have verified that the issue exists against the `main` branch of Celery.\r\n- [ ] This has already been asked to the [discussions forum](https://github.com/celery/celery/discussions) first.\r\n- [x] I have read the relevant section in the\r\n [contribution guide](https://docs.celeryq.dev/en/main/contributing.html#other-bugs)\r\n on reporting bugs.\r\n- [x] I have checked the [issues list](https://github.com/celery/celery/issues?q=is%3Aissue+label%3A%22Issue+Type%3A+Bug+Report%22+-label%3A%22Category%3A+Documentation%22)\r\n for similar or identical bug reports.\r\n- [x] I have checked the [pull requests list](https://github.com/celery/celery/pulls?q=is%3Apr+label%3A%22PR+Type%3A+Bugfix%22+-label%3A%22Category%3A+Documentation%22)\r\n for existing proposed fixes.\r\n- [x] I have checked the [commit log](https://github.com/celery/celery/commits/main)\r\n to find out if the bug was already fixed in the main branch.\r\n- [ ] I have included all related issues and possible duplicate issues\r\n in this issue (If there are none, check this box anyway).\r\n- [ ] I have tried to reproduce the issue with [pytest-celery](https://docs.celeryq.dev/projects/pytest-celery/en/latest/userguide/celery-bug-report.html) and added the reproduction script below.\r\n\r\n## Mandatory Debugging Information\r\n\r\n- [ ] I have included the output of ``celery -A proj report`` in the issue.\r\n (if you are not able to do this, then at least specify the Celery\r\n version affected).\r\n- [x] I have verified that the issue exists against the `main` branch of Celery.\r\n- [ ] I have included the contents of ``pip freeze`` in the issue.\r\n- [ ] I have included all the versions of all the external dependencies required\r\n to reproduce this bug.\r\n\r\n## Optional Debugging Information\r\n<!--\r\nTry some of the below if you think they are relevant.\r\nIt will help us figure out the scope of the bug and how many users it affects.\r\n-->\r\n- [ ] I have tried reproducing the issue on more than one Python version\r\n and/or implementation.\r\n- [ ] I have tried reproducing the issue on more than one message broker and/or\r\n result backend.\r\n- [ ] I have tried reproducing the issue on more than one version of the message\r\n broker and/or result backend.\r\n- [ ] I have tried reproducing the issue on more than one operating system.\r\n- [ ] I have tried reproducing the issue on more than one workers pool.\r\n- [ ] I have tried reproducing the issue with autoscaling, retries,\r\n ETA/Countdown & rate limits disabled.\r\n- [ ] I have tried reproducing the issue after downgrading\r\n and/or upgrading Celery and its dependencies.\r\n\r\n## Related Issues and Possible Duplicates\r\n<!--\r\nPlease make sure to search and mention any related issues\r\nor possible duplicates to this issue as requested by the checklist above.\r\n\r\nThis may or may not include issues in other repositories that the Celery project\r\nmaintains or other repositories that are dependencies of Celery.\r\n\r\nIf you don't know how to mention issues, please refer to Github's documentation\r\non the subject: https://help.github.com/en/articles/autolinked-references-and-urls#issues-and-pull-requests\r\n-->\r\n\r\n#### Related Issues\r\n\r\n- None\r\n\r\n#### Possible Duplicates\r\n\r\n- None\r\n\r\n## Environment & Settings\r\n<!-- Include the contents of celery --version below -->\r\n**Celery version**:\r\n5.4.0\r\n<!-- Include the output of celery -A proj report below -->\r\n<details>\r\n<summary><b><code>celery report</code> Output:</b></summary>\r\n<p>\r\n\r\n```\r\n```\r\n\r\n</p>\r\n</details>\r\n\r\n# Steps to Reproduce\r\n\r\n## Required Dependencies\r\n<!-- Please fill the required dependencies to reproduce this issue -->\r\n- **Minimal Python Version**: N/A or Unknown\r\n- **Minimal Celery Version**:5.4.0\r\n- **Minimal Kombu Version**: N/A or Unknown\r\n- **Minimal Broker Version**: N/A or Unknown\r\n- **Minimal Result Backend Version**: N/A or Unknown\r\n- **Minimal OS and/or Kernel Version**: N/A or Unknown\r\n- **Minimal Broker Client Version**: N/A or Unknown\r\n- **Minimal Result Backend Client Version**: N/A or Unknown\r\n\r\n### Python Packages\r\n<!-- Please fill the contents of pip freeze below -->\r\n<details>\r\n<summary><b><code>pip freeze</code> Output:</b></summary>\r\n<p>\r\n\r\n```\r\n```\r\n\r\n</p>\r\n</details>\r\n\r\n### Other Dependencies\r\n<!--\r\nPlease provide system dependencies, configuration files\r\nand other dependency information if applicable\r\n-->\r\n<details>\r\n<p>\r\nN/A\r\n</p>\r\n</details>\r\n\r\n## Minimally Reproducible Test Case\r\n<!--\r\nPlease provide a reproducible test case.\r\nRefer to the Reporting Bugs section in our contribution guide.\r\n\r\nWe prefer submitting test cases in the form of a PR to our integration test suite.\r\nIf you can provide one, please mention the PR number below.\r\nIf not, please attach the most minimal code example required to reproduce the issue below.\r\nIf the test case is too large, please include a link to a gist or a repository below.\r\n\r\nAlternatively, the pytest-celery plugin can be used to create standalone reproduction scripts\r\nthat can be added to this report. See the pytest-celery documentation for more information at\r\npytest-celery.readthedocs.io\r\n-->\r\n\r\n<details>\r\n<p>\r\n\r\n```python\r\n```\r\n\r\n</p>\r\n</details>\r\n\r\n# Expected Behavior\r\n<!-- Describe in detail what you expect to happen -->\r\nReturn the correct task uuid like before the release 5.4.0\r\n# Actual Behavior\r\n<!--\r\nDescribe in detail what actually happened.\r\nPlease include a backtrace and surround it with triple backticks (```).\r\nIn addition, include the Celery daemon logs, the broker logs,\r\nthe result backend logs and system logs below if they will help us debug\r\nthe issue.\r\n-->\r\n## Issue \u26a0\ufe0f \r\n\r\n`AttributeError: 'NoneType' object has no attribute 'id'\r\n\r\n```python\r\[email protected]\r\ndef example_task(id):\r\n try:\r\n obj = Model.objects.get(id=id)\r\n obj.number += 1\r\n obj.save(update_fields=[\"number\"])\r\n except ObjectDoesNotExist as e:\r\n return \"str(e)\"\r\n\r\n\r\ntask = example_task.delay_on_commit(example_model_instance.id)\r\nexample_model_instance.task_uuid = task.id\r\n```\r\n\r\nLiterally basic minimal task \ud83d\ude04 , but the `delay_on_commit` not return the task uuid for `AsyncResult`, and in my case django raise excpetion (rightly) AttributeError -> maybe the task with `delay_on_commit` return `None`?\r\n\r\ndocs:\r\n```python\r\nclass DjangoTask(Task):\r\n \"\"\"\r\n Extend the base :class:`~celery.app.task.Task` for Django.\r\n\r\n Provide a nicer API to trigger tasks at the end of the DB transaction.\r\n \"\"\"\r\n\r\n def delay_on_commit(self, *args, **kwargs):\r\n \"\"\"Call :meth:`~celery.app.task.Task.delay` with Django's ``on_commit()``.\"\"\"\r\n return transaction.on_commit(functools.partial(self.delay, *args, **kwargs))\r\n\r\n def apply_async_on_commit(self, *args, **kwargs):\r\n \"\"\"Call :meth:`~celery.app.task.Task.apply_async` with Django's ``on_commit()``.\"\"\"\r\n return transaction.on_commit(functools.partial(self.apply_async, *args, **kwargs))\r\n```\n", "before_files": [{"content": "import functools\n\nfrom django.db import transaction\n\nfrom celery.app.task import Task\n\n\nclass DjangoTask(Task):\n \"\"\"\n Extend the base :class:`~celery.app.task.Task` for Django.\n\n Provide a nicer API to trigger tasks at the end of the DB transaction.\n \"\"\"\n\n def delay_on_commit(self, *args, **kwargs):\n \"\"\"Call :meth:`~celery.app.task.Task.delay` with Django's ``on_commit()``.\"\"\"\n return transaction.on_commit(functools.partial(self.delay, *args, **kwargs))\n\n def apply_async_on_commit(self, *args, **kwargs):\n \"\"\"Call :meth:`~celery.app.task.Task.apply_async` with Django's ``on_commit()``.\"\"\"\n return transaction.on_commit(functools.partial(self.apply_async, *args, **kwargs))\n", "path": "celery/contrib/django/task.py"}]} | 2,452 | 267 |
gh_patches_debug_40278 | rasdani/github-patches | git_diff | networkx__networkx-3362 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Closeness centrality assumes symmetric distance when "distance" parameter is used
At the beginning of `nx.closeness_centrality` code there is this logic:
```python
if distance is not None:
# use Dijkstra's algorithm with specified attribute as edge weight
path_length = functools.partial(nx.single_source_dijkstra_path_length,
weight=distance)
else: # handle either directed or undirected
if G.is_directed() and not reverse:
path_length = nx.single_target_shortest_path_length
else:
path_length = nx.single_source_shortest_path_length
```
This means that if `distance` parameter is passed then the direction of the edges is ignored, and the `reverse` parameter has no effect.
Is this a design decision? I have directed networks with non-symmetric distances and am interested in both inbound and outbound centralities. It looks to me this would be a simple change (checking `reverse` and using `nx.single_target_dijkstra_path_length` if needed). Am willing to make a PR if this is deemed an appropriate change.
</issue>
<code>
[start of networkx/algorithms/centrality/closeness.py]
1 # Copyright (C) 2004-2018 by
2 # Aric Hagberg <[email protected]>
3 # Dan Schult <[email protected]>
4 # Pieter Swart <[email protected]>
5 # All rights reserved.
6 # BSD license.
7 #
8 # Authors: Aric Hagberg <[email protected]>
9 # Pieter Swart <[email protected]>
10 # Sasha Gutfraind <[email protected]>
11 # Dan Schult <[email protected]>
12 """
13 Closeness centrality measures.
14 """
15 import functools
16 import networkx as nx
17
18 __all__ = ['closeness_centrality']
19
20
21 def closeness_centrality(G, u=None, distance=None,
22 wf_improved=True, reverse=False):
23 r"""Compute closeness centrality for nodes.
24
25 Closeness centrality [1]_ of a node `u` is the reciprocal of the
26 average shortest path distance to `u` over all `n-1` reachable nodes.
27
28 .. math::
29
30 C(u) = \frac{n - 1}{\sum_{v=1}^{n-1} d(v, u)},
31
32 where `d(v, u)` is the shortest-path distance between `v` and `u`,
33 and `n` is the number of nodes that can reach `u`.
34
35 Notice that higher values of closeness indicate higher centrality.
36
37 Wasserman and Faust propose an improved formula for graphs with
38 more than one connected component. The result is "a ratio of the
39 fraction of actors in the group who are reachable, to the average
40 distance" from the reachable actors [2]_. You might think this
41 scale factor is inverted but it is not. As is, nodes from small
42 components receive a smaller closeness value. Letting `N` denote
43 the number of nodes in the graph,
44
45 .. math::
46
47 C_{WF}(u) = \frac{n-1}{N-1} \frac{n - 1}{\sum_{v=1}^{n-1} d(v, u)},
48
49 Parameters
50 ----------
51 G : graph
52 A NetworkX graph
53
54 u : node, optional
55 Return only the value for node u
56
57 distance : edge attribute key, optional (default=None)
58 Use the specified edge attribute as the edge distance in shortest
59 path calculations
60
61 wf_improved : bool, optional (default=True)
62 If True, scale by the fraction of nodes reachable. This gives the
63 Wasserman and Faust improved formula. For single component graphs
64 it is the same as the original formula.
65
66 reverse : bool, optional (default=False)
67 If True and G is a digraph, reverse the edges of G, using successors
68 instead of predecessors.
69
70 Returns
71 -------
72 nodes : dictionary
73 Dictionary of nodes with closeness centrality as the value.
74
75 See Also
76 --------
77 betweenness_centrality, load_centrality, eigenvector_centrality,
78 degree_centrality
79
80 Notes
81 -----
82 The closeness centrality is normalized to `(n-1)/(|G|-1)` where
83 `n` is the number of nodes in the connected part of graph
84 containing the node. If the graph is not completely connected,
85 this algorithm computes the closeness centrality for each
86 connected part separately scaled by that parts size.
87
88 If the 'distance' keyword is set to an edge attribute key then the
89 shortest-path length will be computed using Dijkstra's algorithm with
90 that edge attribute as the edge weight.
91
92 References
93 ----------
94 .. [1] Linton C. Freeman: Centrality in networks: I.
95 Conceptual clarification. Social Networks 1:215-239, 1979.
96 http://leonidzhukov.ru/hse/2013/socialnetworks/papers/freeman79-centrality.pdf
97 .. [2] pg. 201 of Wasserman, S. and Faust, K.,
98 Social Network Analysis: Methods and Applications, 1994,
99 Cambridge University Press.
100 """
101 if distance is not None:
102 # use Dijkstra's algorithm with specified attribute as edge weight
103 path_length = functools.partial(nx.single_source_dijkstra_path_length,
104 weight=distance)
105 else: # handle either directed or undirected
106 if G.is_directed() and not reverse:
107 path_length = nx.single_target_shortest_path_length
108 else:
109 path_length = nx.single_source_shortest_path_length
110
111 if u is None:
112 nodes = G.nodes()
113 else:
114 nodes = [u]
115 closeness_centrality = {}
116 for n in nodes:
117 sp = dict(path_length(G, n))
118 totsp = sum(sp.values())
119 if totsp > 0.0 and len(G) > 1:
120 closeness_centrality[n] = (len(sp) - 1.0) / totsp
121 # normalize to number of nodes-1 in connected part
122 if wf_improved:
123 s = (len(sp) - 1.0) / (len(G) - 1)
124 closeness_centrality[n] *= s
125 else:
126 closeness_centrality[n] = 0.0
127 if u is not None:
128 return closeness_centrality[u]
129 else:
130 return closeness_centrality
131
[end of networkx/algorithms/centrality/closeness.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/networkx/algorithms/centrality/closeness.py b/networkx/algorithms/centrality/closeness.py
--- a/networkx/algorithms/centrality/closeness.py
+++ b/networkx/algorithms/centrality/closeness.py
@@ -18,8 +18,7 @@
__all__ = ['closeness_centrality']
-def closeness_centrality(G, u=None, distance=None,
- wf_improved=True, reverse=False):
+def closeness_centrality(G, u=None, distance=None, wf_improved=True):
r"""Compute closeness centrality for nodes.
Closeness centrality [1]_ of a node `u` is the reciprocal of the
@@ -30,7 +29,9 @@
C(u) = \frac{n - 1}{\sum_{v=1}^{n-1} d(v, u)},
where `d(v, u)` is the shortest-path distance between `v` and `u`,
- and `n` is the number of nodes that can reach `u`.
+ and `n` is the number of nodes that can reach `u`. Notice that the
+ closeness distance function computes the incoming distance to `u`
+ for directed graphs. To use outward distance, act on `G.reverse()`.
Notice that higher values of closeness indicate higher centrality.
@@ -63,10 +64,6 @@
Wasserman and Faust improved formula. For single component graphs
it is the same as the original formula.
- reverse : bool, optional (default=False)
- If True and G is a digraph, reverse the edges of G, using successors
- instead of predecessors.
-
Returns
-------
nodes : dictionary
@@ -89,6 +86,10 @@
shortest-path length will be computed using Dijkstra's algorithm with
that edge attribute as the edge weight.
+ In NetworkX 2.2 and earlier a bug caused Dijkstra's algorithm to use the
+ outward distance rather than the inward distance. If you use a 'distance'
+ keyword and a DiGraph, your results will change between v2.2 and v2.3.
+
References
----------
.. [1] Linton C. Freeman: Centrality in networks: I.
@@ -98,18 +99,18 @@
Social Network Analysis: Methods and Applications, 1994,
Cambridge University Press.
"""
+ if G.is_directed():
+ G = G.reverse() # create a reversed graph view
+
if distance is not None:
# use Dijkstra's algorithm with specified attribute as edge weight
path_length = functools.partial(nx.single_source_dijkstra_path_length,
weight=distance)
- else: # handle either directed or undirected
- if G.is_directed() and not reverse:
- path_length = nx.single_target_shortest_path_length
- else:
- path_length = nx.single_source_shortest_path_length
+ else:
+ path_length = nx.single_source_shortest_path_length
if u is None:
- nodes = G.nodes()
+ nodes = G.nodes
else:
nodes = [u]
closeness_centrality = {}
| {"golden_diff": "diff --git a/networkx/algorithms/centrality/closeness.py b/networkx/algorithms/centrality/closeness.py\n--- a/networkx/algorithms/centrality/closeness.py\n+++ b/networkx/algorithms/centrality/closeness.py\n@@ -18,8 +18,7 @@\n __all__ = ['closeness_centrality']\n \n \n-def closeness_centrality(G, u=None, distance=None,\n- wf_improved=True, reverse=False):\n+def closeness_centrality(G, u=None, distance=None, wf_improved=True):\n r\"\"\"Compute closeness centrality for nodes.\n \n Closeness centrality [1]_ of a node `u` is the reciprocal of the\n@@ -30,7 +29,9 @@\n C(u) = \\frac{n - 1}{\\sum_{v=1}^{n-1} d(v, u)},\n \n where `d(v, u)` is the shortest-path distance between `v` and `u`,\n- and `n` is the number of nodes that can reach `u`.\n+ and `n` is the number of nodes that can reach `u`. Notice that the\n+ closeness distance function computes the incoming distance to `u`\n+ for directed graphs. To use outward distance, act on `G.reverse()`.\n \n Notice that higher values of closeness indicate higher centrality.\n \n@@ -63,10 +64,6 @@\n Wasserman and Faust improved formula. For single component graphs\n it is the same as the original formula. \n \n- reverse : bool, optional (default=False)\n- If True and G is a digraph, reverse the edges of G, using successors\n- instead of predecessors.\n-\n Returns\n -------\n nodes : dictionary\n@@ -89,6 +86,10 @@\n shortest-path length will be computed using Dijkstra's algorithm with\n that edge attribute as the edge weight.\n \n+ In NetworkX 2.2 and earlier a bug caused Dijkstra's algorithm to use the\n+ outward distance rather than the inward distance. If you use a 'distance'\n+ keyword and a DiGraph, your results will change between v2.2 and v2.3.\n+\n References\n ----------\n .. [1] Linton C. Freeman: Centrality in networks: I.\n@@ -98,18 +99,18 @@\n Social Network Analysis: Methods and Applications, 1994,\n Cambridge University Press.\n \"\"\"\n+ if G.is_directed():\n+ G = G.reverse() # create a reversed graph view\n+\n if distance is not None:\n # use Dijkstra's algorithm with specified attribute as edge weight\n path_length = functools.partial(nx.single_source_dijkstra_path_length,\n weight=distance)\n- else: # handle either directed or undirected\n- if G.is_directed() and not reverse:\n- path_length = nx.single_target_shortest_path_length\n- else:\n- path_length = nx.single_source_shortest_path_length\n+ else:\n+ path_length = nx.single_source_shortest_path_length\n \n if u is None:\n- nodes = G.nodes()\n+ nodes = G.nodes\n else:\n nodes = [u]\n closeness_centrality = {}\n", "issue": "Closeness centrality assumes symmetric distance when \"distance\" parameter is used\nAt the beginning of `nx.closeness_centrality` code there is this logic:\r\n\r\n```python\r\n if distance is not None:\r\n # use Dijkstra's algorithm with specified attribute as edge weight\r\n path_length = functools.partial(nx.single_source_dijkstra_path_length,\r\n weight=distance)\r\n else: # handle either directed or undirected\r\n if G.is_directed() and not reverse:\r\n path_length = nx.single_target_shortest_path_length\r\n else:\r\n path_length = nx.single_source_shortest_path_length\r\n```\r\n\r\nThis means that if `distance` parameter is passed then the direction of the edges is ignored, and the `reverse` parameter has no effect.\r\n\r\nIs this a design decision? I have directed networks with non-symmetric distances and am interested in both inbound and outbound centralities. It looks to me this would be a simple change (checking `reverse` and using `nx.single_target_dijkstra_path_length` if needed). Am willing to make a PR if this is deemed an appropriate change.\n", "before_files": [{"content": "# Copyright (C) 2004-2018 by\n# Aric Hagberg <[email protected]>\n# Dan Schult <[email protected]>\n# Pieter Swart <[email protected]>\n# All rights reserved.\n# BSD license.\n#\n# Authors: Aric Hagberg <[email protected]>\n# Pieter Swart <[email protected]>\n# Sasha Gutfraind <[email protected]>\n# Dan Schult <[email protected]>\n\"\"\"\nCloseness centrality measures.\n\"\"\"\nimport functools\nimport networkx as nx\n\n__all__ = ['closeness_centrality']\n\n\ndef closeness_centrality(G, u=None, distance=None,\n wf_improved=True, reverse=False):\n r\"\"\"Compute closeness centrality for nodes.\n\n Closeness centrality [1]_ of a node `u` is the reciprocal of the\n average shortest path distance to `u` over all `n-1` reachable nodes.\n\n .. math::\n\n C(u) = \\frac{n - 1}{\\sum_{v=1}^{n-1} d(v, u)},\n\n where `d(v, u)` is the shortest-path distance between `v` and `u`,\n and `n` is the number of nodes that can reach `u`.\n\n Notice that higher values of closeness indicate higher centrality.\n\n Wasserman and Faust propose an improved formula for graphs with\n more than one connected component. The result is \"a ratio of the\n fraction of actors in the group who are reachable, to the average\n distance\" from the reachable actors [2]_. You might think this\n scale factor is inverted but it is not. As is, nodes from small\n components receive a smaller closeness value. Letting `N` denote\n the number of nodes in the graph,\n\n .. math::\n\n C_{WF}(u) = \\frac{n-1}{N-1} \\frac{n - 1}{\\sum_{v=1}^{n-1} d(v, u)},\n\n Parameters\n ----------\n G : graph\n A NetworkX graph\n\n u : node, optional\n Return only the value for node u\n\n distance : edge attribute key, optional (default=None)\n Use the specified edge attribute as the edge distance in shortest\n path calculations\n\n wf_improved : bool, optional (default=True)\n If True, scale by the fraction of nodes reachable. This gives the\n Wasserman and Faust improved formula. For single component graphs\n it is the same as the original formula. \n\n reverse : bool, optional (default=False)\n If True and G is a digraph, reverse the edges of G, using successors\n instead of predecessors.\n\n Returns\n -------\n nodes : dictionary\n Dictionary of nodes with closeness centrality as the value.\n\n See Also\n --------\n betweenness_centrality, load_centrality, eigenvector_centrality,\n degree_centrality\n\n Notes\n -----\n The closeness centrality is normalized to `(n-1)/(|G|-1)` where\n `n` is the number of nodes in the connected part of graph\n containing the node. If the graph is not completely connected,\n this algorithm computes the closeness centrality for each\n connected part separately scaled by that parts size.\n\n If the 'distance' keyword is set to an edge attribute key then the\n shortest-path length will be computed using Dijkstra's algorithm with\n that edge attribute as the edge weight.\n\n References\n ----------\n .. [1] Linton C. Freeman: Centrality in networks: I.\n Conceptual clarification. Social Networks 1:215-239, 1979.\n http://leonidzhukov.ru/hse/2013/socialnetworks/papers/freeman79-centrality.pdf\n .. [2] pg. 201 of Wasserman, S. and Faust, K.,\n Social Network Analysis: Methods and Applications, 1994,\n Cambridge University Press.\n \"\"\"\n if distance is not None:\n # use Dijkstra's algorithm with specified attribute as edge weight\n path_length = functools.partial(nx.single_source_dijkstra_path_length,\n weight=distance)\n else: # handle either directed or undirected\n if G.is_directed() and not reverse:\n path_length = nx.single_target_shortest_path_length\n else:\n path_length = nx.single_source_shortest_path_length\n\n if u is None:\n nodes = G.nodes()\n else:\n nodes = [u]\n closeness_centrality = {}\n for n in nodes:\n sp = dict(path_length(G, n))\n totsp = sum(sp.values())\n if totsp > 0.0 and len(G) > 1:\n closeness_centrality[n] = (len(sp) - 1.0) / totsp\n # normalize to number of nodes-1 in connected part\n if wf_improved:\n s = (len(sp) - 1.0) / (len(G) - 1)\n closeness_centrality[n] *= s\n else:\n closeness_centrality[n] = 0.0\n if u is not None:\n return closeness_centrality[u]\n else:\n return closeness_centrality\n", "path": "networkx/algorithms/centrality/closeness.py"}]} | 2,279 | 730 |
gh_patches_debug_37144 | rasdani/github-patches | git_diff | mne-tools__mne-python-11517 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
MAINT: Switch to setuptools_scm
See for example
https://github.com/LABSN/tdtpy/pull/20
It basically does the `.dev` and versions for us automatically based on tags.
I think we *do* want to write `_version.py` in order to avoid people needing `setuptools_scm` (and new-ish setuptools or whatever) for our released versions. This is how `tdtpy` does it above. But I haven't totally thought it through...
We could maybe also transition to a `pyproject.toml` while we're at it.
</issue>
<code>
[start of setup.py]
1 #!/usr/bin/env python
2
3 # Copyright (C) 2011-2020 Alexandre Gramfort
4 # <[email protected]>
5
6 import os
7 import os.path as op
8
9 from setuptools import setup
10
11
12 def parse_requirements_file(fname):
13 requirements = list()
14 with open(fname, 'r') as fid:
15 for line in fid:
16 req = line.strip()
17 if req.startswith('#'):
18 continue
19 # strip end-of-line comments
20 req = req.split('#', maxsplit=1)[0].strip()
21 requirements.append(req)
22 return requirements
23
24
25 # get the version (don't import mne here, so dependencies are not needed)
26 version = None
27 with open(op.join('mne', '_version.py'), 'r') as fid:
28 for line in (line.strip() for line in fid):
29 if line.startswith('__version__'):
30 version = line.split('=')[1].strip().strip('\'')
31 break
32 if version is None:
33 raise RuntimeError('Could not determine version')
34
35
36 DISTNAME = 'mne'
37 DESCRIPTION = 'MNE-Python project for MEG and EEG data analysis.'
38 MAINTAINER = 'Alexandre Gramfort'
39 MAINTAINER_EMAIL = '[email protected]'
40 URL = 'https://mne.tools/dev/'
41 LICENSE = 'BSD-3-Clause'
42 DOWNLOAD_URL = 'http://github.com/mne-tools/mne-python'
43 VERSION = version
44
45
46 def package_tree(pkgroot):
47 """Get the submodule list."""
48 # Adapted from VisPy
49 path = op.dirname(__file__)
50 subdirs = [op.relpath(i[0], path).replace(op.sep, '.')
51 for i in os.walk(op.join(path, pkgroot))
52 if '__init__.py' in i[2]]
53 return sorted(subdirs)
54
55
56 if __name__ == "__main__":
57 if op.exists('MANIFEST'):
58 os.remove('MANIFEST')
59
60 with open('README.rst', 'r') as fid:
61 long_description = fid.read()
62
63 # data_dependencies is empty, but let's leave them so that we don't break
64 # people's workflows who did `pip install mne[data]`
65 install_requires = parse_requirements_file('requirements_base.txt')
66 data_requires = []
67 hdf5_requires = parse_requirements_file('requirements_hdf5.txt')
68 test_requires = (parse_requirements_file('requirements_testing.txt') +
69 parse_requirements_file('requirements_testing_extra.txt'))
70 setup(name=DISTNAME,
71 maintainer=MAINTAINER,
72 include_package_data=True,
73 maintainer_email=MAINTAINER_EMAIL,
74 description=DESCRIPTION,
75 license=LICENSE,
76 url=URL,
77 version=VERSION,
78 download_url=DOWNLOAD_URL,
79 long_description=long_description,
80 long_description_content_type='text/x-rst',
81 zip_safe=False, # the package can run out of an .egg file
82 classifiers=['Intended Audience :: Science/Research',
83 'Intended Audience :: Developers',
84 'License :: OSI Approved',
85 'Programming Language :: Python',
86 'Topic :: Software Development',
87 'Topic :: Scientific/Engineering',
88 'Operating System :: Microsoft :: Windows',
89 'Operating System :: POSIX',
90 'Operating System :: Unix',
91 'Operating System :: MacOS',
92 'Programming Language :: Python :: 3',
93 ],
94 keywords='neuroscience neuroimaging MEG EEG ECoG fNIRS brain',
95 project_urls={
96 'Documentation': 'https://mne.tools/',
97 'Source': 'https://github.com/mne-tools/mne-python/',
98 'Tracker': 'https://github.com/mne-tools/mne-python/issues/',
99 },
100 platforms='any',
101 python_requires='>=3.7',
102 install_requires=install_requires,
103 extras_require={
104 'data': data_requires,
105 'hdf5': hdf5_requires,
106 'test': test_requires,
107 },
108 packages=package_tree('mne'),
109 package_data={'mne': [
110 op.join('data', 'eegbci_checksums.txt'),
111 op.join('data', '*.sel'),
112 op.join('data', 'icos.fif.gz'),
113 op.join('data', 'coil_def*.dat'),
114 op.join('data', 'helmets', '*.fif.gz'),
115 op.join('data', 'FreeSurferColorLUT.txt'),
116 op.join('data', 'image', '*gif'),
117 op.join('data', 'image', '*lout'),
118 op.join('data', 'fsaverage', '*.fif'),
119 op.join('channels', 'data', 'layouts', '*.lout'),
120 op.join('channels', 'data', 'layouts', '*.lay'),
121 op.join('channels', 'data', 'montages', '*.sfp'),
122 op.join('channels', 'data', 'montages', '*.txt'),
123 op.join('channels', 'data', 'montages', '*.elc'),
124 op.join('channels', 'data', 'neighbors', '*.mat'),
125 op.join('datasets', 'sleep_physionet', 'SHA1SUMS'),
126 op.join('datasets', '_fsaverage', '*.txt'),
127 op.join('datasets', '_infant', '*.txt'),
128 op.join('datasets', '_phantom', '*.txt'),
129 op.join('html', '*.js'),
130 op.join('html', '*.css'),
131 op.join('html_templates', 'repr', '*.jinja'),
132 op.join('html_templates', 'report', '*.jinja'),
133 op.join('icons', '*.svg'),
134 op.join('icons', '*.png'),
135 op.join('io', 'artemis123', 'resources', '*.csv'),
136 op.join('io', 'edf', 'gdf_encodes.txt')
137 ]},
138 entry_points={'console_scripts': [
139 'mne = mne.commands.utils:main',
140 ]})
141
[end of setup.py]
[start of mne/_version.py]
1 """The version number."""
2 # Authors: Eric Larson <[email protected]>
3 #
4 # License: BSD-3-Clause
5
6 __version__ = '1.4.dev0'
7
[end of mne/_version.py]
[start of mne/__init__.py]
1 """MNE software for MEG and EEG data analysis."""
2
3 # PEP0440 compatible formatted version, see:
4 # https://www.python.org/dev/peps/pep-0440/
5 #
6 # Generic release markers:
7 # X.Y
8 # X.Y.Z # For bugfix releases
9 #
10 # Admissible pre-release markers:
11 # X.YaN # Alpha release
12 # X.YbN # Beta release
13 # X.YrcN # Release Candidate
14 # X.Y # Final release
15 #
16 # Dev branch marker is: 'X.Y.devN' where N is an integer.
17 #
18
19 from ._version import __version__
20
21 # have to import verbose first since it's needed by many things
22 from .utils import (set_log_level, set_log_file, verbose, set_config,
23 get_config, get_config_path, set_cache_dir,
24 set_memmap_min_size, grand_average, sys_info, open_docs,
25 use_log_level)
26 from .io.pick import (pick_types, pick_channels,
27 pick_channels_regexp, pick_channels_forward,
28 pick_types_forward, pick_channels_cov,
29 pick_channels_evoked, pick_info,
30 channel_type, channel_indices_by_type)
31 from .io.base import concatenate_raws
32 from .io.meas_info import create_info, Info
33 from .io.proj import Projection
34 from .io.kit import read_epochs_kit
35 from .io.eeglab import read_epochs_eeglab
36 from .io.reference import (set_eeg_reference, set_bipolar_reference,
37 add_reference_channels)
38 from .io.what import what
39 from .bem import (make_sphere_model, make_bem_model, make_bem_solution,
40 read_bem_surfaces, write_bem_surfaces, write_head_bem,
41 read_bem_solution, write_bem_solution)
42 from .cov import (read_cov, write_cov, Covariance, compute_raw_covariance,
43 compute_covariance, whiten_evoked, make_ad_hoc_cov)
44 from .event import (read_events, write_events, find_events, merge_events,
45 pick_events, make_fixed_length_events, concatenate_events,
46 find_stim_steps, AcqParserFIF, count_events)
47 from ._freesurfer import (head_to_mni, head_to_mri, read_talxfm,
48 get_volume_labels_from_aseg, read_freesurfer_lut,
49 vertex_to_mni, read_lta)
50 from .forward import (read_forward_solution, apply_forward, apply_forward_raw,
51 average_forward_solutions, Forward,
52 write_forward_solution, make_forward_solution,
53 convert_forward_solution, make_field_map,
54 make_forward_dipole, use_coil_def)
55 from .source_estimate import (read_source_estimate,
56 SourceEstimate, VectorSourceEstimate,
57 VolSourceEstimate, VolVectorSourceEstimate,
58 MixedSourceEstimate, MixedVectorSourceEstimate,
59 grade_to_tris,
60 spatial_src_adjacency,
61 spatial_tris_adjacency,
62 spatial_dist_adjacency,
63 spatial_inter_hemi_adjacency,
64 spatio_temporal_src_adjacency,
65 spatio_temporal_tris_adjacency,
66 spatio_temporal_dist_adjacency,
67 extract_label_time_course, stc_near_sensors)
68 from .surface import (read_surface, write_surface, decimate_surface, read_tri,
69 get_head_surf, get_meg_helmet_surf, dig_mri_distances,
70 warp_montage_volume, get_montage_volume_labels)
71 from .morph_map import read_morph_map
72 from .morph import (SourceMorph, read_source_morph, grade_to_vertices,
73 compute_source_morph)
74 from .source_space import (read_source_spaces,
75 write_source_spaces, setup_source_space,
76 setup_volume_source_space, SourceSpaces,
77 add_source_space_distances, morph_source_spaces,
78 get_volume_labels_from_src)
79 from .annotations import (Annotations, read_annotations, annotations_from_events,
80 events_from_annotations)
81 from .epochs import (BaseEpochs, Epochs, EpochsArray, read_epochs,
82 concatenate_epochs, make_fixed_length_epochs)
83 from .evoked import (Evoked, EvokedArray, read_evokeds, write_evokeds,
84 combine_evoked)
85 from .label import (read_label, label_sign_flip,
86 write_label, stc_to_label, grow_labels, Label, split_label,
87 BiHemiLabel, read_labels_from_annot, write_labels_to_annot,
88 random_parcellation, morph_labels, labels_to_stc)
89 from .misc import parse_config, read_reject_parameters
90 from .coreg import (create_default_subject, scale_bem, scale_mri, scale_labels,
91 scale_source_space)
92 from .transforms import (read_trans, write_trans,
93 transform_surface_to, Transform)
94 from .proj import (read_proj, write_proj, compute_proj_epochs,
95 compute_proj_evoked, compute_proj_raw, sensitivity_map)
96 from .dipole import read_dipole, Dipole, DipoleFixed, fit_dipole
97 from .channels import (equalize_channels, rename_channels, find_layout,
98 read_vectorview_selection)
99 from .report import Report, open_report
100
101 from .io import (read_epochs_fieldtrip, read_evoked_besa,
102 read_evoked_fieldtrip, read_evokeds_mff)
103 from .rank import compute_rank
104
105 from . import beamformer
106 from . import channels
107 from . import chpi
108 from . import commands
109 from . import coreg
110 from . import cuda
111 from . import datasets
112 from . import dipole
113 from . import epochs
114 from . import event
115 from . import io
116 from . import filter
117 from . import gui
118 from . import inverse_sparse
119 from . import minimum_norm
120 from . import preprocessing
121 from . import simulation
122 from . import stats
123 from . import surface
124 from . import time_frequency
125 from . import viz
126 from . import decoding
127 from . import export
128
129 # initialize logging
130 set_log_level(None, False)
131 set_log_file()
132
[end of mne/__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/__init__.py b/mne/__init__.py
--- a/mne/__init__.py
+++ b/mne/__init__.py
@@ -16,7 +16,14 @@
# Dev branch marker is: 'X.Y.devN' where N is an integer.
#
-from ._version import __version__
+try:
+ from importlib.metadata import version
+ __version__ = version("mne")
+except Exception:
+ try:
+ from ._version import __version__
+ except ImportError:
+ __version__ = '0.0.0'
# have to import verbose first since it's needed by many things
from .utils import (set_log_level, set_log_file, verbose, set_config,
diff --git a/mne/_version.py b/mne/_version.py
deleted file mode 100644
--- a/mne/_version.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""The version number."""
-# Authors: Eric Larson <[email protected]>
-#
-# License: BSD-3-Clause
-
-__version__ = '1.4.dev0'
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -22,17 +22,6 @@
return requirements
-# get the version (don't import mne here, so dependencies are not needed)
-version = None
-with open(op.join('mne', '_version.py'), 'r') as fid:
- for line in (line.strip() for line in fid):
- if line.startswith('__version__'):
- version = line.split('=')[1].strip().strip('\'')
- break
-if version is None:
- raise RuntimeError('Could not determine version')
-
-
DISTNAME = 'mne'
DESCRIPTION = 'MNE-Python project for MEG and EEG data analysis.'
MAINTAINER = 'Alexandre Gramfort'
@@ -40,7 +29,6 @@
URL = 'https://mne.tools/dev/'
LICENSE = 'BSD-3-Clause'
DOWNLOAD_URL = 'http://github.com/mne-tools/mne-python'
-VERSION = version
def package_tree(pkgroot):
@@ -74,7 +62,6 @@
description=DESCRIPTION,
license=LICENSE,
url=URL,
- version=VERSION,
download_url=DOWNLOAD_URL,
long_description=long_description,
long_description_content_type='text/x-rst',
@@ -100,6 +87,11 @@
platforms='any',
python_requires='>=3.7',
install_requires=install_requires,
+ setup_requires=["setuptools>=45", "setuptools_scm>=6.2"],
+ use_scm_version={
+ "write_to": "mne/_version.py",
+ "version_scheme": "release-branch-semver",
+ },
extras_require={
'data': data_requires,
'hdf5': hdf5_requires,
| {"golden_diff": "diff --git a/mne/__init__.py b/mne/__init__.py\n--- a/mne/__init__.py\n+++ b/mne/__init__.py\n@@ -16,7 +16,14 @@\n # Dev branch marker is: 'X.Y.devN' where N is an integer.\n #\n \n-from ._version import __version__\n+try:\n+ from importlib.metadata import version\n+ __version__ = version(\"mne\")\n+except Exception:\n+ try:\n+ from ._version import __version__\n+ except ImportError:\n+ __version__ = '0.0.0'\n \n # have to import verbose first since it's needed by many things\n from .utils import (set_log_level, set_log_file, verbose, set_config,\ndiff --git a/mne/_version.py b/mne/_version.py\ndeleted file mode 100644\n--- a/mne/_version.py\n+++ /dev/null\n@@ -1,6 +0,0 @@\n-\"\"\"The version number.\"\"\"\n-# Authors: Eric Larson <[email protected]>\n-#\n-# License: BSD-3-Clause\n-\n-__version__ = '1.4.dev0'\ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -22,17 +22,6 @@\n return requirements\n \n \n-# get the version (don't import mne here, so dependencies are not needed)\n-version = None\n-with open(op.join('mne', '_version.py'), 'r') as fid:\n- for line in (line.strip() for line in fid):\n- if line.startswith('__version__'):\n- version = line.split('=')[1].strip().strip('\\'')\n- break\n-if version is None:\n- raise RuntimeError('Could not determine version')\n-\n-\n DISTNAME = 'mne'\n DESCRIPTION = 'MNE-Python project for MEG and EEG data analysis.'\n MAINTAINER = 'Alexandre Gramfort'\n@@ -40,7 +29,6 @@\n URL = 'https://mne.tools/dev/'\n LICENSE = 'BSD-3-Clause'\n DOWNLOAD_URL = 'http://github.com/mne-tools/mne-python'\n-VERSION = version\n \n \n def package_tree(pkgroot):\n@@ -74,7 +62,6 @@\n description=DESCRIPTION,\n license=LICENSE,\n url=URL,\n- version=VERSION,\n download_url=DOWNLOAD_URL,\n long_description=long_description,\n long_description_content_type='text/x-rst',\n@@ -100,6 +87,11 @@\n platforms='any',\n python_requires='>=3.7',\n install_requires=install_requires,\n+ setup_requires=[\"setuptools>=45\", \"setuptools_scm>=6.2\"],\n+ use_scm_version={\n+ \"write_to\": \"mne/_version.py\",\n+ \"version_scheme\": \"release-branch-semver\",\n+ },\n extras_require={\n 'data': data_requires,\n 'hdf5': hdf5_requires,\n", "issue": "MAINT: Switch to setuptools_scm\nSee for example\r\n\r\nhttps://github.com/LABSN/tdtpy/pull/20\r\n\r\nIt basically does the `.dev` and versions for us automatically based on tags.\r\n\r\nI think we *do* want to write `_version.py` in order to avoid people needing `setuptools_scm` (and new-ish setuptools or whatever) for our released versions. This is how `tdtpy` does it above. But I haven't totally thought it through...\r\n\r\nWe could maybe also transition to a `pyproject.toml` while we're at it.\n", "before_files": [{"content": "#!/usr/bin/env python\n\n# Copyright (C) 2011-2020 Alexandre Gramfort\n# <[email protected]>\n\nimport os\nimport os.path as op\n\nfrom setuptools import setup\n\n\ndef parse_requirements_file(fname):\n requirements = list()\n with open(fname, 'r') as fid:\n for line in fid:\n req = line.strip()\n if req.startswith('#'):\n continue\n # strip end-of-line comments\n req = req.split('#', maxsplit=1)[0].strip()\n requirements.append(req)\n return requirements\n\n\n# get the version (don't import mne here, so dependencies are not needed)\nversion = None\nwith open(op.join('mne', '_version.py'), 'r') as fid:\n for line in (line.strip() for line in fid):\n if line.startswith('__version__'):\n version = line.split('=')[1].strip().strip('\\'')\n break\nif version is None:\n raise RuntimeError('Could not determine version')\n\n\nDISTNAME = 'mne'\nDESCRIPTION = 'MNE-Python project for MEG and EEG data analysis.'\nMAINTAINER = 'Alexandre Gramfort'\nMAINTAINER_EMAIL = '[email protected]'\nURL = 'https://mne.tools/dev/'\nLICENSE = 'BSD-3-Clause'\nDOWNLOAD_URL = 'http://github.com/mne-tools/mne-python'\nVERSION = version\n\n\ndef package_tree(pkgroot):\n \"\"\"Get the submodule list.\"\"\"\n # Adapted from VisPy\n path = op.dirname(__file__)\n subdirs = [op.relpath(i[0], path).replace(op.sep, '.')\n for i in os.walk(op.join(path, pkgroot))\n if '__init__.py' in i[2]]\n return sorted(subdirs)\n\n\nif __name__ == \"__main__\":\n if op.exists('MANIFEST'):\n os.remove('MANIFEST')\n\n with open('README.rst', 'r') as fid:\n long_description = fid.read()\n\n # data_dependencies is empty, but let's leave them so that we don't break\n # people's workflows who did `pip install mne[data]`\n install_requires = parse_requirements_file('requirements_base.txt')\n data_requires = []\n hdf5_requires = parse_requirements_file('requirements_hdf5.txt')\n test_requires = (parse_requirements_file('requirements_testing.txt') +\n parse_requirements_file('requirements_testing_extra.txt'))\n setup(name=DISTNAME,\n maintainer=MAINTAINER,\n include_package_data=True,\n maintainer_email=MAINTAINER_EMAIL,\n description=DESCRIPTION,\n license=LICENSE,\n url=URL,\n version=VERSION,\n download_url=DOWNLOAD_URL,\n long_description=long_description,\n long_description_content_type='text/x-rst',\n zip_safe=False, # the package can run out of an .egg file\n classifiers=['Intended Audience :: Science/Research',\n 'Intended Audience :: Developers',\n 'License :: OSI Approved',\n 'Programming Language :: Python',\n 'Topic :: Software Development',\n 'Topic :: Scientific/Engineering',\n 'Operating System :: Microsoft :: Windows',\n 'Operating System :: POSIX',\n 'Operating System :: Unix',\n 'Operating System :: MacOS',\n 'Programming Language :: Python :: 3',\n ],\n keywords='neuroscience neuroimaging MEG EEG ECoG fNIRS brain',\n project_urls={\n 'Documentation': 'https://mne.tools/',\n 'Source': 'https://github.com/mne-tools/mne-python/',\n 'Tracker': 'https://github.com/mne-tools/mne-python/issues/',\n },\n platforms='any',\n python_requires='>=3.7',\n install_requires=install_requires,\n extras_require={\n 'data': data_requires,\n 'hdf5': hdf5_requires,\n 'test': test_requires,\n },\n packages=package_tree('mne'),\n package_data={'mne': [\n op.join('data', 'eegbci_checksums.txt'),\n op.join('data', '*.sel'),\n op.join('data', 'icos.fif.gz'),\n op.join('data', 'coil_def*.dat'),\n op.join('data', 'helmets', '*.fif.gz'),\n op.join('data', 'FreeSurferColorLUT.txt'),\n op.join('data', 'image', '*gif'),\n op.join('data', 'image', '*lout'),\n op.join('data', 'fsaverage', '*.fif'),\n op.join('channels', 'data', 'layouts', '*.lout'),\n op.join('channels', 'data', 'layouts', '*.lay'),\n op.join('channels', 'data', 'montages', '*.sfp'),\n op.join('channels', 'data', 'montages', '*.txt'),\n op.join('channels', 'data', 'montages', '*.elc'),\n op.join('channels', 'data', 'neighbors', '*.mat'),\n op.join('datasets', 'sleep_physionet', 'SHA1SUMS'),\n op.join('datasets', '_fsaverage', '*.txt'),\n op.join('datasets', '_infant', '*.txt'),\n op.join('datasets', '_phantom', '*.txt'),\n op.join('html', '*.js'),\n op.join('html', '*.css'),\n op.join('html_templates', 'repr', '*.jinja'),\n op.join('html_templates', 'report', '*.jinja'),\n op.join('icons', '*.svg'),\n op.join('icons', '*.png'),\n op.join('io', 'artemis123', 'resources', '*.csv'),\n op.join('io', 'edf', 'gdf_encodes.txt')\n ]},\n entry_points={'console_scripts': [\n 'mne = mne.commands.utils:main',\n ]})\n", "path": "setup.py"}, {"content": "\"\"\"The version number.\"\"\"\n# Authors: Eric Larson <[email protected]>\n#\n# License: BSD-3-Clause\n\n__version__ = '1.4.dev0'\n", "path": "mne/_version.py"}, {"content": "\"\"\"MNE software for MEG and EEG data analysis.\"\"\"\n\n# PEP0440 compatible formatted version, see:\n# https://www.python.org/dev/peps/pep-0440/\n#\n# Generic release markers:\n# X.Y\n# X.Y.Z # For bugfix releases\n#\n# Admissible pre-release markers:\n# X.YaN # Alpha release\n# X.YbN # Beta release\n# X.YrcN # Release Candidate\n# X.Y # Final release\n#\n# Dev branch marker is: 'X.Y.devN' where N is an integer.\n#\n\nfrom ._version import __version__\n\n# have to import verbose first since it's needed by many things\nfrom .utils import (set_log_level, set_log_file, verbose, set_config,\n get_config, get_config_path, set_cache_dir,\n set_memmap_min_size, grand_average, sys_info, open_docs,\n use_log_level)\nfrom .io.pick import (pick_types, pick_channels,\n pick_channels_regexp, pick_channels_forward,\n pick_types_forward, pick_channels_cov,\n pick_channels_evoked, pick_info,\n channel_type, channel_indices_by_type)\nfrom .io.base import concatenate_raws\nfrom .io.meas_info import create_info, Info\nfrom .io.proj import Projection\nfrom .io.kit import read_epochs_kit\nfrom .io.eeglab import read_epochs_eeglab\nfrom .io.reference import (set_eeg_reference, set_bipolar_reference,\n add_reference_channels)\nfrom .io.what import what\nfrom .bem import (make_sphere_model, make_bem_model, make_bem_solution,\n read_bem_surfaces, write_bem_surfaces, write_head_bem,\n read_bem_solution, write_bem_solution)\nfrom .cov import (read_cov, write_cov, Covariance, compute_raw_covariance,\n compute_covariance, whiten_evoked, make_ad_hoc_cov)\nfrom .event import (read_events, write_events, find_events, merge_events,\n pick_events, make_fixed_length_events, concatenate_events,\n find_stim_steps, AcqParserFIF, count_events)\nfrom ._freesurfer import (head_to_mni, head_to_mri, read_talxfm,\n get_volume_labels_from_aseg, read_freesurfer_lut,\n vertex_to_mni, read_lta)\nfrom .forward import (read_forward_solution, apply_forward, apply_forward_raw,\n average_forward_solutions, Forward,\n write_forward_solution, make_forward_solution,\n convert_forward_solution, make_field_map,\n make_forward_dipole, use_coil_def)\nfrom .source_estimate import (read_source_estimate,\n SourceEstimate, VectorSourceEstimate,\n VolSourceEstimate, VolVectorSourceEstimate,\n MixedSourceEstimate, MixedVectorSourceEstimate,\n grade_to_tris,\n spatial_src_adjacency,\n spatial_tris_adjacency,\n spatial_dist_adjacency,\n spatial_inter_hemi_adjacency,\n spatio_temporal_src_adjacency,\n spatio_temporal_tris_adjacency,\n spatio_temporal_dist_adjacency,\n extract_label_time_course, stc_near_sensors)\nfrom .surface import (read_surface, write_surface, decimate_surface, read_tri,\n get_head_surf, get_meg_helmet_surf, dig_mri_distances,\n warp_montage_volume, get_montage_volume_labels)\nfrom .morph_map import read_morph_map\nfrom .morph import (SourceMorph, read_source_morph, grade_to_vertices,\n compute_source_morph)\nfrom .source_space import (read_source_spaces,\n write_source_spaces, setup_source_space,\n setup_volume_source_space, SourceSpaces,\n add_source_space_distances, morph_source_spaces,\n get_volume_labels_from_src)\nfrom .annotations import (Annotations, read_annotations, annotations_from_events,\n events_from_annotations)\nfrom .epochs import (BaseEpochs, Epochs, EpochsArray, read_epochs,\n concatenate_epochs, make_fixed_length_epochs)\nfrom .evoked import (Evoked, EvokedArray, read_evokeds, write_evokeds,\n combine_evoked)\nfrom .label import (read_label, label_sign_flip,\n write_label, stc_to_label, grow_labels, Label, split_label,\n BiHemiLabel, read_labels_from_annot, write_labels_to_annot,\n random_parcellation, morph_labels, labels_to_stc)\nfrom .misc import parse_config, read_reject_parameters\nfrom .coreg import (create_default_subject, scale_bem, scale_mri, scale_labels,\n scale_source_space)\nfrom .transforms import (read_trans, write_trans,\n transform_surface_to, Transform)\nfrom .proj import (read_proj, write_proj, compute_proj_epochs,\n compute_proj_evoked, compute_proj_raw, sensitivity_map)\nfrom .dipole import read_dipole, Dipole, DipoleFixed, fit_dipole\nfrom .channels import (equalize_channels, rename_channels, find_layout,\n read_vectorview_selection)\nfrom .report import Report, open_report\n\nfrom .io import (read_epochs_fieldtrip, read_evoked_besa,\n read_evoked_fieldtrip, read_evokeds_mff)\nfrom .rank import compute_rank\n\nfrom . import beamformer\nfrom . import channels\nfrom . import chpi\nfrom . import commands\nfrom . import coreg\nfrom . import cuda\nfrom . import datasets\nfrom . import dipole\nfrom . import epochs\nfrom . import event\nfrom . import io\nfrom . import filter\nfrom . import gui\nfrom . import inverse_sparse\nfrom . import minimum_norm\nfrom . import preprocessing\nfrom . import simulation\nfrom . import stats\nfrom . import surface\nfrom . import time_frequency\nfrom . import viz\nfrom . import decoding\nfrom . import export\n\n# initialize logging\nset_log_level(None, False)\nset_log_file()\n", "path": "mne/__init__.py"}]} | 3,864 | 662 |
gh_patches_debug_14528 | rasdani/github-patches | git_diff | Textualize__textual-3699 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
`Button.update` method?
I'm often caught out by `Button.update` not updating the label (or doing anything!)
I thought about overriding the method to simply assign `Button.label`, but the argument type for the `Static` base class is `RenderableType` whereas the button label is `TextType` (I'm afraid I don't fully understand the difference!)
Am I the only one who gets caught out by this?
</issue>
<code>
[start of src/textual/widgets/_button.py]
1 from __future__ import annotations
2
3 from functools import partial
4 from typing import cast
5
6 import rich.repr
7 from rich.console import ConsoleRenderable, RenderableType
8 from rich.text import Text, TextType
9 from typing_extensions import Literal, Self
10
11 from .. import events
12 from ..binding import Binding
13 from ..css._error_tools import friendly_list
14 from ..message import Message
15 from ..pad import HorizontalPad
16 from ..reactive import reactive
17 from ..widgets import Static
18
19 ButtonVariant = Literal["default", "primary", "success", "warning", "error"]
20 """The names of the valid button variants.
21
22 These are the variants that can be used with a [`Button`][textual.widgets.Button].
23 """
24
25 _VALID_BUTTON_VARIANTS = {"default", "primary", "success", "warning", "error"}
26
27
28 class InvalidButtonVariant(Exception):
29 """Exception raised if an invalid button variant is used."""
30
31
32 class Button(Static, can_focus=True):
33 """A simple clickable button."""
34
35 DEFAULT_CSS = """
36 Button {
37 width: auto;
38 min-width: 16;
39 height: auto;
40 background: $panel;
41 color: $text;
42 border: none;
43 border-top: tall $panel-lighten-2;
44 border-bottom: tall $panel-darken-3;
45 text-align: center;
46 content-align: center middle;
47 text-style: bold;
48 }
49
50 Button:focus {
51 text-style: bold reverse;
52 }
53
54 Button:hover {
55 border-top: tall $panel;
56 background: $panel-darken-2;
57 color: $text;
58 }
59
60 Button.-active {
61 background: $panel;
62 border-bottom: tall $panel-lighten-2;
63 border-top: tall $panel-darken-2;
64 tint: $background 30%;
65 }
66
67 /* Primary variant */
68 Button.-primary {
69 background: $primary;
70 color: $text;
71 border-top: tall $primary-lighten-3;
72 border-bottom: tall $primary-darken-3;
73
74 }
75
76 Button.-primary:hover {
77 background: $primary-darken-2;
78 color: $text;
79 border-top: tall $primary;
80 }
81
82 Button.-primary.-active {
83 background: $primary;
84 border-bottom: tall $primary-lighten-3;
85 border-top: tall $primary-darken-3;
86 }
87
88
89 /* Success variant */
90 Button.-success {
91 background: $success;
92 color: $text;
93 border-top: tall $success-lighten-2;
94 border-bottom: tall $success-darken-3;
95 }
96
97 Button.-success:hover {
98 background: $success-darken-2;
99 color: $text;
100 border-top: tall $success;
101 }
102
103 Button.-success.-active {
104 background: $success;
105 border-bottom: tall $success-lighten-2;
106 border-top: tall $success-darken-2;
107 }
108
109
110 /* Warning variant */
111 Button.-warning {
112 background: $warning;
113 color: $text;
114 border-top: tall $warning-lighten-2;
115 border-bottom: tall $warning-darken-3;
116 }
117
118 Button.-warning:hover {
119 background: $warning-darken-2;
120 color: $text;
121 border-top: tall $warning;
122
123 }
124
125 Button.-warning.-active {
126 background: $warning;
127 border-bottom: tall $warning-lighten-2;
128 border-top: tall $warning-darken-2;
129 }
130
131
132 /* Error variant */
133 Button.-error {
134 background: $error;
135 color: $text;
136 border-top: tall $error-lighten-2;
137 border-bottom: tall $error-darken-3;
138
139 }
140
141 Button.-error:hover {
142 background: $error-darken-1;
143 color: $text;
144 border-top: tall $error;
145 }
146
147 Button.-error.-active {
148 background: $error;
149 border-bottom: tall $error-lighten-2;
150 border-top: tall $error-darken-2;
151 }
152 """
153
154 BINDINGS = [Binding("enter", "press", "Press Button", show=False)]
155
156 label: reactive[TextType] = reactive[TextType]("")
157 """The text label that appears within the button."""
158
159 variant = reactive("default")
160 """The variant name for the button."""
161
162 class Pressed(Message):
163 """Event sent when a `Button` is pressed.
164
165 Can be handled using `on_button_pressed` in a subclass of
166 [`Button`][textual.widgets.Button] or in a parent widget in the DOM.
167 """
168
169 def __init__(self, button: Button) -> None:
170 self.button: Button = button
171 """The button that was pressed."""
172 super().__init__()
173
174 @property
175 def control(self) -> Button:
176 """An alias for [Pressed.button][textual.widgets.Button.Pressed.button].
177
178 This will be the same value as [Pressed.button][textual.widgets.Button.Pressed.button].
179 """
180 return self.button
181
182 def __init__(
183 self,
184 label: TextType | None = None,
185 variant: ButtonVariant = "default",
186 *,
187 name: str | None = None,
188 id: str | None = None,
189 classes: str | None = None,
190 disabled: bool = False,
191 ):
192 """Create a Button widget.
193
194 Args:
195 label: The text that appears within the button.
196 variant: The variant of the button.
197 name: The name of the button.
198 id: The ID of the button in the DOM.
199 classes: The CSS classes of the button.
200 disabled: Whether the button is disabled or not.
201 """
202 super().__init__(name=name, id=id, classes=classes, disabled=disabled)
203
204 if label is None:
205 label = self.css_identifier_styled
206
207 self.label = self.validate_label(label)
208
209 self.variant = self.validate_variant(variant)
210
211 self.active_effect_duration = 0.3
212 """Amount of time in seconds the button 'press' animation lasts."""
213
214 def __rich_repr__(self) -> rich.repr.Result:
215 yield from super().__rich_repr__()
216 yield "variant", self.variant, "default"
217
218 def validate_variant(self, variant: str) -> str:
219 if variant not in _VALID_BUTTON_VARIANTS:
220 raise InvalidButtonVariant(
221 f"Valid button variants are {friendly_list(_VALID_BUTTON_VARIANTS)}"
222 )
223 return variant
224
225 def watch_variant(self, old_variant: str, variant: str):
226 self.remove_class(f"-{old_variant}")
227 self.add_class(f"-{variant}")
228
229 def validate_label(self, label: TextType) -> Text:
230 """Parse markup for self.label"""
231 if isinstance(label, str):
232 return Text.from_markup(label)
233 return label
234
235 def render(self) -> RenderableType:
236 assert isinstance(self.label, Text)
237 label = self.label.copy()
238 label.stylize(self.rich_style)
239 return HorizontalPad(
240 label,
241 1,
242 1,
243 self.rich_style,
244 self._get_rich_justify() or "center",
245 )
246
247 def post_render(self, renderable: RenderableType) -> ConsoleRenderable:
248 return cast(ConsoleRenderable, renderable)
249
250 async def _on_click(self, event: events.Click) -> None:
251 event.stop()
252 self.press()
253
254 def press(self) -> Self:
255 """Respond to a button press.
256
257 Returns:
258 The button instance."""
259 if self.disabled or not self.display:
260 return self
261 # Manage the "active" effect:
262 self._start_active_affect()
263 # ...and let other components know that we've just been clicked:
264 self.post_message(Button.Pressed(self))
265 return self
266
267 def _start_active_affect(self) -> None:
268 """Start a small animation to show the button was clicked."""
269 if self.active_effect_duration > 0:
270 self.add_class("-active")
271 self.set_timer(
272 self.active_effect_duration, partial(self.remove_class, "-active")
273 )
274
275 def action_press(self) -> None:
276 """Activate a press of the button."""
277 self.press()
278
279 @classmethod
280 def success(
281 cls,
282 label: TextType | None = None,
283 *,
284 name: str | None = None,
285 id: str | None = None,
286 classes: str | None = None,
287 disabled: bool = False,
288 ) -> Button:
289 """Utility constructor for creating a success Button variant.
290
291 Args:
292 label: The text that appears within the button.
293 disabled: Whether the button is disabled or not.
294 name: The name of the button.
295 id: The ID of the button in the DOM.
296 classes: The CSS classes of the button.
297 disabled: Whether the button is disabled or not.
298
299 Returns:
300 A [`Button`][textual.widgets.Button] widget of the 'success'
301 [variant][textual.widgets.button.ButtonVariant].
302 """
303 return Button(
304 label=label,
305 variant="success",
306 name=name,
307 id=id,
308 classes=classes,
309 disabled=disabled,
310 )
311
312 @classmethod
313 def warning(
314 cls,
315 label: TextType | None = None,
316 *,
317 name: str | None = None,
318 id: str | None = None,
319 classes: str | None = None,
320 disabled: bool = False,
321 ) -> Button:
322 """Utility constructor for creating a warning Button variant.
323
324 Args:
325 label: The text that appears within the button.
326 disabled: Whether the button is disabled or not.
327 name: The name of the button.
328 id: The ID of the button in the DOM.
329 classes: The CSS classes of the button.
330 disabled: Whether the button is disabled or not.
331
332 Returns:
333 A [`Button`][textual.widgets.Button] widget of the 'warning'
334 [variant][textual.widgets.button.ButtonVariant].
335 """
336 return Button(
337 label=label,
338 variant="warning",
339 name=name,
340 id=id,
341 classes=classes,
342 disabled=disabled,
343 )
344
345 @classmethod
346 def error(
347 cls,
348 label: TextType | None = None,
349 *,
350 name: str | None = None,
351 id: str | None = None,
352 classes: str | None = None,
353 disabled: bool = False,
354 ) -> Button:
355 """Utility constructor for creating an error Button variant.
356
357 Args:
358 label: The text that appears within the button.
359 disabled: Whether the button is disabled or not.
360 name: The name of the button.
361 id: The ID of the button in the DOM.
362 classes: The CSS classes of the button.
363 disabled: Whether the button is disabled or not.
364
365 Returns:
366 A [`Button`][textual.widgets.Button] widget of the 'error'
367 [variant][textual.widgets.button.ButtonVariant].
368 """
369 return Button(
370 label=label,
371 variant="error",
372 name=name,
373 id=id,
374 classes=classes,
375 disabled=disabled,
376 )
377
[end of src/textual/widgets/_button.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/textual/widgets/_button.py b/src/textual/widgets/_button.py
--- a/src/textual/widgets/_button.py
+++ b/src/textual/widgets/_button.py
@@ -14,7 +14,7 @@
from ..message import Message
from ..pad import HorizontalPad
from ..reactive import reactive
-from ..widgets import Static
+from ..widget import Widget
ButtonVariant = Literal["default", "primary", "success", "warning", "error"]
"""The names of the valid button variants.
@@ -29,7 +29,7 @@
"""Exception raised if an invalid button variant is used."""
-class Button(Static, can_focus=True):
+class Button(Widget, can_focus=True):
"""A simple clickable button."""
DEFAULT_CSS = """
| {"golden_diff": "diff --git a/src/textual/widgets/_button.py b/src/textual/widgets/_button.py\n--- a/src/textual/widgets/_button.py\n+++ b/src/textual/widgets/_button.py\n@@ -14,7 +14,7 @@\n from ..message import Message\n from ..pad import HorizontalPad\n from ..reactive import reactive\n-from ..widgets import Static\n+from ..widget import Widget\n \n ButtonVariant = Literal[\"default\", \"primary\", \"success\", \"warning\", \"error\"]\n \"\"\"The names of the valid button variants.\n@@ -29,7 +29,7 @@\n \"\"\"Exception raised if an invalid button variant is used.\"\"\"\n \n \n-class Button(Static, can_focus=True):\n+class Button(Widget, can_focus=True):\n \"\"\"A simple clickable button.\"\"\"\n \n DEFAULT_CSS = \"\"\"\n", "issue": "`Button.update` method?\nI'm often caught out by `Button.update` not updating the label (or doing anything!)\r\n\r\nI thought about overriding the method to simply assign `Button.label`, but the argument type for the `Static` base class is `RenderableType` whereas the button label is `TextType` (I'm afraid I don't fully understand the difference!)\r\n\r\nAm I the only one who gets caught out by this?\n", "before_files": [{"content": "from __future__ import annotations\n\nfrom functools import partial\nfrom typing import cast\n\nimport rich.repr\nfrom rich.console import ConsoleRenderable, RenderableType\nfrom rich.text import Text, TextType\nfrom typing_extensions import Literal, Self\n\nfrom .. import events\nfrom ..binding import Binding\nfrom ..css._error_tools import friendly_list\nfrom ..message import Message\nfrom ..pad import HorizontalPad\nfrom ..reactive import reactive\nfrom ..widgets import Static\n\nButtonVariant = Literal[\"default\", \"primary\", \"success\", \"warning\", \"error\"]\n\"\"\"The names of the valid button variants.\n\nThese are the variants that can be used with a [`Button`][textual.widgets.Button].\n\"\"\"\n\n_VALID_BUTTON_VARIANTS = {\"default\", \"primary\", \"success\", \"warning\", \"error\"}\n\n\nclass InvalidButtonVariant(Exception):\n \"\"\"Exception raised if an invalid button variant is used.\"\"\"\n\n\nclass Button(Static, can_focus=True):\n \"\"\"A simple clickable button.\"\"\"\n\n DEFAULT_CSS = \"\"\"\n Button {\n width: auto;\n min-width: 16;\n height: auto;\n background: $panel;\n color: $text;\n border: none;\n border-top: tall $panel-lighten-2;\n border-bottom: tall $panel-darken-3;\n text-align: center;\n content-align: center middle;\n text-style: bold;\n }\n\n Button:focus {\n text-style: bold reverse;\n }\n\n Button:hover {\n border-top: tall $panel;\n background: $panel-darken-2;\n color: $text;\n }\n\n Button.-active {\n background: $panel;\n border-bottom: tall $panel-lighten-2;\n border-top: tall $panel-darken-2;\n tint: $background 30%;\n }\n\n /* Primary variant */\n Button.-primary {\n background: $primary;\n color: $text;\n border-top: tall $primary-lighten-3;\n border-bottom: tall $primary-darken-3;\n\n }\n\n Button.-primary:hover {\n background: $primary-darken-2;\n color: $text;\n border-top: tall $primary;\n }\n\n Button.-primary.-active {\n background: $primary;\n border-bottom: tall $primary-lighten-3;\n border-top: tall $primary-darken-3;\n }\n\n\n /* Success variant */\n Button.-success {\n background: $success;\n color: $text;\n border-top: tall $success-lighten-2;\n border-bottom: tall $success-darken-3;\n }\n\n Button.-success:hover {\n background: $success-darken-2;\n color: $text;\n border-top: tall $success;\n }\n\n Button.-success.-active {\n background: $success;\n border-bottom: tall $success-lighten-2;\n border-top: tall $success-darken-2;\n }\n\n\n /* Warning variant */\n Button.-warning {\n background: $warning;\n color: $text;\n border-top: tall $warning-lighten-2;\n border-bottom: tall $warning-darken-3;\n }\n\n Button.-warning:hover {\n background: $warning-darken-2;\n color: $text;\n border-top: tall $warning;\n\n }\n\n Button.-warning.-active {\n background: $warning;\n border-bottom: tall $warning-lighten-2;\n border-top: tall $warning-darken-2;\n }\n\n\n /* Error variant */\n Button.-error {\n background: $error;\n color: $text;\n border-top: tall $error-lighten-2;\n border-bottom: tall $error-darken-3;\n\n }\n\n Button.-error:hover {\n background: $error-darken-1;\n color: $text;\n border-top: tall $error;\n }\n\n Button.-error.-active {\n background: $error;\n border-bottom: tall $error-lighten-2;\n border-top: tall $error-darken-2;\n }\n \"\"\"\n\n BINDINGS = [Binding(\"enter\", \"press\", \"Press Button\", show=False)]\n\n label: reactive[TextType] = reactive[TextType](\"\")\n \"\"\"The text label that appears within the button.\"\"\"\n\n variant = reactive(\"default\")\n \"\"\"The variant name for the button.\"\"\"\n\n class Pressed(Message):\n \"\"\"Event sent when a `Button` is pressed.\n\n Can be handled using `on_button_pressed` in a subclass of\n [`Button`][textual.widgets.Button] or in a parent widget in the DOM.\n \"\"\"\n\n def __init__(self, button: Button) -> None:\n self.button: Button = button\n \"\"\"The button that was pressed.\"\"\"\n super().__init__()\n\n @property\n def control(self) -> Button:\n \"\"\"An alias for [Pressed.button][textual.widgets.Button.Pressed.button].\n\n This will be the same value as [Pressed.button][textual.widgets.Button.Pressed.button].\n \"\"\"\n return self.button\n\n def __init__(\n self,\n label: TextType | None = None,\n variant: ButtonVariant = \"default\",\n *,\n name: str | None = None,\n id: str | None = None,\n classes: str | None = None,\n disabled: bool = False,\n ):\n \"\"\"Create a Button widget.\n\n Args:\n label: The text that appears within the button.\n variant: The variant of the button.\n name: The name of the button.\n id: The ID of the button in the DOM.\n classes: The CSS classes of the button.\n disabled: Whether the button is disabled or not.\n \"\"\"\n super().__init__(name=name, id=id, classes=classes, disabled=disabled)\n\n if label is None:\n label = self.css_identifier_styled\n\n self.label = self.validate_label(label)\n\n self.variant = self.validate_variant(variant)\n\n self.active_effect_duration = 0.3\n \"\"\"Amount of time in seconds the button 'press' animation lasts.\"\"\"\n\n def __rich_repr__(self) -> rich.repr.Result:\n yield from super().__rich_repr__()\n yield \"variant\", self.variant, \"default\"\n\n def validate_variant(self, variant: str) -> str:\n if variant not in _VALID_BUTTON_VARIANTS:\n raise InvalidButtonVariant(\n f\"Valid button variants are {friendly_list(_VALID_BUTTON_VARIANTS)}\"\n )\n return variant\n\n def watch_variant(self, old_variant: str, variant: str):\n self.remove_class(f\"-{old_variant}\")\n self.add_class(f\"-{variant}\")\n\n def validate_label(self, label: TextType) -> Text:\n \"\"\"Parse markup for self.label\"\"\"\n if isinstance(label, str):\n return Text.from_markup(label)\n return label\n\n def render(self) -> RenderableType:\n assert isinstance(self.label, Text)\n label = self.label.copy()\n label.stylize(self.rich_style)\n return HorizontalPad(\n label,\n 1,\n 1,\n self.rich_style,\n self._get_rich_justify() or \"center\",\n )\n\n def post_render(self, renderable: RenderableType) -> ConsoleRenderable:\n return cast(ConsoleRenderable, renderable)\n\n async def _on_click(self, event: events.Click) -> None:\n event.stop()\n self.press()\n\n def press(self) -> Self:\n \"\"\"Respond to a button press.\n\n Returns:\n The button instance.\"\"\"\n if self.disabled or not self.display:\n return self\n # Manage the \"active\" effect:\n self._start_active_affect()\n # ...and let other components know that we've just been clicked:\n self.post_message(Button.Pressed(self))\n return self\n\n def _start_active_affect(self) -> None:\n \"\"\"Start a small animation to show the button was clicked.\"\"\"\n if self.active_effect_duration > 0:\n self.add_class(\"-active\")\n self.set_timer(\n self.active_effect_duration, partial(self.remove_class, \"-active\")\n )\n\n def action_press(self) -> None:\n \"\"\"Activate a press of the button.\"\"\"\n self.press()\n\n @classmethod\n def success(\n cls,\n label: TextType | None = None,\n *,\n name: str | None = None,\n id: str | None = None,\n classes: str | None = None,\n disabled: bool = False,\n ) -> Button:\n \"\"\"Utility constructor for creating a success Button variant.\n\n Args:\n label: The text that appears within the button.\n disabled: Whether the button is disabled or not.\n name: The name of the button.\n id: The ID of the button in the DOM.\n classes: The CSS classes of the button.\n disabled: Whether the button is disabled or not.\n\n Returns:\n A [`Button`][textual.widgets.Button] widget of the 'success'\n [variant][textual.widgets.button.ButtonVariant].\n \"\"\"\n return Button(\n label=label,\n variant=\"success\",\n name=name,\n id=id,\n classes=classes,\n disabled=disabled,\n )\n\n @classmethod\n def warning(\n cls,\n label: TextType | None = None,\n *,\n name: str | None = None,\n id: str | None = None,\n classes: str | None = None,\n disabled: bool = False,\n ) -> Button:\n \"\"\"Utility constructor for creating a warning Button variant.\n\n Args:\n label: The text that appears within the button.\n disabled: Whether the button is disabled or not.\n name: The name of the button.\n id: The ID of the button in the DOM.\n classes: The CSS classes of the button.\n disabled: Whether the button is disabled or not.\n\n Returns:\n A [`Button`][textual.widgets.Button] widget of the 'warning'\n [variant][textual.widgets.button.ButtonVariant].\n \"\"\"\n return Button(\n label=label,\n variant=\"warning\",\n name=name,\n id=id,\n classes=classes,\n disabled=disabled,\n )\n\n @classmethod\n def error(\n cls,\n label: TextType | None = None,\n *,\n name: str | None = None,\n id: str | None = None,\n classes: str | None = None,\n disabled: bool = False,\n ) -> Button:\n \"\"\"Utility constructor for creating an error Button variant.\n\n Args:\n label: The text that appears within the button.\n disabled: Whether the button is disabled or not.\n name: The name of the button.\n id: The ID of the button in the DOM.\n classes: The CSS classes of the button.\n disabled: Whether the button is disabled or not.\n\n Returns:\n A [`Button`][textual.widgets.Button] widget of the 'error'\n [variant][textual.widgets.button.ButtonVariant].\n \"\"\"\n return Button(\n label=label,\n variant=\"error\",\n name=name,\n id=id,\n classes=classes,\n disabled=disabled,\n )\n", "path": "src/textual/widgets/_button.py"}]} | 4,069 | 170 |
gh_patches_debug_61332 | rasdani/github-patches | git_diff | nerfstudio-project__nerfstudio-1453 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Error while doing ns-export poisson for depth-nerfacto trained model on polycam data
Hi all,
I have been trying to do ns-export poisson on depth-nerfacto trained model on polycam data and get the following error:
In depth_nerfacto.py line 73 in get_outputs
outputs["directions_norm"] = ray_bundle.metadata["directions_norm"] as the following:
TypeError: 'NoneType' object is not subscriptable
Reference:
https://discord.com/channels/1025504971606724712/1073830375559806976/1074782026781175919
Can you please help. Thanks in advance.
</issue>
<code>
[start of nerfstudio/models/depth_nerfacto.py]
1 # Copyright 2022 The Nerfstudio Team. 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 Nerfacto augmented with depth supervision.
17 """
18
19 from __future__ import annotations
20
21 from dataclasses import dataclass, field
22 from typing import Dict, Tuple, Type
23
24 import torch
25
26 from nerfstudio.cameras.rays import RayBundle
27 from nerfstudio.model_components.losses import DepthLossType, depth_loss
28 from nerfstudio.models.nerfacto import NerfactoModel, NerfactoModelConfig
29 from nerfstudio.utils import colormaps
30
31
32 @dataclass
33 class DepthNerfactoModelConfig(NerfactoModelConfig):
34 """Additional parameters for depth supervision."""
35
36 _target: Type = field(default_factory=lambda: DepthNerfactoModel)
37 depth_loss_mult: float = 1e-3
38 """Lambda of the depth loss."""
39 is_euclidean_depth: bool = False
40 """Whether input depth maps are Euclidean distances (or z-distances)."""
41 depth_sigma: float = 0.01
42 """Uncertainty around depth values in meters (defaults to 1cm)."""
43 should_decay_sigma: bool = False
44 """Whether to exponentially decay sigma."""
45 starting_depth_sigma: float = 0.2
46 """Starting uncertainty around depth values in meters (defaults to 0.2m)."""
47 sigma_decay_rate: float = 0.99985
48 """Rate of exponential decay."""
49 depth_loss_type: DepthLossType = DepthLossType.DS_NERF
50 """Depth loss type."""
51
52
53 class DepthNerfactoModel(NerfactoModel):
54 """Depth loss augmented nerfacto model.
55
56 Args:
57 config: Nerfacto configuration to instantiate model
58 """
59
60 config: DepthNerfactoModelConfig
61
62 def populate_modules(self):
63 """Set the fields and modules."""
64 super().populate_modules()
65
66 if self.config.should_decay_sigma:
67 self.depth_sigma = torch.tensor([self.config.starting_depth_sigma])
68 else:
69 self.depth_sigma = torch.tensor([self.config.depth_sigma])
70
71 def get_outputs(self, ray_bundle: RayBundle):
72 outputs = super().get_outputs(ray_bundle)
73 outputs["directions_norm"] = ray_bundle.metadata["directions_norm"]
74 return outputs
75
76 def get_metrics_dict(self, outputs, batch):
77 metrics_dict = super().get_metrics_dict(outputs, batch)
78 if self.training:
79 metrics_dict["depth_loss"] = 0.0
80 sigma = self._get_sigma().to(self.device)
81 termination_depth = batch["depth_image"].to(self.device)
82 for i in range(len(outputs["weights_list"])):
83 metrics_dict["depth_loss"] += depth_loss(
84 weights=outputs["weights_list"][i],
85 ray_samples=outputs["ray_samples_list"][i],
86 termination_depth=termination_depth,
87 predicted_depth=outputs["depth"],
88 sigma=sigma,
89 directions_norm=outputs["directions_norm"],
90 is_euclidean=self.config.is_euclidean_depth,
91 depth_loss_type=self.config.depth_loss_type,
92 ) / len(outputs["weights_list"])
93
94 return metrics_dict
95
96 def get_loss_dict(self, outputs, batch, metrics_dict=None):
97 loss_dict = super().get_loss_dict(outputs, batch, metrics_dict)
98 if self.training:
99 assert metrics_dict is not None and "depth_loss" in metrics_dict
100 loss_dict["depth_loss"] = self.config.depth_loss_mult * metrics_dict["depth_loss"]
101
102 return loss_dict
103
104 def get_image_metrics_and_images(
105 self, outputs: Dict[str, torch.Tensor], batch: Dict[str, torch.Tensor]
106 ) -> Tuple[Dict[str, float], Dict[str, torch.Tensor]]:
107 """Appends ground truth depth to the depth image."""
108 metrics, images = super().get_image_metrics_and_images(outputs, batch)
109 ground_truth_depth = batch["depth_image"]
110 if not self.config.is_euclidean_depth:
111 ground_truth_depth = ground_truth_depth * outputs["directions_norm"]
112
113 ground_truth_depth_colormap = colormaps.apply_depth_colormap(ground_truth_depth)
114 predicted_depth_colormap = colormaps.apply_depth_colormap(
115 outputs["depth"],
116 accumulation=outputs["accumulation"],
117 near_plane=torch.min(ground_truth_depth),
118 far_plane=torch.max(ground_truth_depth),
119 )
120 images["depth"] = torch.cat([ground_truth_depth_colormap, predicted_depth_colormap], dim=1)
121 depth_mask = ground_truth_depth > 0
122 metrics["depth_mse"] = torch.nn.functional.mse_loss(
123 outputs["depth"][depth_mask], ground_truth_depth[depth_mask]
124 )
125 return metrics, images
126
127 def _get_sigma(self):
128 if not self.config.should_decay_sigma:
129 return self.depth_sigma
130
131 self.depth_sigma = torch.maximum( # pylint: disable=attribute-defined-outside-init
132 self.config.sigma_decay_rate * self.depth_sigma, torch.tensor([self.config.depth_sigma])
133 )
134 return self.depth_sigma
135
[end of nerfstudio/models/depth_nerfacto.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/nerfstudio/models/depth_nerfacto.py b/nerfstudio/models/depth_nerfacto.py
--- a/nerfstudio/models/depth_nerfacto.py
+++ b/nerfstudio/models/depth_nerfacto.py
@@ -70,7 +70,8 @@
def get_outputs(self, ray_bundle: RayBundle):
outputs = super().get_outputs(ray_bundle)
- outputs["directions_norm"] = ray_bundle.metadata["directions_norm"]
+ if ray_bundle.metadata is not None and "directions_norm" in ray_bundle.metadata:
+ outputs["directions_norm"] = ray_bundle.metadata["directions_norm"]
return outputs
def get_metrics_dict(self, outputs, batch):
| {"golden_diff": "diff --git a/nerfstudio/models/depth_nerfacto.py b/nerfstudio/models/depth_nerfacto.py\n--- a/nerfstudio/models/depth_nerfacto.py\n+++ b/nerfstudio/models/depth_nerfacto.py\n@@ -70,7 +70,8 @@\n \n def get_outputs(self, ray_bundle: RayBundle):\n outputs = super().get_outputs(ray_bundle)\n- outputs[\"directions_norm\"] = ray_bundle.metadata[\"directions_norm\"]\n+ if ray_bundle.metadata is not None and \"directions_norm\" in ray_bundle.metadata:\n+ outputs[\"directions_norm\"] = ray_bundle.metadata[\"directions_norm\"]\n return outputs\n \n def get_metrics_dict(self, outputs, batch):\n", "issue": "Error while doing ns-export poisson for depth-nerfacto trained model on polycam data\nHi all,\n\nI have been trying to do ns-export poisson on depth-nerfacto trained model on polycam data and get the following error: \n\nIn depth_nerfacto.py line 73 in get_outputs\n\n\noutputs[\"directions_norm\"] = ray_bundle.metadata[\"directions_norm\"] as the following:\n\nTypeError: 'NoneType' object is not subscriptable\n\nReference: \n\nhttps://discord.com/channels/1025504971606724712/1073830375559806976/1074782026781175919\n\n\nCan you please help. Thanks in advance.\n\n", "before_files": [{"content": "# Copyright 2022 The Nerfstudio Team. 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\"\"\"\nNerfacto augmented with depth supervision.\n\"\"\"\n\nfrom __future__ import annotations\n\nfrom dataclasses import dataclass, field\nfrom typing import Dict, Tuple, Type\n\nimport torch\n\nfrom nerfstudio.cameras.rays import RayBundle\nfrom nerfstudio.model_components.losses import DepthLossType, depth_loss\nfrom nerfstudio.models.nerfacto import NerfactoModel, NerfactoModelConfig\nfrom nerfstudio.utils import colormaps\n\n\n@dataclass\nclass DepthNerfactoModelConfig(NerfactoModelConfig):\n \"\"\"Additional parameters for depth supervision.\"\"\"\n\n _target: Type = field(default_factory=lambda: DepthNerfactoModel)\n depth_loss_mult: float = 1e-3\n \"\"\"Lambda of the depth loss.\"\"\"\n is_euclidean_depth: bool = False\n \"\"\"Whether input depth maps are Euclidean distances (or z-distances).\"\"\"\n depth_sigma: float = 0.01\n \"\"\"Uncertainty around depth values in meters (defaults to 1cm).\"\"\"\n should_decay_sigma: bool = False\n \"\"\"Whether to exponentially decay sigma.\"\"\"\n starting_depth_sigma: float = 0.2\n \"\"\"Starting uncertainty around depth values in meters (defaults to 0.2m).\"\"\"\n sigma_decay_rate: float = 0.99985\n \"\"\"Rate of exponential decay.\"\"\"\n depth_loss_type: DepthLossType = DepthLossType.DS_NERF\n \"\"\"Depth loss type.\"\"\"\n\n\nclass DepthNerfactoModel(NerfactoModel):\n \"\"\"Depth loss augmented nerfacto model.\n\n Args:\n config: Nerfacto configuration to instantiate model\n \"\"\"\n\n config: DepthNerfactoModelConfig\n\n def populate_modules(self):\n \"\"\"Set the fields and modules.\"\"\"\n super().populate_modules()\n\n if self.config.should_decay_sigma:\n self.depth_sigma = torch.tensor([self.config.starting_depth_sigma])\n else:\n self.depth_sigma = torch.tensor([self.config.depth_sigma])\n\n def get_outputs(self, ray_bundle: RayBundle):\n outputs = super().get_outputs(ray_bundle)\n outputs[\"directions_norm\"] = ray_bundle.metadata[\"directions_norm\"]\n return outputs\n\n def get_metrics_dict(self, outputs, batch):\n metrics_dict = super().get_metrics_dict(outputs, batch)\n if self.training:\n metrics_dict[\"depth_loss\"] = 0.0\n sigma = self._get_sigma().to(self.device)\n termination_depth = batch[\"depth_image\"].to(self.device)\n for i in range(len(outputs[\"weights_list\"])):\n metrics_dict[\"depth_loss\"] += depth_loss(\n weights=outputs[\"weights_list\"][i],\n ray_samples=outputs[\"ray_samples_list\"][i],\n termination_depth=termination_depth,\n predicted_depth=outputs[\"depth\"],\n sigma=sigma,\n directions_norm=outputs[\"directions_norm\"],\n is_euclidean=self.config.is_euclidean_depth,\n depth_loss_type=self.config.depth_loss_type,\n ) / len(outputs[\"weights_list\"])\n\n return metrics_dict\n\n def get_loss_dict(self, outputs, batch, metrics_dict=None):\n loss_dict = super().get_loss_dict(outputs, batch, metrics_dict)\n if self.training:\n assert metrics_dict is not None and \"depth_loss\" in metrics_dict\n loss_dict[\"depth_loss\"] = self.config.depth_loss_mult * metrics_dict[\"depth_loss\"]\n\n return loss_dict\n\n def get_image_metrics_and_images(\n self, outputs: Dict[str, torch.Tensor], batch: Dict[str, torch.Tensor]\n ) -> Tuple[Dict[str, float], Dict[str, torch.Tensor]]:\n \"\"\"Appends ground truth depth to the depth image.\"\"\"\n metrics, images = super().get_image_metrics_and_images(outputs, batch)\n ground_truth_depth = batch[\"depth_image\"]\n if not self.config.is_euclidean_depth:\n ground_truth_depth = ground_truth_depth * outputs[\"directions_norm\"]\n\n ground_truth_depth_colormap = colormaps.apply_depth_colormap(ground_truth_depth)\n predicted_depth_colormap = colormaps.apply_depth_colormap(\n outputs[\"depth\"],\n accumulation=outputs[\"accumulation\"],\n near_plane=torch.min(ground_truth_depth),\n far_plane=torch.max(ground_truth_depth),\n )\n images[\"depth\"] = torch.cat([ground_truth_depth_colormap, predicted_depth_colormap], dim=1)\n depth_mask = ground_truth_depth > 0\n metrics[\"depth_mse\"] = torch.nn.functional.mse_loss(\n outputs[\"depth\"][depth_mask], ground_truth_depth[depth_mask]\n )\n return metrics, images\n\n def _get_sigma(self):\n if not self.config.should_decay_sigma:\n return self.depth_sigma\n\n self.depth_sigma = torch.maximum( # pylint: disable=attribute-defined-outside-init\n self.config.sigma_decay_rate * self.depth_sigma, torch.tensor([self.config.depth_sigma])\n )\n return self.depth_sigma\n", "path": "nerfstudio/models/depth_nerfacto.py"}]} | 2,223 | 164 |
gh_patches_debug_2813 | rasdani/github-patches | git_diff | cupy__cupy-4452 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Triangular Solve not working for complex case
I have discovered, that `solve_triangular` does not work, if the input is complex, but the matrix is real:
```
solve_triangular(
cholesky,
rhs,
lower=True,
)
```
produces a real valued result, if `cholesky` is real but `rhs` is complex.
```
intelpython3 -c 'import cupy; cupy.show_config()'
OS : Linux-5.9.6-1-MANJARO-x86_64-with-arch-Manjaro-Linux
CuPy Version : 9.0.0a1
NumPy Version : 1.16.2+intel.0
SciPy Version : 1.5.0
Cython Build Version : 0.29.21
Cython Runtime Version : 0.29.6
CUDA Root : /opt/cuda
CUDA Build Version : 11010
CUDA Driver Version : 11010
CUDA Runtime Version : 11010
cuBLAS Version : 11300
cuFFT Version : 10300
cuRAND Version : 10202
cuSOLVER Version : (11, 0, 1)
cuSPARSE Version : 11300
NVRTC Version : (11, 1)
Thrust Version : 100910
CUB Build Version : 100910
cuDNN Build Version : None
cuDNN Version : None
NCCL Build Version : 2708
NCCL Runtime Version : 2708
cuTENSOR Version : None
Device 0 Name : GeForce RTX 3090
Device 0 Compute Capability : 86
```
</issue>
<code>
[start of cupyx/scipy/linalg/solve_triangular.py]
1 import numpy
2
3 import cupy
4 from cupy.cuda import cublas
5 from cupy.cuda import device
6 from cupy.linalg import _util
7
8
9 def solve_triangular(a, b, trans=0, lower=False, unit_diagonal=False,
10 overwrite_b=False, check_finite=False):
11 """Solve the equation a x = b for x, assuming a is a triangular matrix.
12
13 Args:
14 a (cupy.ndarray): The matrix with dimension ``(M, M)``.
15 b (cupy.ndarray): The matrix with dimension ``(M,)`` or
16 ``(M, N)``.
17 lower (bool): Use only data contained in the lower triangle of ``a``.
18 Default is to use upper triangle.
19 trans (0, 1, 2, 'N', 'T' or 'C'): Type of system to solve:
20
21 - *'0'* or *'N'* -- :math:`a x = b`
22 - *'1'* or *'T'* -- :math:`a^T x = b`
23 - *'2'* or *'C'* -- :math:`a^H x = b`
24
25 unit_diagonal (bool): If ``True``, diagonal elements of ``a`` are
26 assumed to be 1 and will not be referenced.
27 overwrite_b (bool): Allow overwriting data in b (may enhance
28 performance)
29 check_finite (bool): Whether to check that the input matrices contain
30 only finite numbers. Disabling may give a performance gain, but may
31 result in problems (crashes, non-termination) if the inputs do
32 contain infinities or NaNs.
33
34 Returns:
35 cupy.ndarray:
36 The matrix with dimension ``(M,)`` or ``(M, N)``.
37
38 .. seealso:: :func:`scipy.linalg.solve_triangular`
39 """
40
41 _util._assert_cupy_array(a, b)
42
43 if len(a.shape) != 2 or a.shape[0] != a.shape[1]:
44 raise ValueError('expected square matrix')
45 if len(a) != len(b):
46 raise ValueError('incompatible dimensions')
47
48 # Cast to float32 or float64
49 if a.dtype.char in 'fd':
50 dtype = a.dtype
51 else:
52 dtype = numpy.promote_types(a.dtype.char, 'f')
53
54 a = cupy.array(a, dtype=dtype, order='F', copy=False)
55 b = cupy.array(b, dtype=dtype, order='F', copy=(not overwrite_b))
56
57 if check_finite:
58 if a.dtype.kind == 'f' and not cupy.isfinite(a).all():
59 raise ValueError(
60 'array must not contain infs or NaNs')
61 if b.dtype.kind == 'f' and not cupy.isfinite(b).all():
62 raise ValueError(
63 'array must not contain infs or NaNs')
64
65 m, n = (b.size, 1) if b.ndim == 1 else b.shape
66 cublas_handle = device.get_cublas_handle()
67
68 if dtype == 'f':
69 trsm = cublas.strsm
70 else: # dtype == 'd'
71 trsm = cublas.dtrsm
72 one = numpy.array(1, dtype=dtype)
73
74 if lower:
75 uplo = cublas.CUBLAS_FILL_MODE_LOWER
76 else:
77 uplo = cublas.CUBLAS_FILL_MODE_UPPER
78
79 if trans == 'N':
80 trans = cublas.CUBLAS_OP_N
81 elif trans == 'T':
82 trans = cublas.CUBLAS_OP_T
83 elif trans == 'C':
84 trans = cublas.CUBLAS_OP_C
85
86 if unit_diagonal:
87 diag = cublas.CUBLAS_DIAG_UNIT
88 else:
89 diag = cublas.CUBLAS_DIAG_NON_UNIT
90
91 trsm(
92 cublas_handle, cublas.CUBLAS_SIDE_LEFT, uplo,
93 trans, diag,
94 m, n, one.ctypes.data, a.data.ptr, m, b.data.ptr, m)
95 return b
96
[end of cupyx/scipy/linalg/solve_triangular.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/cupyx/scipy/linalg/solve_triangular.py b/cupyx/scipy/linalg/solve_triangular.py
--- a/cupyx/scipy/linalg/solve_triangular.py
+++ b/cupyx/scipy/linalg/solve_triangular.py
@@ -67,8 +67,12 @@
if dtype == 'f':
trsm = cublas.strsm
- else: # dtype == 'd'
+ elif dtype == 'd':
trsm = cublas.dtrsm
+ elif dtype == 'F':
+ trsm = cublas.ctrsm
+ else: # dtype == 'D'
+ trsm = cublas.ztrsm
one = numpy.array(1, dtype=dtype)
if lower:
| {"golden_diff": "diff --git a/cupyx/scipy/linalg/solve_triangular.py b/cupyx/scipy/linalg/solve_triangular.py\n--- a/cupyx/scipy/linalg/solve_triangular.py\n+++ b/cupyx/scipy/linalg/solve_triangular.py\n@@ -67,8 +67,12 @@\n \n if dtype == 'f':\n trsm = cublas.strsm\n- else: # dtype == 'd'\n+ elif dtype == 'd':\n trsm = cublas.dtrsm\n+ elif dtype == 'F':\n+ trsm = cublas.ctrsm\n+ else: # dtype == 'D'\n+ trsm = cublas.ztrsm\n one = numpy.array(1, dtype=dtype)\n \n if lower:\n", "issue": "Triangular Solve not working for complex case\nI have discovered, that `solve_triangular` does not work, if the input is complex, but the matrix is real:\r\n```\r\nsolve_triangular(\r\n cholesky,\r\n rhs,\r\n lower=True,\r\n)\r\n```\r\nproduces a real valued result, if `cholesky` is real but `rhs` is complex.\r\n\r\n```\r\nintelpython3 -c 'import cupy; cupy.show_config()'\r\nOS : Linux-5.9.6-1-MANJARO-x86_64-with-arch-Manjaro-Linux\r\nCuPy Version : 9.0.0a1\r\nNumPy Version : 1.16.2+intel.0\r\nSciPy Version : 1.5.0\r\nCython Build Version : 0.29.21\r\nCython Runtime Version : 0.29.6\r\nCUDA Root : /opt/cuda\r\nCUDA Build Version : 11010\r\nCUDA Driver Version : 11010\r\nCUDA Runtime Version : 11010\r\ncuBLAS Version : 11300\r\ncuFFT Version : 10300\r\ncuRAND Version : 10202\r\ncuSOLVER Version : (11, 0, 1)\r\ncuSPARSE Version : 11300\r\nNVRTC Version : (11, 1)\r\nThrust Version : 100910\r\nCUB Build Version : 100910\r\ncuDNN Build Version : None\r\ncuDNN Version : None\r\nNCCL Build Version : 2708\r\nNCCL Runtime Version : 2708\r\ncuTENSOR Version : None\r\nDevice 0 Name : GeForce RTX 3090\r\nDevice 0 Compute Capability : 86\r\n```\r\n\r\n\n", "before_files": [{"content": "import numpy\n\nimport cupy\nfrom cupy.cuda import cublas\nfrom cupy.cuda import device\nfrom cupy.linalg import _util\n\n\ndef solve_triangular(a, b, trans=0, lower=False, unit_diagonal=False,\n overwrite_b=False, check_finite=False):\n \"\"\"Solve the equation a x = b for x, assuming a is a triangular matrix.\n\n Args:\n a (cupy.ndarray): The matrix with dimension ``(M, M)``.\n b (cupy.ndarray): The matrix with dimension ``(M,)`` or\n ``(M, N)``.\n lower (bool): Use only data contained in the lower triangle of ``a``.\n Default is to use upper triangle.\n trans (0, 1, 2, 'N', 'T' or 'C'): Type of system to solve:\n\n - *'0'* or *'N'* -- :math:`a x = b`\n - *'1'* or *'T'* -- :math:`a^T x = b`\n - *'2'* or *'C'* -- :math:`a^H x = b`\n\n unit_diagonal (bool): If ``True``, diagonal elements of ``a`` are\n assumed to be 1 and will not be referenced.\n overwrite_b (bool): Allow overwriting data in b (may enhance\n performance)\n check_finite (bool): Whether to check that the input matrices contain\n only finite numbers. Disabling may give a performance gain, but may\n result in problems (crashes, non-termination) if the inputs do\n contain infinities or NaNs.\n\n Returns:\n cupy.ndarray:\n The matrix with dimension ``(M,)`` or ``(M, N)``.\n\n .. seealso:: :func:`scipy.linalg.solve_triangular`\n \"\"\"\n\n _util._assert_cupy_array(a, b)\n\n if len(a.shape) != 2 or a.shape[0] != a.shape[1]:\n raise ValueError('expected square matrix')\n if len(a) != len(b):\n raise ValueError('incompatible dimensions')\n\n # Cast to float32 or float64\n if a.dtype.char in 'fd':\n dtype = a.dtype\n else:\n dtype = numpy.promote_types(a.dtype.char, 'f')\n\n a = cupy.array(a, dtype=dtype, order='F', copy=False)\n b = cupy.array(b, dtype=dtype, order='F', copy=(not overwrite_b))\n\n if check_finite:\n if a.dtype.kind == 'f' and not cupy.isfinite(a).all():\n raise ValueError(\n 'array must not contain infs or NaNs')\n if b.dtype.kind == 'f' and not cupy.isfinite(b).all():\n raise ValueError(\n 'array must not contain infs or NaNs')\n\n m, n = (b.size, 1) if b.ndim == 1 else b.shape\n cublas_handle = device.get_cublas_handle()\n\n if dtype == 'f':\n trsm = cublas.strsm\n else: # dtype == 'd'\n trsm = cublas.dtrsm\n one = numpy.array(1, dtype=dtype)\n\n if lower:\n uplo = cublas.CUBLAS_FILL_MODE_LOWER\n else:\n uplo = cublas.CUBLAS_FILL_MODE_UPPER\n\n if trans == 'N':\n trans = cublas.CUBLAS_OP_N\n elif trans == 'T':\n trans = cublas.CUBLAS_OP_T\n elif trans == 'C':\n trans = cublas.CUBLAS_OP_C\n\n if unit_diagonal:\n diag = cublas.CUBLAS_DIAG_UNIT\n else:\n diag = cublas.CUBLAS_DIAG_NON_UNIT\n\n trsm(\n cublas_handle, cublas.CUBLAS_SIDE_LEFT, uplo,\n trans, diag,\n m, n, one.ctypes.data, a.data.ptr, m, b.data.ptr, m)\n return b\n", "path": "cupyx/scipy/linalg/solve_triangular.py"}]} | 2,046 | 177 |
gh_patches_debug_60785 | rasdani/github-patches | git_diff | watchdogpolska__feder-349 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Przyjazny komunikat o aktualizacji wiarygodności
</issue>
<code>
[start of feder/tasks/views.py]
1 from atom.views import (ActionMessageMixin, ActionView, CreateMessageMixin,
2 DeleteMessageMixin, UpdateMessageMixin)
3 from braces.views import (FormValidMessageMixin, PrefetchRelatedMixin,
4 SelectRelatedMixin, UserFormKwargsMixin)
5 from cached_property import cached_property
6 from django.contrib import messages
7 from django.contrib.auth.mixins import LoginRequiredMixin
8 from django.core.urlresolvers import reverse, reverse_lazy
9 from django.shortcuts import get_object_or_404, redirect
10 from django.utils.translation import ugettext_lazy as _
11 from django.views.generic import (CreateView, DeleteView, DetailView, FormView,
12 UpdateView)
13 from django_filters.views import FilterView
14
15 from feder.cases.models import Case
16 from feder.main.mixins import (AttrPermissionRequiredMixin,
17 RaisePermissionRequiredMixin)
18 from .filters import TaskFilter
19 from .forms import AnswerFormSet, SurveyForm, TaskForm
20 from .models import Survey, Task
21
22 DONE_MESSAGE_TEXT = _("Already done the job. If you want to change the answer - delete answers.")
23
24 THANK_TEXT = _("Thank you for your submission. It is approaching us to know the " +
25 "truth, by obtaining reliable data.")
26
27 EXHAUSTED_TEXT = _("Thank you for your help. Unfortunately, all the tasks " +
28 "for you have been exhausted.")
29
30
31 class TaskListView(SelectRelatedMixin, FilterView):
32 filterset_class = TaskFilter
33 model = Task
34 select_related = ['case', 'questionary']
35 paginate_by = 25
36
37 def get_context_data(self, **kwargs):
38 context = super(TaskListView, self).get_context_data(**kwargs)
39 context['stats'] = self.object_list.survey_stats()
40 return context
41
42
43 class TaskDetailView(SelectRelatedMixin, PrefetchRelatedMixin, DetailView):
44 model = Task
45 select_related = ['case__monitoring', 'case__institution', 'questionary']
46 prefetch_related = ['survey_set', 'questionary__question_set']
47
48 def get_user_survey(self):
49 try:
50 return (self.object.survey_set.with_full_answer().
51 of_user(self.request.user, self.request.light_user).get())
52 except Survey.DoesNotExist:
53 return None
54
55 def get_context_data(self, **kwargs):
56 context = super(TaskDetailView, self).get_context_data(**kwargs)
57 context['formset'] = AnswerFormSet(questionary=self.object.questionary)
58 context['user_survey'] = self.get_user_survey()
59 return context
60
61
62 class TaskSurveyView(SelectRelatedMixin, PrefetchRelatedMixin, DetailView):
63 model = Task
64 select_related = ['case__monitoring', 'case__institution', 'questionary', ]
65 prefetch_related = ['questionary__question_set']
66 template_name_suffix = '_survey'
67
68 def get_context_data(self, **kwargs):
69 context = super(TaskSurveyView, self).get_context_data(**kwargs)
70 survey_list = (Survey.objects.for_task(self.object).with_user().with_full_answer().all())
71 context['survey_list'] = survey_list
72 user_survey_list = [x for x in survey_list if x.user == self.request.user] # TODO: Lazy
73 context['user_survey'] = user_survey_list[0] if user_survey_list else None
74 return context
75
76
77 class TaskCreateView(RaisePermissionRequiredMixin, UserFormKwargsMixin,
78 CreateMessageMixin, CreateView):
79 model = Task
80 form_class = TaskForm
81 permission_required = 'monitorings.add_task'
82
83 @cached_property
84 def case(self):
85 return get_object_or_404(Case.objects.select_related('monitoring'),
86 pk=self.kwargs['case'])
87
88 def get_permission_object(self):
89 return self.case.monitoring
90
91 def get_form_kwargs(self):
92 kw = super(TaskCreateView, self).get_form_kwargs()
93 kw['case'] = self.case
94 return kw
95
96 def get_context_data(self, **kwargs):
97 context = super(TaskCreateView, self).get_context_data(**kwargs)
98 context['case'] = self.case
99 return context
100
101
102 class TaskUpdateView(AttrPermissionRequiredMixin, UserFormKwargsMixin,
103 UpdateMessageMixin, FormValidMessageMixin, UpdateView):
104 model = Task
105 form_class = TaskForm
106 permission_required = 'change_task'
107 permission_attribute = 'case__monitoring'
108
109
110 class TaskDeleteView(AttrPermissionRequiredMixin, DeleteMessageMixin, DeleteView):
111 model = Task
112 success_url = reverse_lazy('tasks:list')
113 permission_required = 'delete_task'
114 permission_attribute = 'case__monitoring'
115
116
117 class SurveyDeleteView(LoginRequiredMixin, DeleteMessageMixin, DeleteView):
118 model = Survey
119 slug_url_kwarg = 'task_id'
120 slug_field = 'task_id'
121
122 def get_queryset(self, *args, **kwargs):
123 qs = super(SurveyDeleteView, self).get_queryset()
124 return qs.of_user(self.request.user, self.request.light_user).with_full_answer()
125
126 def get_success_url(self):
127 return self.object.task.get_absolute_url()
128
129
130 class SurveySelectView(AttrPermissionRequiredMixin, ActionMessageMixin,
131 SelectRelatedMixin, ActionView): # TODO: Write test
132 model = Survey
133 template_name_suffix = '_select'
134 select_related = ['task__case__monitoring', ]
135 permission_required = 'monitorings.select_survey'
136 permission_attribute = 'task__case__monitoring'
137 direction = None
138 change = {'up': 1, 'down': -1}
139
140 def action(self, *args, **kwargs):
141 self.object.credibility_update(self.change[self.direction])
142 self.object.save()
143
144 def get_success_message(self):
145 return _("Survey {object} selected!").format(object=self.object)
146
147 def get_success_url(self):
148 return reverse('tasks:survey', kwargs={'pk': self.object.task_id})
149
150
151 class SurveyFillView(FormView):
152 template_name = 'tasks/survey_fill.html'
153 form_class = SurveyForm
154 formset_class = AnswerFormSet
155
156 @cached_property
157 def task(self):
158 return get_object_or_404(Task, pk=self.kwargs['pk'])
159
160 @cached_property
161 def object(self):
162 try:
163 return Survey.objects.filter(task=self.task).of_user(user=self.request.user,
164 light_user=self.request.light_user).all()[0]
165 except IndexError:
166 return None
167
168 def get_form_kwargs(self):
169 kwargs = super(SurveyFillView, self).get_form_kwargs()
170 kwargs['task'] = self.task
171 kwargs['instance'] = self.object
172 return kwargs
173
174 def get_success_url(self):
175 if 'save' in self.request.POST: # only save
176 return self.object.task.get_absolute_url()
177
178 # find next task
179 try:
180 next_task = self.task.get_next_for_user(self.request.user)
181 return next_task.get_absolute_url()
182 except Task.DoesNotExist:
183 messages.success(self.request, EXHAUSTED_TEXT)
184 return self.task.case.monitoring.get_absolute_url()
185
186 @cached_property
187 def formset(self):
188 return self.formset_class(data=self.request.POST or None,
189 survey=self.object,
190 questionary=self.task.questionary)
191
192 def form_valid(self, form):
193 self.object = form.save(commit=False)
194 if self.formset.is_valid():
195 if self.request.user.is_authenticated():
196 self.object.user = self.request.user
197 else:
198 self.object.light_user = self.request.light_user_new
199 self.object.save()
200 self.formset.save()
201 return self.formset_valid(form, self.object, self.formset)
202 return self.render_to_response(self.get_context_data())
203
204 def formset_valid(self, form, obj, formset):
205 messages.success(self.request, THANK_TEXT)
206 obj.save()
207 formset.save()
208 return redirect(self.get_success_url())
209
210 def get_context_data(self, **kwargs):
211 context = super(SurveyFillView, self).get_context_data(**kwargs)
212 context['formset'] = self.formset
213 context['object'] = self.object
214 context['task'] = self.task
215 return context
216
[end of feder/tasks/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/feder/tasks/views.py b/feder/tasks/views.py
--- a/feder/tasks/views.py
+++ b/feder/tasks/views.py
@@ -142,7 +142,10 @@
self.object.save()
def get_success_message(self):
- return _("Survey {object} selected!").format(object=self.object)
+ if self.direction == 'up':
+ return _("Survey credibility increased!")
+ else:
+ return _("Survey credibility decreased!")
def get_success_url(self):
return reverse('tasks:survey', kwargs={'pk': self.object.task_id})
| {"golden_diff": "diff --git a/feder/tasks/views.py b/feder/tasks/views.py\n--- a/feder/tasks/views.py\n+++ b/feder/tasks/views.py\n@@ -142,7 +142,10 @@\n self.object.save()\n \n def get_success_message(self):\n- return _(\"Survey {object} selected!\").format(object=self.object)\n+ if self.direction == 'up':\n+ return _(\"Survey credibility increased!\")\n+ else:\n+ return _(\"Survey credibility decreased!\")\n \n def get_success_url(self):\n return reverse('tasks:survey', kwargs={'pk': self.object.task_id})\n", "issue": "Przyjazny komunikat o aktualizacji wiarygodno\u015bci\n\r\n\n", "before_files": [{"content": "from atom.views import (ActionMessageMixin, ActionView, CreateMessageMixin,\n DeleteMessageMixin, UpdateMessageMixin)\nfrom braces.views import (FormValidMessageMixin, PrefetchRelatedMixin,\n SelectRelatedMixin, UserFormKwargsMixin)\nfrom cached_property import cached_property\nfrom django.contrib import messages\nfrom django.contrib.auth.mixins import LoginRequiredMixin\nfrom django.core.urlresolvers import reverse, reverse_lazy\nfrom django.shortcuts import get_object_or_404, redirect\nfrom django.utils.translation import ugettext_lazy as _\nfrom django.views.generic import (CreateView, DeleteView, DetailView, FormView,\n UpdateView)\nfrom django_filters.views import FilterView\n\nfrom feder.cases.models import Case\nfrom feder.main.mixins import (AttrPermissionRequiredMixin,\n RaisePermissionRequiredMixin)\nfrom .filters import TaskFilter\nfrom .forms import AnswerFormSet, SurveyForm, TaskForm\nfrom .models import Survey, Task\n\nDONE_MESSAGE_TEXT = _(\"Already done the job. If you want to change the answer - delete answers.\")\n\nTHANK_TEXT = _(\"Thank you for your submission. It is approaching us to know the \" +\n \"truth, by obtaining reliable data.\")\n\nEXHAUSTED_TEXT = _(\"Thank you for your help. Unfortunately, all the tasks \" +\n \"for you have been exhausted.\")\n\n\nclass TaskListView(SelectRelatedMixin, FilterView):\n filterset_class = TaskFilter\n model = Task\n select_related = ['case', 'questionary']\n paginate_by = 25\n\n def get_context_data(self, **kwargs):\n context = super(TaskListView, self).get_context_data(**kwargs)\n context['stats'] = self.object_list.survey_stats()\n return context\n\n\nclass TaskDetailView(SelectRelatedMixin, PrefetchRelatedMixin, DetailView):\n model = Task\n select_related = ['case__monitoring', 'case__institution', 'questionary']\n prefetch_related = ['survey_set', 'questionary__question_set']\n\n def get_user_survey(self):\n try:\n return (self.object.survey_set.with_full_answer().\n of_user(self.request.user, self.request.light_user).get())\n except Survey.DoesNotExist:\n return None\n\n def get_context_data(self, **kwargs):\n context = super(TaskDetailView, self).get_context_data(**kwargs)\n context['formset'] = AnswerFormSet(questionary=self.object.questionary)\n context['user_survey'] = self.get_user_survey()\n return context\n\n\nclass TaskSurveyView(SelectRelatedMixin, PrefetchRelatedMixin, DetailView):\n model = Task\n select_related = ['case__monitoring', 'case__institution', 'questionary', ]\n prefetch_related = ['questionary__question_set']\n template_name_suffix = '_survey'\n\n def get_context_data(self, **kwargs):\n context = super(TaskSurveyView, self).get_context_data(**kwargs)\n survey_list = (Survey.objects.for_task(self.object).with_user().with_full_answer().all())\n context['survey_list'] = survey_list\n user_survey_list = [x for x in survey_list if x.user == self.request.user] # TODO: Lazy\n context['user_survey'] = user_survey_list[0] if user_survey_list else None\n return context\n\n\nclass TaskCreateView(RaisePermissionRequiredMixin, UserFormKwargsMixin,\n CreateMessageMixin, CreateView):\n model = Task\n form_class = TaskForm\n permission_required = 'monitorings.add_task'\n\n @cached_property\n def case(self):\n return get_object_or_404(Case.objects.select_related('monitoring'),\n pk=self.kwargs['case'])\n\n def get_permission_object(self):\n return self.case.monitoring\n\n def get_form_kwargs(self):\n kw = super(TaskCreateView, self).get_form_kwargs()\n kw['case'] = self.case\n return kw\n\n def get_context_data(self, **kwargs):\n context = super(TaskCreateView, self).get_context_data(**kwargs)\n context['case'] = self.case\n return context\n\n\nclass TaskUpdateView(AttrPermissionRequiredMixin, UserFormKwargsMixin,\n UpdateMessageMixin, FormValidMessageMixin, UpdateView):\n model = Task\n form_class = TaskForm\n permission_required = 'change_task'\n permission_attribute = 'case__monitoring'\n\n\nclass TaskDeleteView(AttrPermissionRequiredMixin, DeleteMessageMixin, DeleteView):\n model = Task\n success_url = reverse_lazy('tasks:list')\n permission_required = 'delete_task'\n permission_attribute = 'case__monitoring'\n\n\nclass SurveyDeleteView(LoginRequiredMixin, DeleteMessageMixin, DeleteView):\n model = Survey\n slug_url_kwarg = 'task_id'\n slug_field = 'task_id'\n\n def get_queryset(self, *args, **kwargs):\n qs = super(SurveyDeleteView, self).get_queryset()\n return qs.of_user(self.request.user, self.request.light_user).with_full_answer()\n\n def get_success_url(self):\n return self.object.task.get_absolute_url()\n\n\nclass SurveySelectView(AttrPermissionRequiredMixin, ActionMessageMixin,\n SelectRelatedMixin, ActionView): # TODO: Write test\n model = Survey\n template_name_suffix = '_select'\n select_related = ['task__case__monitoring', ]\n permission_required = 'monitorings.select_survey'\n permission_attribute = 'task__case__monitoring'\n direction = None\n change = {'up': 1, 'down': -1}\n\n def action(self, *args, **kwargs):\n self.object.credibility_update(self.change[self.direction])\n self.object.save()\n\n def get_success_message(self):\n return _(\"Survey {object} selected!\").format(object=self.object)\n\n def get_success_url(self):\n return reverse('tasks:survey', kwargs={'pk': self.object.task_id})\n\n\nclass SurveyFillView(FormView):\n template_name = 'tasks/survey_fill.html'\n form_class = SurveyForm\n formset_class = AnswerFormSet\n\n @cached_property\n def task(self):\n return get_object_or_404(Task, pk=self.kwargs['pk'])\n\n @cached_property\n def object(self):\n try:\n return Survey.objects.filter(task=self.task).of_user(user=self.request.user,\n light_user=self.request.light_user).all()[0]\n except IndexError:\n return None\n\n def get_form_kwargs(self):\n kwargs = super(SurveyFillView, self).get_form_kwargs()\n kwargs['task'] = self.task\n kwargs['instance'] = self.object\n return kwargs\n\n def get_success_url(self):\n if 'save' in self.request.POST: # only save\n return self.object.task.get_absolute_url()\n\n # find next task\n try:\n next_task = self.task.get_next_for_user(self.request.user)\n return next_task.get_absolute_url()\n except Task.DoesNotExist:\n messages.success(self.request, EXHAUSTED_TEXT)\n return self.task.case.monitoring.get_absolute_url()\n\n @cached_property\n def formset(self):\n return self.formset_class(data=self.request.POST or None,\n survey=self.object,\n questionary=self.task.questionary)\n\n def form_valid(self, form):\n self.object = form.save(commit=False)\n if self.formset.is_valid():\n if self.request.user.is_authenticated():\n self.object.user = self.request.user\n else:\n self.object.light_user = self.request.light_user_new\n self.object.save()\n self.formset.save()\n return self.formset_valid(form, self.object, self.formset)\n return self.render_to_response(self.get_context_data())\n\n def formset_valid(self, form, obj, formset):\n messages.success(self.request, THANK_TEXT)\n obj.save()\n formset.save()\n return redirect(self.get_success_url())\n\n def get_context_data(self, **kwargs):\n context = super(SurveyFillView, self).get_context_data(**kwargs)\n context['formset'] = self.formset\n context['object'] = self.object\n context['task'] = self.task\n return context\n", "path": "feder/tasks/views.py"}]} | 2,902 | 130 |
gh_patches_debug_9271 | rasdani/github-patches | git_diff | pyca__cryptography-4160 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
aes keywrap with padding does properly handle key to wrap length % 8 == 0
@SalusaSecondus and I found a bug in the new `aes_key_unwrap_with_padding` for wrapped keys where the plaintext is multiples of 8 bytes. Strangely, it looks like the NIST test vectors used do include cases like this, but they are passing.
The problem appears to be with the padding check[1], where if `mli` is a multiple of 8, `b` is 0, making the final check `not bytes_eq(data[-b:], b"\x00" * b)` becomes `not bytes_eq(data, b"")`
[1] https://github.com/pyca/cryptography/blob/master/src/cryptography/hazmat/primitives/keywrap.py#L120-L121
## Results of testing on Amazon Linux 2017.09.1
https://gist.github.com/mattsb42-aws/0f535c5827b96022879bc169897cf3cf
## To duplicate
```
#Amazon Linux does not have 3.6 by default
#sudo yum install python36
virtualenv test_keywrap -p python3.6
source test_keywrap/bin/activate
pip install cryptography==2.2 pytest
echo "
import os
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import keywrap
import pytest
def test_unpadded():
key = os.urandom(32)
key_to_wrap = os.urandom(32)
wrapped_key = keywrap.aes_key_wrap(wrapping_key=key, key_to_wrap=key_to_wrap, backend=default_backend())
assert keywrap.aes_key_unwrap(wrapping_key=key, wrapped_key=wrapped_key, backend=default_backend()) == key_to_wrap
@pytest.mark.parametrize('key_to_wrap_length', (11, 16, 32, 72, 99))
def test_padded_with_padding(key_to_wrap_length):
key = os.urandom(32)
key_to_wrap = os.urandom(key_to_wrap_length)
wrapped_key_with_padding = keywrap.aes_key_wrap_with_padding(wrapping_key=key, key_to_wrap=key_to_wrap, backend=default_backend())
print(wrapped_key_with_padding)
assert keywrap.aes_key_unwrap_with_padding(wrapping_key=key, wrapped_key=wrapped_key_with_padding, backend=default_backend()) == key_to_wrap
" > test_this.py
pytest test_this.py -l -vv
pip freeze
deactivate
```
</issue>
<code>
[start of src/cryptography/hazmat/primitives/keywrap.py]
1 # This file is dual licensed under the terms of the Apache License, Version
2 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
3 # for complete details.
4
5 from __future__ import absolute_import, division, print_function
6
7 import struct
8
9 from cryptography.hazmat.primitives.ciphers import Cipher
10 from cryptography.hazmat.primitives.ciphers.algorithms import AES
11 from cryptography.hazmat.primitives.ciphers.modes import ECB
12 from cryptography.hazmat.primitives.constant_time import bytes_eq
13
14
15 def _wrap_core(wrapping_key, a, r, backend):
16 # RFC 3394 Key Wrap - 2.2.1 (index method)
17 encryptor = Cipher(AES(wrapping_key), ECB(), backend).encryptor()
18 n = len(r)
19 for j in range(6):
20 for i in range(n):
21 # every encryption operation is a discrete 16 byte chunk (because
22 # AES has a 128-bit block size) and since we're using ECB it is
23 # safe to reuse the encryptor for the entire operation
24 b = encryptor.update(a + r[i])
25 # pack/unpack are safe as these are always 64-bit chunks
26 a = struct.pack(
27 ">Q", struct.unpack(">Q", b[:8])[0] ^ ((n * j) + i + 1)
28 )
29 r[i] = b[-8:]
30
31 assert encryptor.finalize() == b""
32
33 return a + b"".join(r)
34
35
36 def aes_key_wrap(wrapping_key, key_to_wrap, backend):
37 if len(wrapping_key) not in [16, 24, 32]:
38 raise ValueError("The wrapping key must be a valid AES key length")
39
40 if len(key_to_wrap) < 16:
41 raise ValueError("The key to wrap must be at least 16 bytes")
42
43 if len(key_to_wrap) % 8 != 0:
44 raise ValueError("The key to wrap must be a multiple of 8 bytes")
45
46 a = b"\xa6\xa6\xa6\xa6\xa6\xa6\xa6\xa6"
47 r = [key_to_wrap[i:i + 8] for i in range(0, len(key_to_wrap), 8)]
48 return _wrap_core(wrapping_key, a, r, backend)
49
50
51 def _unwrap_core(wrapping_key, a, r, backend):
52 # Implement RFC 3394 Key Unwrap - 2.2.2 (index method)
53 decryptor = Cipher(AES(wrapping_key), ECB(), backend).decryptor()
54 n = len(r)
55 for j in reversed(range(6)):
56 for i in reversed(range(n)):
57 # pack/unpack are safe as these are always 64-bit chunks
58 atr = struct.pack(
59 ">Q", struct.unpack(">Q", a)[0] ^ ((n * j) + i + 1)
60 ) + r[i]
61 # every decryption operation is a discrete 16 byte chunk so
62 # it is safe to reuse the decryptor for the entire operation
63 b = decryptor.update(atr)
64 a = b[:8]
65 r[i] = b[-8:]
66
67 assert decryptor.finalize() == b""
68 return a, r
69
70
71 def aes_key_wrap_with_padding(wrapping_key, key_to_wrap, backend):
72 if len(wrapping_key) not in [16, 24, 32]:
73 raise ValueError("The wrapping key must be a valid AES key length")
74
75 aiv = b"\xA6\x59\x59\xA6" + struct.pack(">i", len(key_to_wrap))
76 # pad the key to wrap if necessary
77 pad = (8 - (len(key_to_wrap) % 8)) % 8
78 key_to_wrap = key_to_wrap + b"\x00" * pad
79 if len(key_to_wrap) == 8:
80 # RFC 5649 - 4.1 - exactly 8 octets after padding
81 encryptor = Cipher(AES(wrapping_key), ECB(), backend).encryptor()
82 b = encryptor.update(aiv + key_to_wrap)
83 assert encryptor.finalize() == b""
84 return b
85 else:
86 r = [key_to_wrap[i:i + 8] for i in range(0, len(key_to_wrap), 8)]
87 return _wrap_core(wrapping_key, aiv, r, backend)
88
89
90 def aes_key_unwrap_with_padding(wrapping_key, wrapped_key, backend):
91 if len(wrapped_key) < 16:
92 raise ValueError("Must be at least 16 bytes")
93
94 if len(wrapping_key) not in [16, 24, 32]:
95 raise ValueError("The wrapping key must be a valid AES key length")
96
97 if len(wrapped_key) == 16:
98 # RFC 5649 - 4.2 - exactly two 64-bit blocks
99 decryptor = Cipher(AES(wrapping_key), ECB(), backend).decryptor()
100 b = decryptor.update(wrapped_key)
101 assert decryptor.finalize() == b""
102 a = b[:8]
103 data = b[8:]
104 n = 1
105 else:
106 r = [wrapped_key[i:i + 8] for i in range(0, len(wrapped_key), 8)]
107 encrypted_aiv = r.pop(0)
108 n = len(r)
109 a, r = _unwrap_core(wrapping_key, encrypted_aiv, r, backend)
110 data = b"".join(r)
111
112 # 1) Check that MSB(32,A) = A65959A6.
113 # 2) Check that 8*(n-1) < LSB(32,A) <= 8*n. If so, let
114 # MLI = LSB(32,A).
115 # 3) Let b = (8*n)-MLI, and then check that the rightmost b octets of
116 # the output data are zero.
117 (mli,) = struct.unpack(">I", a[4:])
118 b = (8 * n) - mli
119 if (
120 not bytes_eq(a[:4], b"\xa6\x59\x59\xa6") or not
121 8 * (n - 1) < mli <= 8 * n or not bytes_eq(data[-b:], b"\x00" * b)
122 ):
123 raise InvalidUnwrap()
124
125 return data[:-b]
126
127
128 def aes_key_unwrap(wrapping_key, wrapped_key, backend):
129 if len(wrapped_key) < 24:
130 raise ValueError("Must be at least 24 bytes")
131
132 if len(wrapped_key) % 8 != 0:
133 raise ValueError("The wrapped key must be a multiple of 8 bytes")
134
135 if len(wrapping_key) not in [16, 24, 32]:
136 raise ValueError("The wrapping key must be a valid AES key length")
137
138 aiv = b"\xa6\xa6\xa6\xa6\xa6\xa6\xa6\xa6"
139 r = [wrapped_key[i:i + 8] for i in range(0, len(wrapped_key), 8)]
140 a = r.pop(0)
141 a, r = _unwrap_core(wrapping_key, a, r, backend)
142 if not bytes_eq(a, aiv):
143 raise InvalidUnwrap()
144
145 return b"".join(r)
146
147
148 class InvalidUnwrap(Exception):
149 pass
150
[end of src/cryptography/hazmat/primitives/keywrap.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/cryptography/hazmat/primitives/keywrap.py b/src/cryptography/hazmat/primitives/keywrap.py
--- a/src/cryptography/hazmat/primitives/keywrap.py
+++ b/src/cryptography/hazmat/primitives/keywrap.py
@@ -118,11 +118,16 @@
b = (8 * n) - mli
if (
not bytes_eq(a[:4], b"\xa6\x59\x59\xa6") or not
- 8 * (n - 1) < mli <= 8 * n or not bytes_eq(data[-b:], b"\x00" * b)
+ 8 * (n - 1) < mli <= 8 * n or (
+ b != 0 and not bytes_eq(data[-b:], b"\x00" * b)
+ )
):
raise InvalidUnwrap()
- return data[:-b]
+ if b == 0:
+ return data
+ else:
+ return data[:-b]
def aes_key_unwrap(wrapping_key, wrapped_key, backend):
| {"golden_diff": "diff --git a/src/cryptography/hazmat/primitives/keywrap.py b/src/cryptography/hazmat/primitives/keywrap.py\n--- a/src/cryptography/hazmat/primitives/keywrap.py\n+++ b/src/cryptography/hazmat/primitives/keywrap.py\n@@ -118,11 +118,16 @@\n b = (8 * n) - mli\n if (\n not bytes_eq(a[:4], b\"\\xa6\\x59\\x59\\xa6\") or not\n- 8 * (n - 1) < mli <= 8 * n or not bytes_eq(data[-b:], b\"\\x00\" * b)\n+ 8 * (n - 1) < mli <= 8 * n or (\n+ b != 0 and not bytes_eq(data[-b:], b\"\\x00\" * b)\n+ )\n ):\n raise InvalidUnwrap()\n \n- return data[:-b]\n+ if b == 0:\n+ return data\n+ else:\n+ return data[:-b]\n \n \n def aes_key_unwrap(wrapping_key, wrapped_key, backend):\n", "issue": "aes keywrap with padding does properly handle key to wrap length % 8 == 0\n@SalusaSecondus and I found a bug in the new `aes_key_unwrap_with_padding` for wrapped keys where the plaintext is multiples of 8 bytes. Strangely, it looks like the NIST test vectors used do include cases like this, but they are passing.\r\n\r\nThe problem appears to be with the padding check[1], where if `mli` is a multiple of 8, `b` is 0, making the final check `not bytes_eq(data[-b:], b\"\\x00\" * b)` becomes `not bytes_eq(data, b\"\")`\r\n\r\n[1] https://github.com/pyca/cryptography/blob/master/src/cryptography/hazmat/primitives/keywrap.py#L120-L121\r\n\r\n## Results of testing on Amazon Linux 2017.09.1\r\n\r\nhttps://gist.github.com/mattsb42-aws/0f535c5827b96022879bc169897cf3cf\r\n\r\n## To duplicate\r\n```\r\n#Amazon Linux does not have 3.6 by default\r\n#sudo yum install python36\r\n\r\nvirtualenv test_keywrap -p python3.6\r\nsource test_keywrap/bin/activate\r\npip install cryptography==2.2 pytest\r\n\r\necho \"\r\nimport os\r\n\r\nfrom cryptography.hazmat.backends import default_backend\r\nfrom cryptography.hazmat.primitives import keywrap\r\nimport pytest\r\n\r\ndef test_unpadded():\r\n key = os.urandom(32)\r\n key_to_wrap = os.urandom(32)\r\n\r\n wrapped_key = keywrap.aes_key_wrap(wrapping_key=key, key_to_wrap=key_to_wrap, backend=default_backend())\r\n assert keywrap.aes_key_unwrap(wrapping_key=key, wrapped_key=wrapped_key, backend=default_backend()) == key_to_wrap\r\n\r\[email protected]('key_to_wrap_length', (11, 16, 32, 72, 99))\r\ndef test_padded_with_padding(key_to_wrap_length):\r\n key = os.urandom(32)\r\n key_to_wrap = os.urandom(key_to_wrap_length)\r\n\r\n wrapped_key_with_padding = keywrap.aes_key_wrap_with_padding(wrapping_key=key, key_to_wrap=key_to_wrap, backend=default_backend())\r\n print(wrapped_key_with_padding)\r\n assert keywrap.aes_key_unwrap_with_padding(wrapping_key=key, wrapped_key=wrapped_key_with_padding, backend=default_backend()) == key_to_wrap\r\n\r\n\" > test_this.py\r\n\r\npytest test_this.py -l -vv\r\n\r\npip freeze\r\n\r\ndeactivate\r\n```\r\n\r\n\n", "before_files": [{"content": "# This file is dual licensed under the terms of the Apache License, Version\n# 2.0, and the BSD License. See the LICENSE file in the root of this repository\n# for complete details.\n\nfrom __future__ import absolute_import, division, print_function\n\nimport struct\n\nfrom cryptography.hazmat.primitives.ciphers import Cipher\nfrom cryptography.hazmat.primitives.ciphers.algorithms import AES\nfrom cryptography.hazmat.primitives.ciphers.modes import ECB\nfrom cryptography.hazmat.primitives.constant_time import bytes_eq\n\n\ndef _wrap_core(wrapping_key, a, r, backend):\n # RFC 3394 Key Wrap - 2.2.1 (index method)\n encryptor = Cipher(AES(wrapping_key), ECB(), backend).encryptor()\n n = len(r)\n for j in range(6):\n for i in range(n):\n # every encryption operation is a discrete 16 byte chunk (because\n # AES has a 128-bit block size) and since we're using ECB it is\n # safe to reuse the encryptor for the entire operation\n b = encryptor.update(a + r[i])\n # pack/unpack are safe as these are always 64-bit chunks\n a = struct.pack(\n \">Q\", struct.unpack(\">Q\", b[:8])[0] ^ ((n * j) + i + 1)\n )\n r[i] = b[-8:]\n\n assert encryptor.finalize() == b\"\"\n\n return a + b\"\".join(r)\n\n\ndef aes_key_wrap(wrapping_key, key_to_wrap, backend):\n if len(wrapping_key) not in [16, 24, 32]:\n raise ValueError(\"The wrapping key must be a valid AES key length\")\n\n if len(key_to_wrap) < 16:\n raise ValueError(\"The key to wrap must be at least 16 bytes\")\n\n if len(key_to_wrap) % 8 != 0:\n raise ValueError(\"The key to wrap must be a multiple of 8 bytes\")\n\n a = b\"\\xa6\\xa6\\xa6\\xa6\\xa6\\xa6\\xa6\\xa6\"\n r = [key_to_wrap[i:i + 8] for i in range(0, len(key_to_wrap), 8)]\n return _wrap_core(wrapping_key, a, r, backend)\n\n\ndef _unwrap_core(wrapping_key, a, r, backend):\n # Implement RFC 3394 Key Unwrap - 2.2.2 (index method)\n decryptor = Cipher(AES(wrapping_key), ECB(), backend).decryptor()\n n = len(r)\n for j in reversed(range(6)):\n for i in reversed(range(n)):\n # pack/unpack are safe as these are always 64-bit chunks\n atr = struct.pack(\n \">Q\", struct.unpack(\">Q\", a)[0] ^ ((n * j) + i + 1)\n ) + r[i]\n # every decryption operation is a discrete 16 byte chunk so\n # it is safe to reuse the decryptor for the entire operation\n b = decryptor.update(atr)\n a = b[:8]\n r[i] = b[-8:]\n\n assert decryptor.finalize() == b\"\"\n return a, r\n\n\ndef aes_key_wrap_with_padding(wrapping_key, key_to_wrap, backend):\n if len(wrapping_key) not in [16, 24, 32]:\n raise ValueError(\"The wrapping key must be a valid AES key length\")\n\n aiv = b\"\\xA6\\x59\\x59\\xA6\" + struct.pack(\">i\", len(key_to_wrap))\n # pad the key to wrap if necessary\n pad = (8 - (len(key_to_wrap) % 8)) % 8\n key_to_wrap = key_to_wrap + b\"\\x00\" * pad\n if len(key_to_wrap) == 8:\n # RFC 5649 - 4.1 - exactly 8 octets after padding\n encryptor = Cipher(AES(wrapping_key), ECB(), backend).encryptor()\n b = encryptor.update(aiv + key_to_wrap)\n assert encryptor.finalize() == b\"\"\n return b\n else:\n r = [key_to_wrap[i:i + 8] for i in range(0, len(key_to_wrap), 8)]\n return _wrap_core(wrapping_key, aiv, r, backend)\n\n\ndef aes_key_unwrap_with_padding(wrapping_key, wrapped_key, backend):\n if len(wrapped_key) < 16:\n raise ValueError(\"Must be at least 16 bytes\")\n\n if len(wrapping_key) not in [16, 24, 32]:\n raise ValueError(\"The wrapping key must be a valid AES key length\")\n\n if len(wrapped_key) == 16:\n # RFC 5649 - 4.2 - exactly two 64-bit blocks\n decryptor = Cipher(AES(wrapping_key), ECB(), backend).decryptor()\n b = decryptor.update(wrapped_key)\n assert decryptor.finalize() == b\"\"\n a = b[:8]\n data = b[8:]\n n = 1\n else:\n r = [wrapped_key[i:i + 8] for i in range(0, len(wrapped_key), 8)]\n encrypted_aiv = r.pop(0)\n n = len(r)\n a, r = _unwrap_core(wrapping_key, encrypted_aiv, r, backend)\n data = b\"\".join(r)\n\n # 1) Check that MSB(32,A) = A65959A6.\n # 2) Check that 8*(n-1) < LSB(32,A) <= 8*n. If so, let\n # MLI = LSB(32,A).\n # 3) Let b = (8*n)-MLI, and then check that the rightmost b octets of\n # the output data are zero.\n (mli,) = struct.unpack(\">I\", a[4:])\n b = (8 * n) - mli\n if (\n not bytes_eq(a[:4], b\"\\xa6\\x59\\x59\\xa6\") or not\n 8 * (n - 1) < mli <= 8 * n or not bytes_eq(data[-b:], b\"\\x00\" * b)\n ):\n raise InvalidUnwrap()\n\n return data[:-b]\n\n\ndef aes_key_unwrap(wrapping_key, wrapped_key, backend):\n if len(wrapped_key) < 24:\n raise ValueError(\"Must be at least 24 bytes\")\n\n if len(wrapped_key) % 8 != 0:\n raise ValueError(\"The wrapped key must be a multiple of 8 bytes\")\n\n if len(wrapping_key) not in [16, 24, 32]:\n raise ValueError(\"The wrapping key must be a valid AES key length\")\n\n aiv = b\"\\xa6\\xa6\\xa6\\xa6\\xa6\\xa6\\xa6\\xa6\"\n r = [wrapped_key[i:i + 8] for i in range(0, len(wrapped_key), 8)]\n a = r.pop(0)\n a, r = _unwrap_core(wrapping_key, a, r, backend)\n if not bytes_eq(a, aiv):\n raise InvalidUnwrap()\n\n return b\"\".join(r)\n\n\nclass InvalidUnwrap(Exception):\n pass\n", "path": "src/cryptography/hazmat/primitives/keywrap.py"}]} | 3,130 | 250 |
gh_patches_debug_12385 | rasdani/github-patches | git_diff | pypa__pip-3397 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
ValueError while unpacking platform.mac_ver() on OS X 10.11
on Travis `osx10.11` image, I am getting `ValueError` while trying to run `python get-pip.py --user` with El Capitan's built-in python 2.7.10:
```
Traceback (most recent call last):
File "get-pip.py", line 19000, in <module>
main()
File "get-pip.py", line 179, in main
bootstrap(tmpdir=tmpdir)
File "get-pip.py", line 82, in bootstrap
import pip
File "/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/__init__.py", line 15, in <module>
File "/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/vcs/subversion.py", line 9, in <module>
File "/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/index.py", line 29, in <module>
File "/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/wheel.py", line 32, in <module>
File "/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/pep425tags.py", line 214, in <module>
File "/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/pep425tags.py", line 162, in get_supported
File "/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/pep425tags.py", line 119, in get_platform
ValueError: need more than 2 values to unpack
```
Full log here: https://travis-ci.org/behdad/fonttools/jobs/103554883
I think it's because of this commit:
https://github.com/pypa/pip/commit/995deff93977fbb85d07df3e4c15388f0f0140e2
It looks like `platform.mac_ver()` doesn't always return a tuple of 3 elements, but sometimes only 2...
</issue>
<code>
[start of pip/pep425tags.py]
1 """Generate and work with PEP 425 Compatibility Tags."""
2 from __future__ import absolute_import
3
4 import re
5 import sys
6 import warnings
7 import platform
8
9 try:
10 import sysconfig
11 except ImportError: # pragma nocover
12 # Python < 2.7
13 import distutils.sysconfig as sysconfig
14 import distutils.util
15
16 _osx_arch_pat = re.compile(r'(.+)_(\d+)_(\d+)_(.+)')
17
18
19 def get_config_var(var):
20 try:
21 return sysconfig.get_config_var(var)
22 except IOError as e: # Issue #1074
23 warnings.warn("{0}".format(e), RuntimeWarning)
24 return None
25
26
27 def get_abbr_impl():
28 """Return abbreviated implementation name."""
29 if hasattr(sys, 'pypy_version_info'):
30 pyimpl = 'pp'
31 elif sys.platform.startswith('java'):
32 pyimpl = 'jy'
33 elif sys.platform == 'cli':
34 pyimpl = 'ip'
35 else:
36 pyimpl = 'cp'
37 return pyimpl
38
39
40 def get_impl_ver():
41 """Return implementation version."""
42 impl_ver = get_config_var("py_version_nodot")
43 if not impl_ver or get_abbr_impl() == 'pp':
44 impl_ver = ''.join(map(str, get_impl_version_info()))
45 return impl_ver
46
47
48 def get_impl_version_info():
49 """Return sys.version_info-like tuple for use in decrementing the minor
50 version."""
51 if get_abbr_impl() == 'pp':
52 # as per https://github.com/pypa/pip/issues/2882
53 return (sys.version_info[0], sys.pypy_version_info.major,
54 sys.pypy_version_info.minor)
55 else:
56 return sys.version_info[0], sys.version_info[1]
57
58
59 def get_impl_tag():
60 """
61 Returns the Tag for this specific implementation.
62 """
63 return "{0}{1}".format(get_abbr_impl(), get_impl_ver())
64
65
66 def get_flag(var, fallback, expected=True, warn=True):
67 """Use a fallback method for determining SOABI flags if the needed config
68 var is unset or unavailable."""
69 val = get_config_var(var)
70 if val is None:
71 if warn:
72 warnings.warn("Config variable '{0}' is unset, Python ABI tag may "
73 "be incorrect".format(var), RuntimeWarning, 2)
74 return fallback()
75 return val == expected
76
77
78 def get_abi_tag():
79 """Return the ABI tag based on SOABI (if available) or emulate SOABI
80 (CPython 2, PyPy)."""
81 soabi = get_config_var('SOABI')
82 impl = get_abbr_impl()
83 if not soabi and impl in ('cp', 'pp') and hasattr(sys, 'maxunicode'):
84 d = ''
85 m = ''
86 u = ''
87 if get_flag('Py_DEBUG',
88 lambda: hasattr(sys, 'gettotalrefcount'),
89 warn=(impl == 'cp')):
90 d = 'd'
91 if get_flag('WITH_PYMALLOC',
92 lambda: impl == 'cp',
93 warn=(impl == 'cp')):
94 m = 'm'
95 if get_flag('Py_UNICODE_SIZE',
96 lambda: sys.maxunicode == 0x10ffff,
97 expected=4,
98 warn=(impl == 'cp' and
99 sys.version_info < (3, 3))) \
100 and sys.version_info < (3, 3):
101 u = 'u'
102 abi = '%s%s%s%s%s' % (impl, get_impl_ver(), d, m, u)
103 elif soabi and soabi.startswith('cpython-'):
104 abi = 'cp' + soabi.split('-')[1]
105 elif soabi:
106 abi = soabi.replace('.', '_').replace('-', '_')
107 else:
108 abi = None
109 return abi
110
111
112 def get_platform():
113 """Return our platform name 'win32', 'linux_x86_64'"""
114 if sys.platform == 'darwin':
115 # distutils.util.get_platform() returns the release based on the value
116 # of MACOSX_DEPLOYMENT_TARGET on which Python was built, which may
117 # be signficantly older than the user's current machine.
118 release, _, machine = platform.mac_ver()
119 major, minor, micro = release.split('.')
120 return 'macosx_{0}_{1}_{2}'.format(major, minor, machine)
121 # XXX remove distutils dependency
122 return distutils.util.get_platform().replace('.', '_').replace('-', '_')
123
124
125 def get_supported(versions=None, noarch=False):
126 """Return a list of supported tags for each version specified in
127 `versions`.
128
129 :param versions: a list of string versions, of the form ["33", "32"],
130 or None. The first version will be assumed to support our ABI.
131 """
132 supported = []
133
134 # Versions must be given with respect to the preference
135 if versions is None:
136 versions = []
137 version_info = get_impl_version_info()
138 major = version_info[:-1]
139 # Support all previous minor Python versions.
140 for minor in range(version_info[-1], -1, -1):
141 versions.append(''.join(map(str, major + (minor,))))
142
143 impl = get_abbr_impl()
144
145 abis = []
146
147 abi = get_abi_tag()
148 if abi:
149 abis[0:0] = [abi]
150
151 abi3s = set()
152 import imp
153 for suffix in imp.get_suffixes():
154 if suffix[0].startswith('.abi'):
155 abi3s.add(suffix[0].split('.', 2)[1])
156
157 abis.extend(sorted(list(abi3s)))
158
159 abis.append('none')
160
161 if not noarch:
162 arch = get_platform()
163 if sys.platform == 'darwin':
164 # support macosx-10.6-intel on macosx-10.9-x86_64
165 match = _osx_arch_pat.match(arch)
166 if match:
167 name, major, minor, actual_arch = match.groups()
168 actual_arches = [actual_arch]
169 if actual_arch in ('i386', 'ppc'):
170 actual_arches.append('fat')
171 if actual_arch in ('i386', 'x86_64'):
172 actual_arches.append('intel')
173 if actual_arch in ('ppc64', 'x86_64'):
174 actual_arches.append('fat64')
175 if actual_arch in ('i386', 'ppc', 'x86_64'):
176 actual_arches.append('fat32')
177 if actual_arch in ('i386', 'x86_64', 'intel', 'ppc', 'ppc64'):
178 actual_arches.append('universal')
179 tpl = '{0}_{1}_%i_%s'.format(name, major)
180 arches = []
181 for m in reversed(range(int(minor) + 1)):
182 for a in actual_arches:
183 arches.append(tpl % (m, a))
184 else:
185 # arch pattern didn't match (?!)
186 arches = [arch]
187 else:
188 arches = [arch]
189
190 # Current version, current API (built specifically for our Python):
191 for abi in abis:
192 for arch in arches:
193 supported.append(('%s%s' % (impl, versions[0]), abi, arch))
194
195 # Has binaries, does not use the Python API:
196 supported.append(('py%s' % (versions[0][0]), 'none', arch))
197
198 # No abi / arch, but requires our implementation:
199 for i, version in enumerate(versions):
200 supported.append(('%s%s' % (impl, version), 'none', 'any'))
201 if i == 0:
202 # Tagged specifically as being cross-version compatible
203 # (with just the major version specified)
204 supported.append(('%s%s' % (impl, versions[0][0]), 'none', 'any'))
205
206 # No abi / arch, generic Python
207 for i, version in enumerate(versions):
208 supported.append(('py%s' % (version,), 'none', 'any'))
209 if i == 0:
210 supported.append(('py%s' % (version[0]), 'none', 'any'))
211
212 return supported
213
214 supported_tags = get_supported()
215 supported_tags_noarch = get_supported(noarch=True)
216
217 implementation_tag = get_impl_tag()
218
[end of pip/pep425tags.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/pip/pep425tags.py b/pip/pep425tags.py
--- a/pip/pep425tags.py
+++ b/pip/pep425tags.py
@@ -116,8 +116,8 @@
# of MACOSX_DEPLOYMENT_TARGET on which Python was built, which may
# be signficantly older than the user's current machine.
release, _, machine = platform.mac_ver()
- major, minor, micro = release.split('.')
- return 'macosx_{0}_{1}_{2}'.format(major, minor, machine)
+ split_ver = release.split('.')
+ return 'macosx_{0}_{1}_{2}'.format(split_ver[0], split_ver[1], machine)
# XXX remove distutils dependency
return distutils.util.get_platform().replace('.', '_').replace('-', '_')
| {"golden_diff": "diff --git a/pip/pep425tags.py b/pip/pep425tags.py\n--- a/pip/pep425tags.py\n+++ b/pip/pep425tags.py\n@@ -116,8 +116,8 @@\n # of MACOSX_DEPLOYMENT_TARGET on which Python was built, which may\n # be signficantly older than the user's current machine.\n release, _, machine = platform.mac_ver()\n- major, minor, micro = release.split('.')\n- return 'macosx_{0}_{1}_{2}'.format(major, minor, machine)\n+ split_ver = release.split('.')\n+ return 'macosx_{0}_{1}_{2}'.format(split_ver[0], split_ver[1], machine)\n # XXX remove distutils dependency\n return distutils.util.get_platform().replace('.', '_').replace('-', '_')\n", "issue": "ValueError while unpacking platform.mac_ver() on OS X 10.11\non Travis `osx10.11` image, I am getting `ValueError` while trying to run `python get-pip.py --user` with El Capitan's built-in python 2.7.10:\n\n```\nTraceback (most recent call last):\n File \"get-pip.py\", line 19000, in <module>\n main()\n File \"get-pip.py\", line 179, in main\n bootstrap(tmpdir=tmpdir)\n File \"get-pip.py\", line 82, in bootstrap\n import pip\n File \"/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/__init__.py\", line 15, in <module>\n File \"/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/vcs/subversion.py\", line 9, in <module>\n File \"/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/index.py\", line 29, in <module>\n File \"/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/wheel.py\", line 32, in <module>\n File \"/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/pep425tags.py\", line 214, in <module>\n File \"/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/pep425tags.py\", line 162, in get_supported\n File \"/var/folders/my/m6ynh3bn6tq06h7xr3js0z7r0000gn/T/tmpZ_zMd5/pip.zip/pip/pep425tags.py\", line 119, in get_platform\nValueError: need more than 2 values to unpack\n```\n\nFull log here: https://travis-ci.org/behdad/fonttools/jobs/103554883\n\nI think it's because of this commit:\nhttps://github.com/pypa/pip/commit/995deff93977fbb85d07df3e4c15388f0f0140e2\n\nIt looks like `platform.mac_ver()` doesn't always return a tuple of 3 elements, but sometimes only 2...\n\n", "before_files": [{"content": "\"\"\"Generate and work with PEP 425 Compatibility Tags.\"\"\"\nfrom __future__ import absolute_import\n\nimport re\nimport sys\nimport warnings\nimport platform\n\ntry:\n import sysconfig\nexcept ImportError: # pragma nocover\n # Python < 2.7\n import distutils.sysconfig as sysconfig\nimport distutils.util\n\n_osx_arch_pat = re.compile(r'(.+)_(\\d+)_(\\d+)_(.+)')\n\n\ndef get_config_var(var):\n try:\n return sysconfig.get_config_var(var)\n except IOError as e: # Issue #1074\n warnings.warn(\"{0}\".format(e), RuntimeWarning)\n return None\n\n\ndef get_abbr_impl():\n \"\"\"Return abbreviated implementation name.\"\"\"\n if hasattr(sys, 'pypy_version_info'):\n pyimpl = 'pp'\n elif sys.platform.startswith('java'):\n pyimpl = 'jy'\n elif sys.platform == 'cli':\n pyimpl = 'ip'\n else:\n pyimpl = 'cp'\n return pyimpl\n\n\ndef get_impl_ver():\n \"\"\"Return implementation version.\"\"\"\n impl_ver = get_config_var(\"py_version_nodot\")\n if not impl_ver or get_abbr_impl() == 'pp':\n impl_ver = ''.join(map(str, get_impl_version_info()))\n return impl_ver\n\n\ndef get_impl_version_info():\n \"\"\"Return sys.version_info-like tuple for use in decrementing the minor\n version.\"\"\"\n if get_abbr_impl() == 'pp':\n # as per https://github.com/pypa/pip/issues/2882\n return (sys.version_info[0], sys.pypy_version_info.major,\n sys.pypy_version_info.minor)\n else:\n return sys.version_info[0], sys.version_info[1]\n\n\ndef get_impl_tag():\n \"\"\"\n Returns the Tag for this specific implementation.\n \"\"\"\n return \"{0}{1}\".format(get_abbr_impl(), get_impl_ver())\n\n\ndef get_flag(var, fallback, expected=True, warn=True):\n \"\"\"Use a fallback method for determining SOABI flags if the needed config\n var is unset or unavailable.\"\"\"\n val = get_config_var(var)\n if val is None:\n if warn:\n warnings.warn(\"Config variable '{0}' is unset, Python ABI tag may \"\n \"be incorrect\".format(var), RuntimeWarning, 2)\n return fallback()\n return val == expected\n\n\ndef get_abi_tag():\n \"\"\"Return the ABI tag based on SOABI (if available) or emulate SOABI\n (CPython 2, PyPy).\"\"\"\n soabi = get_config_var('SOABI')\n impl = get_abbr_impl()\n if not soabi and impl in ('cp', 'pp') and hasattr(sys, 'maxunicode'):\n d = ''\n m = ''\n u = ''\n if get_flag('Py_DEBUG',\n lambda: hasattr(sys, 'gettotalrefcount'),\n warn=(impl == 'cp')):\n d = 'd'\n if get_flag('WITH_PYMALLOC',\n lambda: impl == 'cp',\n warn=(impl == 'cp')):\n m = 'm'\n if get_flag('Py_UNICODE_SIZE',\n lambda: sys.maxunicode == 0x10ffff,\n expected=4,\n warn=(impl == 'cp' and\n sys.version_info < (3, 3))) \\\n and sys.version_info < (3, 3):\n u = 'u'\n abi = '%s%s%s%s%s' % (impl, get_impl_ver(), d, m, u)\n elif soabi and soabi.startswith('cpython-'):\n abi = 'cp' + soabi.split('-')[1]\n elif soabi:\n abi = soabi.replace('.', '_').replace('-', '_')\n else:\n abi = None\n return abi\n\n\ndef get_platform():\n \"\"\"Return our platform name 'win32', 'linux_x86_64'\"\"\"\n if sys.platform == 'darwin':\n # distutils.util.get_platform() returns the release based on the value\n # of MACOSX_DEPLOYMENT_TARGET on which Python was built, which may\n # be signficantly older than the user's current machine.\n release, _, machine = platform.mac_ver()\n major, minor, micro = release.split('.')\n return 'macosx_{0}_{1}_{2}'.format(major, minor, machine)\n # XXX remove distutils dependency\n return distutils.util.get_platform().replace('.', '_').replace('-', '_')\n\n\ndef get_supported(versions=None, noarch=False):\n \"\"\"Return a list of supported tags for each version specified in\n `versions`.\n\n :param versions: a list of string versions, of the form [\"33\", \"32\"],\n or None. The first version will be assumed to support our ABI.\n \"\"\"\n supported = []\n\n # Versions must be given with respect to the preference\n if versions is None:\n versions = []\n version_info = get_impl_version_info()\n major = version_info[:-1]\n # Support all previous minor Python versions.\n for minor in range(version_info[-1], -1, -1):\n versions.append(''.join(map(str, major + (minor,))))\n\n impl = get_abbr_impl()\n\n abis = []\n\n abi = get_abi_tag()\n if abi:\n abis[0:0] = [abi]\n\n abi3s = set()\n import imp\n for suffix in imp.get_suffixes():\n if suffix[0].startswith('.abi'):\n abi3s.add(suffix[0].split('.', 2)[1])\n\n abis.extend(sorted(list(abi3s)))\n\n abis.append('none')\n\n if not noarch:\n arch = get_platform()\n if sys.platform == 'darwin':\n # support macosx-10.6-intel on macosx-10.9-x86_64\n match = _osx_arch_pat.match(arch)\n if match:\n name, major, minor, actual_arch = match.groups()\n actual_arches = [actual_arch]\n if actual_arch in ('i386', 'ppc'):\n actual_arches.append('fat')\n if actual_arch in ('i386', 'x86_64'):\n actual_arches.append('intel')\n if actual_arch in ('ppc64', 'x86_64'):\n actual_arches.append('fat64')\n if actual_arch in ('i386', 'ppc', 'x86_64'):\n actual_arches.append('fat32')\n if actual_arch in ('i386', 'x86_64', 'intel', 'ppc', 'ppc64'):\n actual_arches.append('universal')\n tpl = '{0}_{1}_%i_%s'.format(name, major)\n arches = []\n for m in reversed(range(int(minor) + 1)):\n for a in actual_arches:\n arches.append(tpl % (m, a))\n else:\n # arch pattern didn't match (?!)\n arches = [arch]\n else:\n arches = [arch]\n\n # Current version, current API (built specifically for our Python):\n for abi in abis:\n for arch in arches:\n supported.append(('%s%s' % (impl, versions[0]), abi, arch))\n\n # Has binaries, does not use the Python API:\n supported.append(('py%s' % (versions[0][0]), 'none', arch))\n\n # No abi / arch, but requires our implementation:\n for i, version in enumerate(versions):\n supported.append(('%s%s' % (impl, version), 'none', 'any'))\n if i == 0:\n # Tagged specifically as being cross-version compatible\n # (with just the major version specified)\n supported.append(('%s%s' % (impl, versions[0][0]), 'none', 'any'))\n\n # No abi / arch, generic Python\n for i, version in enumerate(versions):\n supported.append(('py%s' % (version,), 'none', 'any'))\n if i == 0:\n supported.append(('py%s' % (version[0]), 'none', 'any'))\n\n return supported\n\nsupported_tags = get_supported()\nsupported_tags_noarch = get_supported(noarch=True)\n\nimplementation_tag = get_impl_tag()\n", "path": "pip/pep425tags.py"}]} | 3,611 | 201 |
gh_patches_debug_23575 | rasdani/github-patches | git_diff | optuna__optuna-1876 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Improve ThresholdPruner example
The variable `n_trial_step` in [Threshold Pruner](https://optuna.readthedocs.io/en/stable/reference/generated/optuna.pruners.ThresholdPruner.html) is not used.
Improve ThresholdPruner example
The variable `n_trial_step` in [Threshold Pruner](https://optuna.readthedocs.io/en/stable/reference/generated/optuna.pruners.ThresholdPruner.html) is not used.
</issue>
<code>
[start of optuna/pruners/_threshold.py]
1 import math
2 from typing import Any
3 from typing import Optional
4
5 import optuna
6 from optuna.pruners import BasePruner
7 from optuna.pruners._percentile import _is_first_in_interval_step
8
9
10 def _check_value(value: Any) -> float:
11 try:
12 # For convenience, we allow users to report a value that can be cast to `float`.
13 value = float(value)
14 except (TypeError, ValueError):
15 message = "The `value` argument is of type '{}' but supposed to be a float.".format(
16 type(value).__name__
17 )
18 raise TypeError(message) from None
19
20 return value
21
22
23 class ThresholdPruner(BasePruner):
24 """Pruner to detect outlying metrics of the trials.
25
26 Prune if a metric exceeds upper threshold,
27 falls behind lower threshold or reaches ``nan``.
28
29 Example:
30 .. testcode::
31
32 from optuna import create_study
33 from optuna.pruners import ThresholdPruner
34 from optuna import TrialPruned
35
36
37 def objective_for_upper(trial):
38 for step, y in enumerate(ys_for_upper):
39 trial.report(y, step)
40
41 if trial.should_prune():
42 raise TrialPruned()
43 return ys_for_upper[-1]
44
45
46 def objective_for_lower(trial):
47 for step, y in enumerate(ys_for_lower):
48 trial.report(y, step)
49
50 if trial.should_prune():
51 raise TrialPruned()
52 return ys_for_lower[-1]
53
54
55 ys_for_upper = [0.0, 0.1, 0.2, 0.5, 1.2]
56 ys_for_lower = [100.0, 90.0, 0.1, 0.0, -1]
57 n_trial_step = 5
58
59 study = create_study(pruner=ThresholdPruner(upper=1.0))
60 study.optimize(objective_for_upper, n_trials=10)
61
62 study = create_study(pruner=ThresholdPruner(lower=0.0))
63 study.optimize(objective_for_lower, n_trials=10)
64
65 Args
66 lower:
67 A minimum value which determines whether pruner prunes or not.
68 If an intermediate value is smaller than lower, it prunes.
69 upper:
70 A maximum value which determines whether pruner prunes or not.
71 If an intermediate value is larger than upper, it prunes.
72 n_warmup_steps:
73 Pruning is disabled until the trial exceeds the given number of step.
74 interval_steps:
75 Interval in number of steps between the pruning checks, offset by the warmup steps.
76 If no value has been reported at the time of a pruning check, that particular check
77 will be postponed until a value is reported. Value must be at least 1.
78
79 """
80
81 def __init__(
82 self,
83 lower: Optional[float] = None,
84 upper: Optional[float] = None,
85 n_warmup_steps: int = 0,
86 interval_steps: int = 1,
87 ) -> None:
88
89 if lower is None and upper is None:
90 raise TypeError("Either lower or upper must be specified.")
91 if lower is not None:
92 lower = _check_value(lower)
93 if upper is not None:
94 upper = _check_value(upper)
95
96 lower = lower if lower is not None else -float("inf")
97 upper = upper if upper is not None else float("inf")
98
99 if lower > upper:
100 raise ValueError("lower should be smaller than upper.")
101 if n_warmup_steps < 0:
102 raise ValueError(
103 "Number of warmup steps cannot be negative but got {}.".format(n_warmup_steps)
104 )
105 if interval_steps < 1:
106 raise ValueError(
107 "Pruning interval steps must be at least 1 but got {}.".format(interval_steps)
108 )
109
110 self._lower = lower
111 self._upper = upper
112 self._n_warmup_steps = n_warmup_steps
113 self._interval_steps = interval_steps
114
115 def prune(self, study: "optuna.study.Study", trial: "optuna.trial.FrozenTrial") -> bool:
116
117 step = trial.last_step
118 if step is None:
119 return False
120
121 n_warmup_steps = self._n_warmup_steps
122 if step < n_warmup_steps:
123 return False
124
125 if not _is_first_in_interval_step(
126 step, trial.intermediate_values.keys(), n_warmup_steps, self._interval_steps
127 ):
128 return False
129
130 latest_value = trial.intermediate_values[step]
131 if math.isnan(latest_value):
132 return True
133
134 if latest_value < self._lower:
135 return True
136
137 if latest_value > self._upper:
138 return True
139
140 return False
141
[end of optuna/pruners/_threshold.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/pruners/_threshold.py b/optuna/pruners/_threshold.py
--- a/optuna/pruners/_threshold.py
+++ b/optuna/pruners/_threshold.py
@@ -54,7 +54,6 @@
ys_for_upper = [0.0, 0.1, 0.2, 0.5, 1.2]
ys_for_lower = [100.0, 90.0, 0.1, 0.0, -1]
- n_trial_step = 5
study = create_study(pruner=ThresholdPruner(upper=1.0))
study.optimize(objective_for_upper, n_trials=10)
@@ -70,7 +69,7 @@
A maximum value which determines whether pruner prunes or not.
If an intermediate value is larger than upper, it prunes.
n_warmup_steps:
- Pruning is disabled until the trial exceeds the given number of step.
+ Pruning is disabled if the step is less than the given number of warmup steps.
interval_steps:
Interval in number of steps between the pruning checks, offset by the warmup steps.
If no value has been reported at the time of a pruning check, that particular check
| {"golden_diff": "diff --git a/optuna/pruners/_threshold.py b/optuna/pruners/_threshold.py\n--- a/optuna/pruners/_threshold.py\n+++ b/optuna/pruners/_threshold.py\n@@ -54,7 +54,6 @@\n \n ys_for_upper = [0.0, 0.1, 0.2, 0.5, 1.2]\n ys_for_lower = [100.0, 90.0, 0.1, 0.0, -1]\n- n_trial_step = 5\n \n study = create_study(pruner=ThresholdPruner(upper=1.0))\n study.optimize(objective_for_upper, n_trials=10)\n@@ -70,7 +69,7 @@\n A maximum value which determines whether pruner prunes or not.\n If an intermediate value is larger than upper, it prunes.\n n_warmup_steps:\n- Pruning is disabled until the trial exceeds the given number of step.\n+ Pruning is disabled if the step is less than the given number of warmup steps.\n interval_steps:\n Interval in number of steps between the pruning checks, offset by the warmup steps.\n If no value has been reported at the time of a pruning check, that particular check\n", "issue": "Improve ThresholdPruner example\nThe variable `n_trial_step` in [Threshold Pruner](https://optuna.readthedocs.io/en/stable/reference/generated/optuna.pruners.ThresholdPruner.html) is not used.\r\n\nImprove ThresholdPruner example\nThe variable `n_trial_step` in [Threshold Pruner](https://optuna.readthedocs.io/en/stable/reference/generated/optuna.pruners.ThresholdPruner.html) is not used.\r\n\n", "before_files": [{"content": "import math\nfrom typing import Any\nfrom typing import Optional\n\nimport optuna\nfrom optuna.pruners import BasePruner\nfrom optuna.pruners._percentile import _is_first_in_interval_step\n\n\ndef _check_value(value: Any) -> float:\n try:\n # For convenience, we allow users to report a value that can be cast to `float`.\n value = float(value)\n except (TypeError, ValueError):\n message = \"The `value` argument is of type '{}' but supposed to be a float.\".format(\n type(value).__name__\n )\n raise TypeError(message) from None\n\n return value\n\n\nclass ThresholdPruner(BasePruner):\n \"\"\"Pruner to detect outlying metrics of the trials.\n\n Prune if a metric exceeds upper threshold,\n falls behind lower threshold or reaches ``nan``.\n\n Example:\n .. testcode::\n\n from optuna import create_study\n from optuna.pruners import ThresholdPruner\n from optuna import TrialPruned\n\n\n def objective_for_upper(trial):\n for step, y in enumerate(ys_for_upper):\n trial.report(y, step)\n\n if trial.should_prune():\n raise TrialPruned()\n return ys_for_upper[-1]\n\n\n def objective_for_lower(trial):\n for step, y in enumerate(ys_for_lower):\n trial.report(y, step)\n\n if trial.should_prune():\n raise TrialPruned()\n return ys_for_lower[-1]\n\n\n ys_for_upper = [0.0, 0.1, 0.2, 0.5, 1.2]\n ys_for_lower = [100.0, 90.0, 0.1, 0.0, -1]\n n_trial_step = 5\n\n study = create_study(pruner=ThresholdPruner(upper=1.0))\n study.optimize(objective_for_upper, n_trials=10)\n\n study = create_study(pruner=ThresholdPruner(lower=0.0))\n study.optimize(objective_for_lower, n_trials=10)\n\n Args\n lower:\n A minimum value which determines whether pruner prunes or not.\n If an intermediate value is smaller than lower, it prunes.\n upper:\n A maximum value which determines whether pruner prunes or not.\n If an intermediate value is larger than upper, it prunes.\n n_warmup_steps:\n Pruning is disabled until the trial exceeds the given number of step.\n interval_steps:\n Interval in number of steps between the pruning checks, offset by the warmup steps.\n If no value has been reported at the time of a pruning check, that particular check\n will be postponed until a value is reported. Value must be at least 1.\n\n \"\"\"\n\n def __init__(\n self,\n lower: Optional[float] = None,\n upper: Optional[float] = None,\n n_warmup_steps: int = 0,\n interval_steps: int = 1,\n ) -> None:\n\n if lower is None and upper is None:\n raise TypeError(\"Either lower or upper must be specified.\")\n if lower is not None:\n lower = _check_value(lower)\n if upper is not None:\n upper = _check_value(upper)\n\n lower = lower if lower is not None else -float(\"inf\")\n upper = upper if upper is not None else float(\"inf\")\n\n if lower > upper:\n raise ValueError(\"lower should be smaller than upper.\")\n if n_warmup_steps < 0:\n raise ValueError(\n \"Number of warmup steps cannot be negative but got {}.\".format(n_warmup_steps)\n )\n if interval_steps < 1:\n raise ValueError(\n \"Pruning interval steps must be at least 1 but got {}.\".format(interval_steps)\n )\n\n self._lower = lower\n self._upper = upper\n self._n_warmup_steps = n_warmup_steps\n self._interval_steps = interval_steps\n\n def prune(self, study: \"optuna.study.Study\", trial: \"optuna.trial.FrozenTrial\") -> bool:\n\n step = trial.last_step\n if step is None:\n return False\n\n n_warmup_steps = self._n_warmup_steps\n if step < n_warmup_steps:\n return False\n\n if not _is_first_in_interval_step(\n step, trial.intermediate_values.keys(), n_warmup_steps, self._interval_steps\n ):\n return False\n\n latest_value = trial.intermediate_values[step]\n if math.isnan(latest_value):\n return True\n\n if latest_value < self._lower:\n return True\n\n if latest_value > self._upper:\n return True\n\n return False\n", "path": "optuna/pruners/_threshold.py"}]} | 2,002 | 283 |
gh_patches_debug_17595 | rasdani/github-patches | git_diff | secdev__scapy-137 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Unable to Accurately Set Time Fields in NTP Layer
I'm trying to modify the time fields in the NTP layer, and not having any luck. I've tried setting packet.recv to an integer value and a string representation of time, but no matter what I try, when I send the packet, this field is always set to the default 0. Is there any example code that I just missed that would show me how to do this? Thank you in advance.
</issue>
<code>
[start of scapy/layers/ntp.py]
1 ## This file is part of Scapy
2 ## See http://www.secdev.org/projects/scapy for more informations
3 ## Copyright (C) Philippe Biondi <[email protected]>
4 ## This program is published under a GPLv2 license
5
6 """
7 NTP (Network Time Protocol).
8 """
9
10 import time
11 from scapy.packet import *
12 from scapy.fields import *
13 from scapy.layers.inet import UDP
14
15
16 # seconds between 01-01-1900 and 01-01-1970
17 _NTP_BASETIME = 2208988800
18
19 class TimeStampField(FixedPointField):
20 def __init__(self, name, default):
21 FixedPointField.__init__(self, name, default, 64, 32)
22
23 def i2repr(self, pkt, val):
24 if val is None:
25 return "--"
26 val = self.i2h(pkt,val)
27 if val < _NTP_BASETIME:
28 return val
29 return time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime(val-_NTP_BASETIME))
30
31 def any2i(self, pkt, val):
32 if type(val) is str:
33 return int(time.mktime(time.strptime(val))) + _NTP_BASETIME + 3600 # XXX
34 return FixedPointField.any2i(self,pkt,val)
35
36 def i2m(self, pkt, val):
37 if val is None:
38 val = FixedPointField.any2i(self, pkt, time.time()+_NTP_BASETIME)
39 return FixedPointField.i2m(self, pkt, val)
40
41
42
43 class NTP(Packet):
44 # RFC 1769
45 name = "NTP"
46 fields_desc = [
47 BitEnumField('leap', 0, 2,
48 { 0: 'nowarning',
49 1: 'longminute',
50 2: 'shortminute',
51 3: 'notsync'}),
52 BitField('version', 3, 3),
53 BitEnumField('mode', 3, 3,
54 { 0: 'reserved',
55 1: 'sym_active',
56 2: 'sym_passive',
57 3: 'client',
58 4: 'server',
59 5: 'broadcast',
60 6: 'control',
61 7: 'private'}),
62 BitField('stratum', 2, 8),
63 BitField('poll', 0xa, 8), ### XXX : it's a signed int
64 BitField('precision', 0, 8), ### XXX : it's a signed int
65 FixedPointField('delay', 0, size=32, frac_bits=16),
66 FixedPointField('dispersion', 0, size=32, frac_bits=16),
67 IPField('id', "127.0.0.1"),
68 TimeStampField('ref', 0),
69 TimeStampField('orig', None), # None means current time
70 TimeStampField('recv', 0),
71 TimeStampField('sent', None)
72 ]
73 def mysummary(self):
74 return self.sprintf("NTP v%ir,NTP.version%, %NTP.mode%")
75
76
77 bind_layers( UDP, NTP, dport=123, sport=123)
78
[end of scapy/layers/ntp.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/scapy/layers/ntp.py b/scapy/layers/ntp.py
--- a/scapy/layers/ntp.py
+++ b/scapy/layers/ntp.py
@@ -8,6 +8,7 @@
"""
import time
+import datetime
from scapy.packet import *
from scapy.fields import *
from scapy.layers.inet import UDP
@@ -29,9 +30,11 @@
return time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime(val-_NTP_BASETIME))
def any2i(self, pkt, val):
- if type(val) is str:
- return int(time.mktime(time.strptime(val))) + _NTP_BASETIME + 3600 # XXX
- return FixedPointField.any2i(self,pkt,val)
+ if isinstance(val, basestring):
+ val = int(time.mktime(time.strptime(val))) + _NTP_BASETIME
+ elif isinstance(val, datetime.datetime):
+ val = int(val.strftime("%s")) + _NTP_BASETIME
+ return FixedPointField.any2i(self, pkt, val)
def i2m(self, pkt, val):
if val is None:
| {"golden_diff": "diff --git a/scapy/layers/ntp.py b/scapy/layers/ntp.py\n--- a/scapy/layers/ntp.py\n+++ b/scapy/layers/ntp.py\n@@ -8,6 +8,7 @@\n \"\"\"\n \n import time\n+import datetime\n from scapy.packet import *\n from scapy.fields import *\n from scapy.layers.inet import UDP\n@@ -29,9 +30,11 @@\n return time.strftime(\"%a, %d %b %Y %H:%M:%S +0000\", time.gmtime(val-_NTP_BASETIME))\n \n def any2i(self, pkt, val):\n- if type(val) is str:\n- return int(time.mktime(time.strptime(val))) + _NTP_BASETIME + 3600 # XXX\n- return FixedPointField.any2i(self,pkt,val)\n+ if isinstance(val, basestring):\n+ val = int(time.mktime(time.strptime(val))) + _NTP_BASETIME\n+ elif isinstance(val, datetime.datetime):\n+ val = int(val.strftime(\"%s\")) + _NTP_BASETIME\n+ return FixedPointField.any2i(self, pkt, val)\n \n def i2m(self, pkt, val):\n if val is None:\n", "issue": "Unable to Accurately Set Time Fields in NTP Layer\nI'm trying to modify the time fields in the NTP layer, and not having any luck. I've tried setting packet.recv to an integer value and a string representation of time, but no matter what I try, when I send the packet, this field is always set to the default 0. Is there any example code that I just missed that would show me how to do this? Thank you in advance.\n\n", "before_files": [{"content": "## This file is part of Scapy\n## See http://www.secdev.org/projects/scapy for more informations\n## Copyright (C) Philippe Biondi <[email protected]>\n## This program is published under a GPLv2 license\n\n\"\"\"\nNTP (Network Time Protocol).\n\"\"\"\n\nimport time\nfrom scapy.packet import *\nfrom scapy.fields import *\nfrom scapy.layers.inet import UDP\n\n\n# seconds between 01-01-1900 and 01-01-1970\n_NTP_BASETIME = 2208988800\n\nclass TimeStampField(FixedPointField):\n def __init__(self, name, default):\n FixedPointField.__init__(self, name, default, 64, 32)\n\n def i2repr(self, pkt, val):\n if val is None:\n return \"--\"\n val = self.i2h(pkt,val)\n if val < _NTP_BASETIME:\n return val\n return time.strftime(\"%a, %d %b %Y %H:%M:%S +0000\", time.gmtime(val-_NTP_BASETIME))\n\n def any2i(self, pkt, val):\n if type(val) is str:\n return int(time.mktime(time.strptime(val))) + _NTP_BASETIME + 3600 # XXX\n return FixedPointField.any2i(self,pkt,val)\n \n def i2m(self, pkt, val):\n if val is None:\n val = FixedPointField.any2i(self, pkt, time.time()+_NTP_BASETIME)\n return FixedPointField.i2m(self, pkt, val)\n \n\n\nclass NTP(Packet):\n # RFC 1769\n name = \"NTP\"\n fields_desc = [ \n BitEnumField('leap', 0, 2,\n { 0: 'nowarning',\n 1: 'longminute',\n 2: 'shortminute',\n 3: 'notsync'}),\n BitField('version', 3, 3),\n BitEnumField('mode', 3, 3,\n { 0: 'reserved',\n 1: 'sym_active',\n 2: 'sym_passive',\n 3: 'client',\n 4: 'server',\n 5: 'broadcast',\n 6: 'control',\n 7: 'private'}),\n BitField('stratum', 2, 8),\n BitField('poll', 0xa, 8), ### XXX : it's a signed int\n BitField('precision', 0, 8), ### XXX : it's a signed int\n FixedPointField('delay', 0, size=32, frac_bits=16),\n FixedPointField('dispersion', 0, size=32, frac_bits=16),\n IPField('id', \"127.0.0.1\"),\n TimeStampField('ref', 0),\n TimeStampField('orig', None), # None means current time\n TimeStampField('recv', 0),\n TimeStampField('sent', None) \n ]\n def mysummary(self):\n return self.sprintf(\"NTP v%ir,NTP.version%, %NTP.mode%\")\n\n\nbind_layers( UDP, NTP, dport=123, sport=123)\n", "path": "scapy/layers/ntp.py"}]} | 1,531 | 276 |
gh_patches_debug_43800 | rasdani/github-patches | git_diff | microsoft__AzureTRE-593 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[Task] API to use Managed Identity to authenticate against Cosmos DB
**Is your feature request related to a problem?
Currently the API use an API key `STATE_STORE_KEY` to authenticate against Cosmos DB. The API uses Managed Identity to authenticate against Azure Service Bus.
**Describe the solution you'd like
Using the same simplified access pattern to authenticate from the API to Azure resource.
Note: looks like Cosmos data-plane doesn't really support managed identity (in Python at least) but there might be a way to do this:
https://github.com/MicrosoftDocs/azure-docs/issues/29762
https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/tutorial-linux-vm-access-cosmos-db
</issue>
<code>
[start of management_api_app/core/config.py]
1 from starlette.config import Config
2
3
4 config = Config(".env")
5
6 # API settings
7 API_PREFIX = "/api"
8 PROJECT_NAME: str = config("PROJECT_NAME", default="Azure TRE API")
9 DEBUG: bool = config("DEBUG", cast=bool, default=False)
10 VERSION = "0.0.0"
11
12 # Resource Info
13 RESOURCE_LOCATION: str = config("RESOURCE_LOCATION", default="")
14 TRE_ID: str = config("TRE_ID", default="")
15
16 # State store configuration
17 STATE_STORE_ENDPOINT: str = config("STATE_STORE_ENDPOINT", default="") # Cosmos DB endpoint
18 STATE_STORE_KEY: str = config("STATE_STORE_KEY", default="") # Cosmos DB access key
19 STATE_STORE_DATABASE = "AzureTRE"
20 STATE_STORE_RESOURCES_CONTAINER = "Resources"
21 STATE_STORE_RESOURCE_TEMPLATES_CONTAINER = "ResourceTemplates"
22
23 # Service bus configuration
24 SERVICE_BUS_FULLY_QUALIFIED_NAMESPACE: str = config("SERVICE_BUS_FULLY_QUALIFIED_NAMESPACE", default="")
25 SERVICE_BUS_RESOURCE_REQUEST_QUEUE: str = config("SERVICE_BUS_RESOURCE_REQUEST_QUEUE", default="")
26 SERVICE_BUS_DEPLOYMENT_STATUS_UPDATE_QUEUE: str = config("SERVICE_BUS_DEPLOYMENT_STATUS_UPDATE_QUEUE", default="")
27
28 # Managed identity configuration
29 MANAGED_IDENTITY_CLIENT_ID: str = config("MANAGED_IDENTITY_CLIENT_ID", default="")
30
31 # Logging and monitoring
32 APP_INSIGHTS_INSTRUMENTATION_KEY: str = config("APPINSIGHTS_INSTRUMENTATIONKEY", default="")
33
34 # Authentication
35 API_CLIENT_ID: str = config("API_CLIENT_ID", default="")
36 API_CLIENT_SECRET: str = config("API_CLIENT_SECRET", default="")
37 SWAGGER_UI_CLIENT_ID: str = config("SWAGGER_UI_CLIENT_ID", default="")
38 AAD_TENANT_ID: str = config("AAD_TENANT_ID", default="")
39
40 AAD_INSTANCE: str = config("AAD_INSTANCE", default="https://login.microsoftonline.com")
41 API_AUDIENCE: str = config("API_AUDIENCE", default=API_CLIENT_ID)
42
[end of management_api_app/core/config.py]
[start of management_api_app/services/health_checker.py]
1 from azure.core import exceptions
2 from azure.cosmos import CosmosClient
3
4 from core.config import STATE_STORE_ENDPOINT, STATE_STORE_KEY
5 from models.schemas.status import StatusEnum
6 from resources import strings
7
8
9 def create_state_store_status() -> (StatusEnum, str):
10 status = StatusEnum.ok
11 message = ""
12 try:
13 client = CosmosClient(STATE_STORE_ENDPOINT, STATE_STORE_KEY) # noqa: F841 - flake 8 client is not used
14 except exceptions.ServiceRequestError:
15 status = StatusEnum.not_ok
16 message = strings.STATE_STORE_ENDPOINT_NOT_RESPONDING
17 except: # noqa: E722 flake8 - no bare excepts
18 status = StatusEnum.not_ok
19 message = strings.UNSPECIFIED_ERROR
20 return status, message
21
[end of management_api_app/services/health_checker.py]
[start of management_api_app/api/dependencies/database.py]
1 import logging
2 from typing import Callable, Type
3
4 from azure.cosmos import CosmosClient
5 from fastapi import Depends, FastAPI, HTTPException
6 from starlette.requests import Request
7 from starlette.status import HTTP_503_SERVICE_UNAVAILABLE
8
9 from core import config
10 from db.errors import UnableToAccessDatabase
11 from db.repositories.base import BaseRepository
12 from resources import strings
13
14
15 def connect_to_db() -> CosmosClient:
16 logging.debug(f"Connecting to {config.STATE_STORE_ENDPOINT}")
17
18 try:
19 if config.DEBUG:
20 # ignore TLS(setup is pain) when on dev container and connecting to cosmosdb on windows host.
21 cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, config.STATE_STORE_KEY,
22 connection_verify=False)
23 else:
24 cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, config.STATE_STORE_KEY)
25 logging.debug("Connection established")
26 return cosmos_client
27 except Exception as e:
28 logging.debug(f"Connection to state store could not be established: {e}")
29
30
31 def get_db_client(app: FastAPI) -> CosmosClient:
32 if not app.state.cosmos_client:
33 app.state.cosmos_client = connect_to_db()
34 return app.state.cosmos_client
35
36
37 def get_db_client_from_request(request: Request) -> CosmosClient:
38 return get_db_client(request.app)
39
40
41 def get_repository(repo_type: Type[BaseRepository]) -> Callable[[CosmosClient], BaseRepository]:
42 def _get_repo(client: CosmosClient = Depends(get_db_client_from_request)) -> BaseRepository:
43 try:
44 return repo_type(client)
45 except UnableToAccessDatabase:
46 raise HTTPException(status_code=HTTP_503_SERVICE_UNAVAILABLE, detail=strings.STATE_STORE_ENDPOINT_NOT_RESPONDING)
47
48 return _get_repo
49
[end of management_api_app/api/dependencies/database.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/management_api_app/api/dependencies/database.py b/management_api_app/api/dependencies/database.py
--- a/management_api_app/api/dependencies/database.py
+++ b/management_api_app/api/dependencies/database.py
@@ -2,6 +2,8 @@
from typing import Callable, Type
from azure.cosmos import CosmosClient
+from azure.identity import DefaultAzureCredential
+from azure.mgmt.cosmosdb import CosmosDBManagementClient
from fastapi import Depends, FastAPI, HTTPException
from starlette.requests import Request
from starlette.status import HTTP_503_SERVICE_UNAVAILABLE
@@ -16,18 +18,30 @@
logging.debug(f"Connecting to {config.STATE_STORE_ENDPOINT}")
try:
+ primary_master_key = get_store_key()
if config.DEBUG:
# ignore TLS(setup is pain) when on dev container and connecting to cosmosdb on windows host.
- cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, config.STATE_STORE_KEY,
- connection_verify=False)
+ cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, primary_master_key, connection_verify=False)
else:
- cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, config.STATE_STORE_KEY)
+ cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, primary_master_key)
logging.debug("Connection established")
return cosmos_client
except Exception as e:
logging.debug(f"Connection to state store could not be established: {e}")
+def get_store_key() -> str:
+ if config.STATE_STORE_KEY:
+ primary_master_key = config.STATE_STORE_KEY
+ else:
+ credential = DefaultAzureCredential(managed_identity_client_id=config.MANAGED_IDENTITY_CLIENT_ID, exclude_shared_token_cache_credential=True)
+ cosmosdb_client = CosmosDBManagementClient(credential, subscription_id=config.SUBSCRIPTION_ID)
+ database_keys = cosmosdb_client.database_accounts.list_keys(resource_group_name=config.RESOURCE_GROUP_NAME, account_name=config.COSMOSDB_ACCOUNT_NAME)
+ primary_master_key = database_keys.primary_master_key
+
+ return primary_master_key
+
+
def get_db_client(app: FastAPI) -> CosmosClient:
if not app.state.cosmos_client:
app.state.cosmos_client = connect_to_db()
diff --git a/management_api_app/core/config.py b/management_api_app/core/config.py
--- a/management_api_app/core/config.py
+++ b/management_api_app/core/config.py
@@ -16,9 +16,13 @@
# State store configuration
STATE_STORE_ENDPOINT: str = config("STATE_STORE_ENDPOINT", default="") # Cosmos DB endpoint
STATE_STORE_KEY: str = config("STATE_STORE_KEY", default="") # Cosmos DB access key
+COSMOSDB_ACCOUNT_NAME: str = config("COSMOSDB_ACCOUNT_NAME", default="") # Cosmos DB account name
STATE_STORE_DATABASE = "AzureTRE"
STATE_STORE_RESOURCES_CONTAINER = "Resources"
STATE_STORE_RESOURCE_TEMPLATES_CONTAINER = "ResourceTemplates"
+SUBSCRIPTION_ID: str = config("SUBSCRIPTION_ID", default="")
+RESOURCE_GROUP_NAME: str = config("RESOURCE_GROUP_NAME", default="")
+
# Service bus configuration
SERVICE_BUS_FULLY_QUALIFIED_NAMESPACE: str = config("SERVICE_BUS_FULLY_QUALIFIED_NAMESPACE", default="")
diff --git a/management_api_app/services/health_checker.py b/management_api_app/services/health_checker.py
--- a/management_api_app/services/health_checker.py
+++ b/management_api_app/services/health_checker.py
@@ -1,7 +1,8 @@
from azure.core import exceptions
from azure.cosmos import CosmosClient
-from core.config import STATE_STORE_ENDPOINT, STATE_STORE_KEY
+from api.dependencies.database import get_store_key
+from core import config
from models.schemas.status import StatusEnum
from resources import strings
@@ -10,7 +11,8 @@
status = StatusEnum.ok
message = ""
try:
- client = CosmosClient(STATE_STORE_ENDPOINT, STATE_STORE_KEY) # noqa: F841 - flake 8 client is not used
+ primary_master_key = get_store_key()
+ client = CosmosClient(config.STATE_STORE_ENDPOINT, primary_master_key) # noqa: F841 - flake 8 client is not used
except exceptions.ServiceRequestError:
status = StatusEnum.not_ok
message = strings.STATE_STORE_ENDPOINT_NOT_RESPONDING
| {"golden_diff": "diff --git a/management_api_app/api/dependencies/database.py b/management_api_app/api/dependencies/database.py\n--- a/management_api_app/api/dependencies/database.py\n+++ b/management_api_app/api/dependencies/database.py\n@@ -2,6 +2,8 @@\n from typing import Callable, Type\n \n from azure.cosmos import CosmosClient\n+from azure.identity import DefaultAzureCredential\n+from azure.mgmt.cosmosdb import CosmosDBManagementClient\n from fastapi import Depends, FastAPI, HTTPException\n from starlette.requests import Request\n from starlette.status import HTTP_503_SERVICE_UNAVAILABLE\n@@ -16,18 +18,30 @@\n logging.debug(f\"Connecting to {config.STATE_STORE_ENDPOINT}\")\n \n try:\n+ primary_master_key = get_store_key()\n if config.DEBUG:\n # ignore TLS(setup is pain) when on dev container and connecting to cosmosdb on windows host.\n- cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, config.STATE_STORE_KEY,\n- connection_verify=False)\n+ cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, primary_master_key, connection_verify=False)\n else:\n- cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, config.STATE_STORE_KEY)\n+ cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, primary_master_key)\n logging.debug(\"Connection established\")\n return cosmos_client\n except Exception as e:\n logging.debug(f\"Connection to state store could not be established: {e}\")\n \n \n+def get_store_key() -> str:\n+ if config.STATE_STORE_KEY:\n+ primary_master_key = config.STATE_STORE_KEY\n+ else:\n+ credential = DefaultAzureCredential(managed_identity_client_id=config.MANAGED_IDENTITY_CLIENT_ID, exclude_shared_token_cache_credential=True)\n+ cosmosdb_client = CosmosDBManagementClient(credential, subscription_id=config.SUBSCRIPTION_ID)\n+ database_keys = cosmosdb_client.database_accounts.list_keys(resource_group_name=config.RESOURCE_GROUP_NAME, account_name=config.COSMOSDB_ACCOUNT_NAME)\n+ primary_master_key = database_keys.primary_master_key\n+\n+ return primary_master_key\n+\n+\n def get_db_client(app: FastAPI) -> CosmosClient:\n if not app.state.cosmos_client:\n app.state.cosmos_client = connect_to_db()\ndiff --git a/management_api_app/core/config.py b/management_api_app/core/config.py\n--- a/management_api_app/core/config.py\n+++ b/management_api_app/core/config.py\n@@ -16,9 +16,13 @@\n # State store configuration\n STATE_STORE_ENDPOINT: str = config(\"STATE_STORE_ENDPOINT\", default=\"\") # Cosmos DB endpoint\n STATE_STORE_KEY: str = config(\"STATE_STORE_KEY\", default=\"\") # Cosmos DB access key\n+COSMOSDB_ACCOUNT_NAME: str = config(\"COSMOSDB_ACCOUNT_NAME\", default=\"\") # Cosmos DB account name\n STATE_STORE_DATABASE = \"AzureTRE\"\n STATE_STORE_RESOURCES_CONTAINER = \"Resources\"\n STATE_STORE_RESOURCE_TEMPLATES_CONTAINER = \"ResourceTemplates\"\n+SUBSCRIPTION_ID: str = config(\"SUBSCRIPTION_ID\", default=\"\")\n+RESOURCE_GROUP_NAME: str = config(\"RESOURCE_GROUP_NAME\", default=\"\")\n+\n \n # Service bus configuration\n SERVICE_BUS_FULLY_QUALIFIED_NAMESPACE: str = config(\"SERVICE_BUS_FULLY_QUALIFIED_NAMESPACE\", default=\"\")\ndiff --git a/management_api_app/services/health_checker.py b/management_api_app/services/health_checker.py\n--- a/management_api_app/services/health_checker.py\n+++ b/management_api_app/services/health_checker.py\n@@ -1,7 +1,8 @@\n from azure.core import exceptions\n from azure.cosmos import CosmosClient\n \n-from core.config import STATE_STORE_ENDPOINT, STATE_STORE_KEY\n+from api.dependencies.database import get_store_key\n+from core import config\n from models.schemas.status import StatusEnum\n from resources import strings\n \n@@ -10,7 +11,8 @@\n status = StatusEnum.ok\n message = \"\"\n try:\n- client = CosmosClient(STATE_STORE_ENDPOINT, STATE_STORE_KEY) # noqa: F841 - flake 8 client is not used\n+ primary_master_key = get_store_key()\n+ client = CosmosClient(config.STATE_STORE_ENDPOINT, primary_master_key) # noqa: F841 - flake 8 client is not used\n except exceptions.ServiceRequestError:\n status = StatusEnum.not_ok\n message = strings.STATE_STORE_ENDPOINT_NOT_RESPONDING\n", "issue": "[Task] API to use Managed Identity to authenticate against Cosmos DB\n**Is your feature request related to a problem?\r\n\r\nCurrently the API use an API key `STATE_STORE_KEY` to authenticate against Cosmos DB. The API uses Managed Identity to authenticate against Azure Service Bus.\r\n\r\n**Describe the solution you'd like\r\n\r\nUsing the same simplified access pattern to authenticate from the API to Azure resource.\r\n\r\nNote: looks like Cosmos data-plane doesn't really support managed identity (in Python at least) but there might be a way to do this:\r\nhttps://github.com/MicrosoftDocs/azure-docs/issues/29762\r\nhttps://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/tutorial-linux-vm-access-cosmos-db\r\n\n", "before_files": [{"content": "from starlette.config import Config\n\n\nconfig = Config(\".env\")\n\n# API settings\nAPI_PREFIX = \"/api\"\nPROJECT_NAME: str = config(\"PROJECT_NAME\", default=\"Azure TRE API\")\nDEBUG: bool = config(\"DEBUG\", cast=bool, default=False)\nVERSION = \"0.0.0\"\n\n# Resource Info\nRESOURCE_LOCATION: str = config(\"RESOURCE_LOCATION\", default=\"\")\nTRE_ID: str = config(\"TRE_ID\", default=\"\")\n\n# State store configuration\nSTATE_STORE_ENDPOINT: str = config(\"STATE_STORE_ENDPOINT\", default=\"\") # Cosmos DB endpoint\nSTATE_STORE_KEY: str = config(\"STATE_STORE_KEY\", default=\"\") # Cosmos DB access key\nSTATE_STORE_DATABASE = \"AzureTRE\"\nSTATE_STORE_RESOURCES_CONTAINER = \"Resources\"\nSTATE_STORE_RESOURCE_TEMPLATES_CONTAINER = \"ResourceTemplates\"\n\n# Service bus configuration\nSERVICE_BUS_FULLY_QUALIFIED_NAMESPACE: str = config(\"SERVICE_BUS_FULLY_QUALIFIED_NAMESPACE\", default=\"\")\nSERVICE_BUS_RESOURCE_REQUEST_QUEUE: str = config(\"SERVICE_BUS_RESOURCE_REQUEST_QUEUE\", default=\"\")\nSERVICE_BUS_DEPLOYMENT_STATUS_UPDATE_QUEUE: str = config(\"SERVICE_BUS_DEPLOYMENT_STATUS_UPDATE_QUEUE\", default=\"\")\n\n# Managed identity configuration\nMANAGED_IDENTITY_CLIENT_ID: str = config(\"MANAGED_IDENTITY_CLIENT_ID\", default=\"\")\n\n# Logging and monitoring\nAPP_INSIGHTS_INSTRUMENTATION_KEY: str = config(\"APPINSIGHTS_INSTRUMENTATIONKEY\", default=\"\")\n\n# Authentication\nAPI_CLIENT_ID: str = config(\"API_CLIENT_ID\", default=\"\")\nAPI_CLIENT_SECRET: str = config(\"API_CLIENT_SECRET\", default=\"\")\nSWAGGER_UI_CLIENT_ID: str = config(\"SWAGGER_UI_CLIENT_ID\", default=\"\")\nAAD_TENANT_ID: str = config(\"AAD_TENANT_ID\", default=\"\")\n\nAAD_INSTANCE: str = config(\"AAD_INSTANCE\", default=\"https://login.microsoftonline.com\")\nAPI_AUDIENCE: str = config(\"API_AUDIENCE\", default=API_CLIENT_ID)\n", "path": "management_api_app/core/config.py"}, {"content": "from azure.core import exceptions\nfrom azure.cosmos import CosmosClient\n\nfrom core.config import STATE_STORE_ENDPOINT, STATE_STORE_KEY\nfrom models.schemas.status import StatusEnum\nfrom resources import strings\n\n\ndef create_state_store_status() -> (StatusEnum, str):\n status = StatusEnum.ok\n message = \"\"\n try:\n client = CosmosClient(STATE_STORE_ENDPOINT, STATE_STORE_KEY) # noqa: F841 - flake 8 client is not used\n except exceptions.ServiceRequestError:\n status = StatusEnum.not_ok\n message = strings.STATE_STORE_ENDPOINT_NOT_RESPONDING\n except: # noqa: E722 flake8 - no bare excepts\n status = StatusEnum.not_ok\n message = strings.UNSPECIFIED_ERROR\n return status, message\n", "path": "management_api_app/services/health_checker.py"}, {"content": "import logging\nfrom typing import Callable, Type\n\nfrom azure.cosmos import CosmosClient\nfrom fastapi import Depends, FastAPI, HTTPException\nfrom starlette.requests import Request\nfrom starlette.status import HTTP_503_SERVICE_UNAVAILABLE\n\nfrom core import config\nfrom db.errors import UnableToAccessDatabase\nfrom db.repositories.base import BaseRepository\nfrom resources import strings\n\n\ndef connect_to_db() -> CosmosClient:\n logging.debug(f\"Connecting to {config.STATE_STORE_ENDPOINT}\")\n\n try:\n if config.DEBUG:\n # ignore TLS(setup is pain) when on dev container and connecting to cosmosdb on windows host.\n cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, config.STATE_STORE_KEY,\n connection_verify=False)\n else:\n cosmos_client = CosmosClient(config.STATE_STORE_ENDPOINT, config.STATE_STORE_KEY)\n logging.debug(\"Connection established\")\n return cosmos_client\n except Exception as e:\n logging.debug(f\"Connection to state store could not be established: {e}\")\n\n\ndef get_db_client(app: FastAPI) -> CosmosClient:\n if not app.state.cosmos_client:\n app.state.cosmos_client = connect_to_db()\n return app.state.cosmos_client\n\n\ndef get_db_client_from_request(request: Request) -> CosmosClient:\n return get_db_client(request.app)\n\n\ndef get_repository(repo_type: Type[BaseRepository]) -> Callable[[CosmosClient], BaseRepository]:\n def _get_repo(client: CosmosClient = Depends(get_db_client_from_request)) -> BaseRepository:\n try:\n return repo_type(client)\n except UnableToAccessDatabase:\n raise HTTPException(status_code=HTTP_503_SERVICE_UNAVAILABLE, detail=strings.STATE_STORE_ENDPOINT_NOT_RESPONDING)\n\n return _get_repo\n", "path": "management_api_app/api/dependencies/database.py"}]} | 1,891 | 942 |
gh_patches_debug_2366 | rasdani/github-patches | git_diff | ydataai__ydata-profiling-1540 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
AttributeError: 'FileDataContext' object has no attribute 'create_expectation_suite'
### Current Behaviour
AttributeError: 'FileDataContext' object has no attribute 'create_expectation_suite'
[Related to this issue](https://docs.greatexpectations.io/docs/changelog/#01549): "[MAINTENANCE] Change all instances of create_expectation_suite to add_expectation_suite in tests, docs, and source code ([#7117](https://github.com/great-expectations/great_expectations/pull/7117))"
DataContext objects no longer has a method 'create_expectation_suite'.
### Expected Behaviour
[Great expectation test suite](https://docs.profiling.ydata.ai/4.6/integrations/great_expectations/#creating-expectation-suites-with-ydata-profiling): "ydata-profiling provides a simple to_expectation_suite() method that returns a Great Expectations ExpectationSuite object which contains a set of Expectations."
### Data Description
[Dataset can be used from the documentation](https://docs.profiling.ydata.ai/4.6/integrations/great_expectations/#about-great-expectations)
### Code that reproduces the bug
```Python
profile = ProfileReport(
df,
title='Pandas Profiling Report',
type_schema=type_schema,
minimal=True,
lazy=False
)
data_context = ge.data_context.DataContext(
context_root_dir='./gx/'
)
suite = profile.to_expectation_suite(
data_context=data_context
)
```
### pandas-profiling version
-
### Dependencies
```Text
-
```
### OS
_No response_
### Checklist
- [X] There is not yet another bug report for this issue in the [issue tracker](https://github.com/ydataai/pandas-profiling/issues)
- [X] The problem is reproducible from this bug report. [This guide](http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports) can help to craft a minimal bug report.
- [X] The issue has not been resolved by the entries listed under [Common Issues](https://pandas-profiling.ydata.ai/docs/master/pages/support_contrib/common_issues.html).
</issue>
<code>
[start of src/ydata_profiling/expectations_report.py]
1 from typing import Any, Optional
2
3 import pandas as pd
4 from visions import VisionsTypeset
5
6 from ydata_profiling.config import Settings
7 from ydata_profiling.model import BaseDescription, expectation_algorithms
8 from ydata_profiling.model.handler import Handler
9 from ydata_profiling.utils.dataframe import slugify
10
11
12 class ExpectationHandler(Handler):
13 """Default handler"""
14
15 def __init__(self, typeset: VisionsTypeset, *args, **kwargs):
16 mapping = {
17 "Unsupported": [expectation_algorithms.generic_expectations],
18 "Text": [expectation_algorithms.categorical_expectations],
19 "Categorical": [expectation_algorithms.categorical_expectations],
20 "Boolean": [expectation_algorithms.categorical_expectations],
21 "Numeric": [expectation_algorithms.numeric_expectations],
22 "URL": [expectation_algorithms.url_expectations],
23 "File": [expectation_algorithms.file_expectations],
24 "Path": [expectation_algorithms.path_expectations],
25 "DateTime": [expectation_algorithms.datetime_expectations],
26 "Image": [expectation_algorithms.image_expectations],
27 }
28 super().__init__(mapping, typeset, *args, **kwargs)
29
30
31 class ExpectationsReport:
32 config: Settings
33 df: Optional[pd.DataFrame] = None
34
35 @property
36 def typeset(self) -> Optional[VisionsTypeset]:
37 return None
38
39 def to_expectation_suite(
40 self,
41 suite_name: Optional[str] = None,
42 data_context: Optional[Any] = None,
43 save_suite: bool = True,
44 run_validation: bool = True,
45 build_data_docs: bool = True,
46 handler: Optional[Handler] = None,
47 ) -> Any:
48 """
49 All parameters default to True to make it easier to access the full functionality of Great Expectations out of
50 the box.
51 Args:
52 suite_name: The name of your expectation suite
53 data_context: A user-specified data context
54 save_suite: Boolean to determine whether to save the suite to .json as part of the method
55 run_validation: Boolean to determine whether to run validation as part of the method
56 build_data_docs: Boolean to determine whether to build data docs, save the .html file, and open data docs in
57 your browser
58 handler: The handler to use for building expectation
59
60 Returns:
61 An ExpectationSuite
62 """
63 try:
64 import great_expectations as ge
65 except ImportError as ex:
66 raise ImportError(
67 "Please install great expectations before using the expectation functionality"
68 ) from ex
69
70 # Use report title if suite is empty
71 if suite_name is None:
72 suite_name = slugify(self.config.title)
73
74 # Use the default handler if none
75 if handler is None:
76 handler = ExpectationHandler(self.typeset)
77
78 # Obtain the ge context and create the expectation suite
79 if not data_context:
80 data_context = ge.data_context.DataContext()
81
82 suite = data_context.create_expectation_suite(
83 suite_name, overwrite_existing=True
84 )
85
86 # Instantiate an in-memory pandas dataset
87 batch = ge.dataset.PandasDataset(self.df, expectation_suite=suite)
88
89 # Obtain the profiling summary
90 summary: BaseDescription = self.get_description() # type: ignore
91
92 # Dispatch to expectations per semantic variable type
93 for name, variable_summary in summary.variables.items():
94 handler.handle(variable_summary["type"], name, variable_summary, batch)
95
96 # We don't actually update the suite object on the batch in place, so need
97 # to get the populated suite from the batch
98 suite = batch.get_expectation_suite()
99
100 validation_result_identifier = None
101 if run_validation:
102 batch = ge.dataset.PandasDataset(self.df, expectation_suite=suite)
103
104 results = data_context.run_validation_operator(
105 "action_list_operator", assets_to_validate=[batch]
106 )
107 validation_result_identifier = results.list_validation_result_identifiers()[
108 0
109 ]
110
111 # Write expectations and open data docs
112 if save_suite or build_data_docs:
113 data_context.save_expectation_suite(suite)
114
115 if build_data_docs:
116 data_context.build_data_docs()
117 data_context.open_data_docs(validation_result_identifier)
118
119 return batch.get_expectation_suite()
120
[end of src/ydata_profiling/expectations_report.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/ydata_profiling/expectations_report.py b/src/ydata_profiling/expectations_report.py
--- a/src/ydata_profiling/expectations_report.py
+++ b/src/ydata_profiling/expectations_report.py
@@ -79,7 +79,7 @@
if not data_context:
data_context = ge.data_context.DataContext()
- suite = data_context.create_expectation_suite(
+ suite = data_context.add_expectation_suite(
suite_name, overwrite_existing=True
)
| {"golden_diff": "diff --git a/src/ydata_profiling/expectations_report.py b/src/ydata_profiling/expectations_report.py\n--- a/src/ydata_profiling/expectations_report.py\n+++ b/src/ydata_profiling/expectations_report.py\n@@ -79,7 +79,7 @@\n if not data_context:\n data_context = ge.data_context.DataContext()\n \n- suite = data_context.create_expectation_suite(\n+ suite = data_context.add_expectation_suite(\n suite_name, overwrite_existing=True\n )\n", "issue": "AttributeError: 'FileDataContext' object has no attribute 'create_expectation_suite'\n### Current Behaviour\n\nAttributeError: 'FileDataContext' object has no attribute 'create_expectation_suite'\r\n\r\n[Related to this issue](https://docs.greatexpectations.io/docs/changelog/#01549): \"[MAINTENANCE] Change all instances of create_expectation_suite to add_expectation_suite in tests, docs, and source code ([#7117](https://github.com/great-expectations/great_expectations/pull/7117))\" \r\n\r\nDataContext objects no longer has a method 'create_expectation_suite'.\n\n### Expected Behaviour\n\n[Great expectation test suite](https://docs.profiling.ydata.ai/4.6/integrations/great_expectations/#creating-expectation-suites-with-ydata-profiling): \"ydata-profiling provides a simple to_expectation_suite() method that returns a Great Expectations ExpectationSuite object which contains a set of Expectations.\"\n\n### Data Description\n\n[Dataset can be used from the documentation](https://docs.profiling.ydata.ai/4.6/integrations/great_expectations/#about-great-expectations)\n\n### Code that reproduces the bug\n\n```Python\nprofile = ProfileReport(\r\n df, \r\n title='Pandas Profiling Report', \r\n type_schema=type_schema,\r\n minimal=True, \r\n lazy=False\r\n)\r\ndata_context = ge.data_context.DataContext(\r\n context_root_dir='./gx/'\r\n)\r\nsuite = profile.to_expectation_suite(\r\n data_context=data_context\r\n)\n```\n\n\n### pandas-profiling version\n\n-\n\n### Dependencies\n\n```Text\n-\n```\n\n\n### OS\n\n_No response_\n\n### Checklist\n\n- [X] There is not yet another bug report for this issue in the [issue tracker](https://github.com/ydataai/pandas-profiling/issues)\n- [X] The problem is reproducible from this bug report. [This guide](http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports) can help to craft a minimal bug report.\n- [X] The issue has not been resolved by the entries listed under [Common Issues](https://pandas-profiling.ydata.ai/docs/master/pages/support_contrib/common_issues.html).\n", "before_files": [{"content": "from typing import Any, Optional\n\nimport pandas as pd\nfrom visions import VisionsTypeset\n\nfrom ydata_profiling.config import Settings\nfrom ydata_profiling.model import BaseDescription, expectation_algorithms\nfrom ydata_profiling.model.handler import Handler\nfrom ydata_profiling.utils.dataframe import slugify\n\n\nclass ExpectationHandler(Handler):\n \"\"\"Default handler\"\"\"\n\n def __init__(self, typeset: VisionsTypeset, *args, **kwargs):\n mapping = {\n \"Unsupported\": [expectation_algorithms.generic_expectations],\n \"Text\": [expectation_algorithms.categorical_expectations],\n \"Categorical\": [expectation_algorithms.categorical_expectations],\n \"Boolean\": [expectation_algorithms.categorical_expectations],\n \"Numeric\": [expectation_algorithms.numeric_expectations],\n \"URL\": [expectation_algorithms.url_expectations],\n \"File\": [expectation_algorithms.file_expectations],\n \"Path\": [expectation_algorithms.path_expectations],\n \"DateTime\": [expectation_algorithms.datetime_expectations],\n \"Image\": [expectation_algorithms.image_expectations],\n }\n super().__init__(mapping, typeset, *args, **kwargs)\n\n\nclass ExpectationsReport:\n config: Settings\n df: Optional[pd.DataFrame] = None\n\n @property\n def typeset(self) -> Optional[VisionsTypeset]:\n return None\n\n def to_expectation_suite(\n self,\n suite_name: Optional[str] = None,\n data_context: Optional[Any] = None,\n save_suite: bool = True,\n run_validation: bool = True,\n build_data_docs: bool = True,\n handler: Optional[Handler] = None,\n ) -> Any:\n \"\"\"\n All parameters default to True to make it easier to access the full functionality of Great Expectations out of\n the box.\n Args:\n suite_name: The name of your expectation suite\n data_context: A user-specified data context\n save_suite: Boolean to determine whether to save the suite to .json as part of the method\n run_validation: Boolean to determine whether to run validation as part of the method\n build_data_docs: Boolean to determine whether to build data docs, save the .html file, and open data docs in\n your browser\n handler: The handler to use for building expectation\n\n Returns:\n An ExpectationSuite\n \"\"\"\n try:\n import great_expectations as ge\n except ImportError as ex:\n raise ImportError(\n \"Please install great expectations before using the expectation functionality\"\n ) from ex\n\n # Use report title if suite is empty\n if suite_name is None:\n suite_name = slugify(self.config.title)\n\n # Use the default handler if none\n if handler is None:\n handler = ExpectationHandler(self.typeset)\n\n # Obtain the ge context and create the expectation suite\n if not data_context:\n data_context = ge.data_context.DataContext()\n\n suite = data_context.create_expectation_suite(\n suite_name, overwrite_existing=True\n )\n\n # Instantiate an in-memory pandas dataset\n batch = ge.dataset.PandasDataset(self.df, expectation_suite=suite)\n\n # Obtain the profiling summary\n summary: BaseDescription = self.get_description() # type: ignore\n\n # Dispatch to expectations per semantic variable type\n for name, variable_summary in summary.variables.items():\n handler.handle(variable_summary[\"type\"], name, variable_summary, batch)\n\n # We don't actually update the suite object on the batch in place, so need\n # to get the populated suite from the batch\n suite = batch.get_expectation_suite()\n\n validation_result_identifier = None\n if run_validation:\n batch = ge.dataset.PandasDataset(self.df, expectation_suite=suite)\n\n results = data_context.run_validation_operator(\n \"action_list_operator\", assets_to_validate=[batch]\n )\n validation_result_identifier = results.list_validation_result_identifiers()[\n 0\n ]\n\n # Write expectations and open data docs\n if save_suite or build_data_docs:\n data_context.save_expectation_suite(suite)\n\n if build_data_docs:\n data_context.build_data_docs()\n data_context.open_data_docs(validation_result_identifier)\n\n return batch.get_expectation_suite()\n", "path": "src/ydata_profiling/expectations_report.py"}]} | 2,196 | 112 |
gh_patches_debug_22349 | rasdani/github-patches | git_diff | yt-project__yt-2502 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
repr for particle unions
The `__repr__` for particle unions should include the contents of `sub_types`
</issue>
<code>
[start of yt/data_objects/unions.py]
1 from yt.funcs import ensure_list
2
3 class Union(object):
4 def __init__(self, name, sub_types):
5 self.name = name
6 self.sub_types = ensure_list(sub_types)
7
8 def __iter__(self):
9 for st in self.sub_types:
10 yield st
11
12 class MeshUnion(Union):
13 def __init__(self, name, sub_types):
14 super(MeshUnion, self).__init__(name, sub_types)
15
[end of yt/data_objects/unions.py]
[start of yt/data_objects/particle_unions.py]
1 from .unions import Union
2
3 class ParticleUnion(Union):
4 def __init__(self, name, sub_types):
5 super(ParticleUnion, self).__init__(name, sub_types)
6
[end of yt/data_objects/particle_unions.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/yt/data_objects/particle_unions.py b/yt/data_objects/particle_unions.py
--- a/yt/data_objects/particle_unions.py
+++ b/yt/data_objects/particle_unions.py
@@ -1,5 +1,6 @@
from .unions import Union
class ParticleUnion(Union):
+ _union_type = "particle"
def __init__(self, name, sub_types):
super(ParticleUnion, self).__init__(name, sub_types)
diff --git a/yt/data_objects/unions.py b/yt/data_objects/unions.py
--- a/yt/data_objects/unions.py
+++ b/yt/data_objects/unions.py
@@ -1,6 +1,7 @@
from yt.funcs import ensure_list
class Union(object):
+ _union_type = ""
def __init__(self, name, sub_types):
self.name = name
self.sub_types = ensure_list(sub_types)
@@ -9,6 +10,11 @@
for st in self.sub_types:
yield st
+ def __repr__(self):
+ return "{} Union: '{}' composed of: {}".format(
+ self._union_type.capitalize(), self.name, self.sub_types)
+
class MeshUnion(Union):
+ _union_type = "mesh"
def __init__(self, name, sub_types):
super(MeshUnion, self).__init__(name, sub_types)
| {"golden_diff": "diff --git a/yt/data_objects/particle_unions.py b/yt/data_objects/particle_unions.py\n--- a/yt/data_objects/particle_unions.py\n+++ b/yt/data_objects/particle_unions.py\n@@ -1,5 +1,6 @@\n from .unions import Union\n \n class ParticleUnion(Union):\n+ _union_type = \"particle\"\n def __init__(self, name, sub_types):\n super(ParticleUnion, self).__init__(name, sub_types)\ndiff --git a/yt/data_objects/unions.py b/yt/data_objects/unions.py\n--- a/yt/data_objects/unions.py\n+++ b/yt/data_objects/unions.py\n@@ -1,6 +1,7 @@\n from yt.funcs import ensure_list\n \n class Union(object):\n+ _union_type = \"\"\n def __init__(self, name, sub_types):\n self.name = name\n self.sub_types = ensure_list(sub_types)\n@@ -9,6 +10,11 @@\n for st in self.sub_types:\n yield st\n \n+ def __repr__(self):\n+ return \"{} Union: '{}' composed of: {}\".format(\n+ self._union_type.capitalize(), self.name, self.sub_types)\n+\n class MeshUnion(Union):\n+ _union_type = \"mesh\"\n def __init__(self, name, sub_types):\n super(MeshUnion, self).__init__(name, sub_types)\n", "issue": "repr for particle unions\nThe `__repr__` for particle unions should include the contents of `sub_types`\n", "before_files": [{"content": "from yt.funcs import ensure_list\n\nclass Union(object):\n def __init__(self, name, sub_types):\n self.name = name\n self.sub_types = ensure_list(sub_types)\n\n def __iter__(self):\n for st in self.sub_types:\n yield st\n\nclass MeshUnion(Union):\n def __init__(self, name, sub_types):\n super(MeshUnion, self).__init__(name, sub_types)\n", "path": "yt/data_objects/unions.py"}, {"content": "from .unions import Union\n\nclass ParticleUnion(Union):\n def __init__(self, name, sub_types):\n super(ParticleUnion, self).__init__(name, sub_types)\n", "path": "yt/data_objects/particle_unions.py"}]} | 746 | 307 |
gh_patches_debug_22500 | rasdani/github-patches | git_diff | zulip__zulip-28236 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
`manage.py change_user_role --help` should self-document the set of roles it supports
Right now, the only way it self-documents this is when you try an invalid role:
```
manage.py change_user_role: error: argument <new_role>: invalid choice: 'is_billing_administrator' (choose from 'owner', 'admin', 'moderator', 'member', 'guest', 'can_forge_sender', 'can_create_users', 'is_billing_admin')
```
</issue>
<code>
[start of zerver/management/commands/change_user_role.py]
1 from argparse import ArgumentParser
2 from typing import Any
3
4 from django.core.management.base import CommandError
5 from typing_extensions import override
6
7 from zerver.actions.users import (
8 do_change_can_create_users,
9 do_change_can_forge_sender,
10 do_change_is_billing_admin,
11 do_change_user_role,
12 )
13 from zerver.lib.management import ZulipBaseCommand
14 from zerver.models import UserProfile
15
16
17 class Command(ZulipBaseCommand):
18 help = """Change role of an existing user in their (own) Realm.
19
20 ONLY perform this on customer request from an authorized person.
21 """
22
23 @override
24 def add_arguments(self, parser: ArgumentParser) -> None:
25 parser.add_argument("email", metavar="<email>", help="email of user to change role")
26 parser.add_argument(
27 "new_role",
28 metavar="<new_role>",
29 choices=[
30 "owner",
31 "admin",
32 "moderator",
33 "member",
34 "guest",
35 "can_forge_sender",
36 "can_create_users",
37 "is_billing_admin",
38 ],
39 help="new role of the user",
40 )
41 parser.add_argument(
42 "--revoke",
43 dest="grant",
44 action="store_false",
45 help="Remove can_forge_sender or can_create_users permission.",
46 )
47 self.add_realm_args(parser, required=True)
48
49 @override
50 def handle(self, *args: Any, **options: Any) -> None:
51 email = options["email"]
52 realm = self.get_realm(options)
53
54 user = self.get_user(email, realm)
55
56 user_role_map = {
57 "owner": UserProfile.ROLE_REALM_OWNER,
58 "admin": UserProfile.ROLE_REALM_ADMINISTRATOR,
59 "moderator": UserProfile.ROLE_MODERATOR,
60 "member": UserProfile.ROLE_MEMBER,
61 "guest": UserProfile.ROLE_GUEST,
62 }
63
64 if options["new_role"] not in ["can_forge_sender", "can_create_users", "is_billing_admin"]:
65 new_role = user_role_map[options["new_role"]]
66 if not options["grant"]:
67 raise CommandError(
68 "Revoke not supported with this permission; please specify new role."
69 )
70 if new_role == user.role:
71 raise CommandError("User already has this role.")
72 old_role_name = UserProfile.ROLE_ID_TO_NAME_MAP[user.role]
73 do_change_user_role(user, new_role, acting_user=None)
74 new_role_name = UserProfile.ROLE_ID_TO_NAME_MAP[user.role]
75 print(
76 f"Role for {user.delivery_email} changed from {old_role_name} to {new_role_name}."
77 )
78 return
79
80 if options["new_role"] == "can_forge_sender":
81 if user.can_forge_sender and options["grant"]:
82 raise CommandError("User can already forge messages for this realm.")
83 elif not user.can_forge_sender and not options["grant"]:
84 raise CommandError("User can't forge messages for this realm.")
85 do_change_can_forge_sender(user, options["grant"])
86
87 granted_text = "have" if options["grant"] else "not have"
88 print(
89 f"{user.delivery_email} changed to {granted_text} {options['new_role']} permission."
90 )
91 elif options["new_role"] == "can_create_users":
92 if user.can_create_users and options["grant"]:
93 raise CommandError("User can already create users for this realm.")
94 elif not user.can_create_users and not options["grant"]:
95 raise CommandError("User can't create users for this realm.")
96 do_change_can_create_users(user, options["grant"])
97 else:
98 assert options["new_role"] == "is_billing_admin"
99 if user.is_billing_admin and options["grant"]:
100 raise CommandError("User already is a billing admin for this realm.")
101 elif not user.is_billing_admin and not options["grant"]:
102 raise CommandError("User is not a billing admin for this realm.")
103
104 do_change_is_billing_admin(user, options["grant"])
105
[end of zerver/management/commands/change_user_role.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/management/commands/change_user_role.py b/zerver/management/commands/change_user_role.py
--- a/zerver/management/commands/change_user_role.py
+++ b/zerver/management/commands/change_user_role.py
@@ -13,6 +13,17 @@
from zerver.lib.management import ZulipBaseCommand
from zerver.models import UserProfile
+ROLE_CHOICES = [
+ "owner",
+ "admin",
+ "moderator",
+ "member",
+ "guest",
+ "can_forge_sender",
+ "can_create_users",
+ "is_billing_admin",
+]
+
class Command(ZulipBaseCommand):
help = """Change role of an existing user in their (own) Realm.
@@ -26,17 +37,8 @@
parser.add_argument(
"new_role",
metavar="<new_role>",
- choices=[
- "owner",
- "admin",
- "moderator",
- "member",
- "guest",
- "can_forge_sender",
- "can_create_users",
- "is_billing_admin",
- ],
- help="new role of the user",
+ choices=ROLE_CHOICES,
+ help="new role of the user; choose from " + ", ".join(ROLE_CHOICES),
)
parser.add_argument(
"--revoke",
| {"golden_diff": "diff --git a/zerver/management/commands/change_user_role.py b/zerver/management/commands/change_user_role.py\n--- a/zerver/management/commands/change_user_role.py\n+++ b/zerver/management/commands/change_user_role.py\n@@ -13,6 +13,17 @@\n from zerver.lib.management import ZulipBaseCommand\n from zerver.models import UserProfile\n \n+ROLE_CHOICES = [\n+ \"owner\",\n+ \"admin\",\n+ \"moderator\",\n+ \"member\",\n+ \"guest\",\n+ \"can_forge_sender\",\n+ \"can_create_users\",\n+ \"is_billing_admin\",\n+]\n+\n \n class Command(ZulipBaseCommand):\n help = \"\"\"Change role of an existing user in their (own) Realm.\n@@ -26,17 +37,8 @@\n parser.add_argument(\n \"new_role\",\n metavar=\"<new_role>\",\n- choices=[\n- \"owner\",\n- \"admin\",\n- \"moderator\",\n- \"member\",\n- \"guest\",\n- \"can_forge_sender\",\n- \"can_create_users\",\n- \"is_billing_admin\",\n- ],\n- help=\"new role of the user\",\n+ choices=ROLE_CHOICES,\n+ help=\"new role of the user; choose from \" + \", \".join(ROLE_CHOICES),\n )\n parser.add_argument(\n \"--revoke\",\n", "issue": "`manage.py change_user_role --help` should self-document the set of roles it supports\nRight now, the only way it self-documents this is when you try an invalid role:\r\n\r\n```\r\nmanage.py change_user_role: error: argument <new_role>: invalid choice: 'is_billing_administrator' (choose from 'owner', 'admin', 'moderator', 'member', 'guest', 'can_forge_sender', 'can_create_users', 'is_billing_admin')\r\n```\n", "before_files": [{"content": "from argparse import ArgumentParser\nfrom typing import Any\n\nfrom django.core.management.base import CommandError\nfrom typing_extensions import override\n\nfrom zerver.actions.users import (\n do_change_can_create_users,\n do_change_can_forge_sender,\n do_change_is_billing_admin,\n do_change_user_role,\n)\nfrom zerver.lib.management import ZulipBaseCommand\nfrom zerver.models import UserProfile\n\n\nclass Command(ZulipBaseCommand):\n help = \"\"\"Change role of an existing user in their (own) Realm.\n\nONLY perform this on customer request from an authorized person.\n\"\"\"\n\n @override\n def add_arguments(self, parser: ArgumentParser) -> None:\n parser.add_argument(\"email\", metavar=\"<email>\", help=\"email of user to change role\")\n parser.add_argument(\n \"new_role\",\n metavar=\"<new_role>\",\n choices=[\n \"owner\",\n \"admin\",\n \"moderator\",\n \"member\",\n \"guest\",\n \"can_forge_sender\",\n \"can_create_users\",\n \"is_billing_admin\",\n ],\n help=\"new role of the user\",\n )\n parser.add_argument(\n \"--revoke\",\n dest=\"grant\",\n action=\"store_false\",\n help=\"Remove can_forge_sender or can_create_users permission.\",\n )\n self.add_realm_args(parser, required=True)\n\n @override\n def handle(self, *args: Any, **options: Any) -> None:\n email = options[\"email\"]\n realm = self.get_realm(options)\n\n user = self.get_user(email, realm)\n\n user_role_map = {\n \"owner\": UserProfile.ROLE_REALM_OWNER,\n \"admin\": UserProfile.ROLE_REALM_ADMINISTRATOR,\n \"moderator\": UserProfile.ROLE_MODERATOR,\n \"member\": UserProfile.ROLE_MEMBER,\n \"guest\": UserProfile.ROLE_GUEST,\n }\n\n if options[\"new_role\"] not in [\"can_forge_sender\", \"can_create_users\", \"is_billing_admin\"]:\n new_role = user_role_map[options[\"new_role\"]]\n if not options[\"grant\"]:\n raise CommandError(\n \"Revoke not supported with this permission; please specify new role.\"\n )\n if new_role == user.role:\n raise CommandError(\"User already has this role.\")\n old_role_name = UserProfile.ROLE_ID_TO_NAME_MAP[user.role]\n do_change_user_role(user, new_role, acting_user=None)\n new_role_name = UserProfile.ROLE_ID_TO_NAME_MAP[user.role]\n print(\n f\"Role for {user.delivery_email} changed from {old_role_name} to {new_role_name}.\"\n )\n return\n\n if options[\"new_role\"] == \"can_forge_sender\":\n if user.can_forge_sender and options[\"grant\"]:\n raise CommandError(\"User can already forge messages for this realm.\")\n elif not user.can_forge_sender and not options[\"grant\"]:\n raise CommandError(\"User can't forge messages for this realm.\")\n do_change_can_forge_sender(user, options[\"grant\"])\n\n granted_text = \"have\" if options[\"grant\"] else \"not have\"\n print(\n f\"{user.delivery_email} changed to {granted_text} {options['new_role']} permission.\"\n )\n elif options[\"new_role\"] == \"can_create_users\":\n if user.can_create_users and options[\"grant\"]:\n raise CommandError(\"User can already create users for this realm.\")\n elif not user.can_create_users and not options[\"grant\"]:\n raise CommandError(\"User can't create users for this realm.\")\n do_change_can_create_users(user, options[\"grant\"])\n else:\n assert options[\"new_role\"] == \"is_billing_admin\"\n if user.is_billing_admin and options[\"grant\"]:\n raise CommandError(\"User already is a billing admin for this realm.\")\n elif not user.is_billing_admin and not options[\"grant\"]:\n raise CommandError(\"User is not a billing admin for this realm.\")\n\n do_change_is_billing_admin(user, options[\"grant\"])\n", "path": "zerver/management/commands/change_user_role.py"}]} | 1,697 | 300 |
gh_patches_debug_24944 | rasdani/github-patches | git_diff | plotly__dash-1375 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[BUG] Regression on callbacks using name argument `output=Output(...)`
Caused by https://github.com/plotly/dash/pull/1180
Example DCC failing test: https://github.com/plotly/dash-core-components/blob/dev/tests/test_integration_1.py#L391
Removing (output=) makes it work:
```
Output(component_id='test-pathname', component_property='children'),
```
The problematic line seems to be https://github.com/plotly/dash/blob/dev/dash/dependencies.py#L163
Updating to 👇 makes the test pass:
```
if isinstance(outputs, (list, tuple)) and len(outputs) == 1:
```
Expected result:
- DCC tests pass
- Added test in Dash for named arguments
@alexcjohnson
</issue>
<code>
[start of dash/dependencies.py]
1 import json
2
3 from ._validate import validate_callback
4
5
6 class _Wildcard: # pylint: disable=too-few-public-methods
7 def __init__(self, name):
8 self._name = name
9
10 def __str__(self):
11 return self._name
12
13 def __repr__(self):
14 return "<{}>".format(self)
15
16 def to_json(self):
17 # used in serializing wildcards - arrays are not allowed as
18 # id values, so make the wildcards look like length-1 arrays.
19 return '["{}"]'.format(self._name)
20
21
22 MATCH = _Wildcard("MATCH")
23 ALL = _Wildcard("ALL")
24 ALLSMALLER = _Wildcard("ALLSMALLER")
25
26
27 class DashDependency: # pylint: disable=too-few-public-methods
28 def __init__(self, component_id, component_property):
29 self.component_id = component_id
30 self.component_property = component_property
31
32 def __str__(self):
33 return "{}.{}".format(self.component_id_str(), self.component_property)
34
35 def __repr__(self):
36 return "<{} `{}`>".format(self.__class__.__name__, self)
37
38 def component_id_str(self):
39 i = self.component_id
40
41 def _dump(v):
42 return json.dumps(v, sort_keys=True, separators=(",", ":"))
43
44 def _json(k, v):
45 vstr = v.to_json() if hasattr(v, "to_json") else json.dumps(v)
46 return "{}:{}".format(json.dumps(k), vstr)
47
48 if isinstance(i, dict):
49 return "{" + ",".join(_json(k, i[k]) for k in sorted(i)) + "}"
50
51 return i
52
53 def to_dict(self):
54 return {"id": self.component_id_str(), "property": self.component_property}
55
56 def __eq__(self, other):
57 """
58 We use "==" to denote two deps that refer to the same prop on
59 the same component. In the case of wildcard deps, this means
60 the same prop on *at least one* of the same components.
61 """
62 return (
63 isinstance(other, DashDependency)
64 and self.component_property == other.component_property
65 and self._id_matches(other)
66 )
67
68 def _id_matches(self, other):
69 my_id = self.component_id
70 other_id = other.component_id
71 self_dict = isinstance(my_id, dict)
72 other_dict = isinstance(other_id, dict)
73
74 if self_dict != other_dict:
75 return False
76 if self_dict:
77 if set(my_id.keys()) != set(other_id.keys()):
78 return False
79
80 for k, v in my_id.items():
81 other_v = other_id[k]
82 if v == other_v:
83 continue
84 v_wild = isinstance(v, _Wildcard)
85 other_wild = isinstance(other_v, _Wildcard)
86 if v_wild or other_wild:
87 if not (v_wild and other_wild):
88 continue # one wild, one not
89 if v is ALL or other_v is ALL:
90 continue # either ALL
91 if v is MATCH or other_v is MATCH:
92 return False # one MATCH, one ALLSMALLER
93 else:
94 return False
95 return True
96
97 # both strings
98 return my_id == other_id
99
100 def __hash__(self):
101 return hash(str(self))
102
103
104 class Output(DashDependency): # pylint: disable=too-few-public-methods
105 """Output of a callback."""
106
107 allowed_wildcards = (MATCH, ALL)
108
109
110 class Input(DashDependency): # pylint: disable=too-few-public-methods
111 """Input of callback: trigger an update when it is updated."""
112
113 allowed_wildcards = (MATCH, ALL, ALLSMALLER)
114
115
116 class State(DashDependency): # pylint: disable=too-few-public-methods
117 """Use the value of a State in a callback but don't trigger updates."""
118
119 allowed_wildcards = (MATCH, ALL, ALLSMALLER)
120
121
122 class ClientsideFunction: # pylint: disable=too-few-public-methods
123 def __init__(self, namespace=None, function_name=None):
124
125 if namespace.startswith("_dashprivate_"):
126 raise ValueError("Namespaces cannot start with '_dashprivate_'.")
127
128 if namespace in ["PreventUpdate", "no_update"]:
129 raise ValueError(
130 '"{}" is a forbidden namespace in' " dash_clientside.".format(namespace)
131 )
132
133 self.namespace = namespace
134 self.function_name = function_name
135
136 def __repr__(self):
137 return "ClientsideFunction({}, {})".format(self.namespace, self.function_name)
138
139
140 def extract_callback_args(args, kwargs, name, type_):
141 """Extract arguments for callback from a name and type"""
142 parameters = kwargs.get(name, [])
143 if not parameters:
144 while args and isinstance(args[0], type_):
145 parameters.append(args.pop(0))
146 return parameters
147
148
149 def handle_callback_args(args, kwargs):
150 """Split args into outputs, inputs and states"""
151 prevent_initial_call = kwargs.get("prevent_initial_call", None)
152 if prevent_initial_call is None and args and isinstance(args[-1], bool):
153 prevent_initial_call = args.pop()
154
155 # flatten args, to support the older syntax where outputs, inputs, and states
156 # each needed to be in their own list
157 flat_args = []
158 for arg in args:
159 flat_args += arg if isinstance(arg, (list, tuple)) else [arg]
160
161 outputs = extract_callback_args(flat_args, kwargs, "output", Output)
162 validate_outputs = outputs
163 if len(outputs) == 1:
164 out0 = kwargs.get("output", args[0] if args else None)
165 if not isinstance(out0, (list, tuple)):
166 outputs = outputs[0]
167
168 inputs = extract_callback_args(flat_args, kwargs, "inputs", Input)
169 states = extract_callback_args(flat_args, kwargs, "state", State)
170
171 types = Input, Output, State
172 validate_callback(validate_outputs, inputs, states, flat_args, types)
173
174 return outputs, inputs, states, prevent_initial_call
175
[end of dash/dependencies.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/dash/dependencies.py b/dash/dependencies.py
--- a/dash/dependencies.py
+++ b/dash/dependencies.py
@@ -140,7 +140,13 @@
def extract_callback_args(args, kwargs, name, type_):
"""Extract arguments for callback from a name and type"""
parameters = kwargs.get(name, [])
- if not parameters:
+ if parameters:
+ if not isinstance(parameters, (list, tuple)):
+ # accept a single item, not wrapped in a list, for any of the
+ # categories as a named arg (even though previously only output
+ # could be given unwrapped)
+ return [parameters]
+ else:
while args and isinstance(args[0], type_):
parameters.append(args.pop(0))
return parameters
@@ -163,6 +169,9 @@
if len(outputs) == 1:
out0 = kwargs.get("output", args[0] if args else None)
if not isinstance(out0, (list, tuple)):
+ # unless it was explicitly provided as a list, a single output
+ # sholuld be unwrapped. That ensures the return value of the
+ # callback is also not expected to be wrapped in a list.
outputs = outputs[0]
inputs = extract_callback_args(flat_args, kwargs, "inputs", Input)
| {"golden_diff": "diff --git a/dash/dependencies.py b/dash/dependencies.py\n--- a/dash/dependencies.py\n+++ b/dash/dependencies.py\n@@ -140,7 +140,13 @@\n def extract_callback_args(args, kwargs, name, type_):\n \"\"\"Extract arguments for callback from a name and type\"\"\"\n parameters = kwargs.get(name, [])\n- if not parameters:\n+ if parameters:\n+ if not isinstance(parameters, (list, tuple)):\n+ # accept a single item, not wrapped in a list, for any of the\n+ # categories as a named arg (even though previously only output\n+ # could be given unwrapped)\n+ return [parameters]\n+ else:\n while args and isinstance(args[0], type_):\n parameters.append(args.pop(0))\n return parameters\n@@ -163,6 +169,9 @@\n if len(outputs) == 1:\n out0 = kwargs.get(\"output\", args[0] if args else None)\n if not isinstance(out0, (list, tuple)):\n+ # unless it was explicitly provided as a list, a single output\n+ # sholuld be unwrapped. That ensures the return value of the\n+ # callback is also not expected to be wrapped in a list.\n outputs = outputs[0]\n \n inputs = extract_callback_args(flat_args, kwargs, \"inputs\", Input)\n", "issue": "[BUG] Regression on callbacks using name argument `output=Output(...)`\nCaused by https://github.com/plotly/dash/pull/1180\r\n\r\nExample DCC failing test: https://github.com/plotly/dash-core-components/blob/dev/tests/test_integration_1.py#L391\r\n\r\nRemoving (output=) makes it work:\r\n```\r\nOutput(component_id='test-pathname', component_property='children'),\r\n```\r\n\r\nThe problematic line seems to be https://github.com/plotly/dash/blob/dev/dash/dependencies.py#L163\r\n\r\nUpdating to \ud83d\udc47 makes the test pass:\r\n```\r\nif isinstance(outputs, (list, tuple)) and len(outputs) == 1:\r\n```\r\n\r\nExpected result:\r\n- DCC tests pass\r\n- Added test in Dash for named arguments\r\n\r\n@alexcjohnson \n", "before_files": [{"content": "import json\n\nfrom ._validate import validate_callback\n\n\nclass _Wildcard: # pylint: disable=too-few-public-methods\n def __init__(self, name):\n self._name = name\n\n def __str__(self):\n return self._name\n\n def __repr__(self):\n return \"<{}>\".format(self)\n\n def to_json(self):\n # used in serializing wildcards - arrays are not allowed as\n # id values, so make the wildcards look like length-1 arrays.\n return '[\"{}\"]'.format(self._name)\n\n\nMATCH = _Wildcard(\"MATCH\")\nALL = _Wildcard(\"ALL\")\nALLSMALLER = _Wildcard(\"ALLSMALLER\")\n\n\nclass DashDependency: # pylint: disable=too-few-public-methods\n def __init__(self, component_id, component_property):\n self.component_id = component_id\n self.component_property = component_property\n\n def __str__(self):\n return \"{}.{}\".format(self.component_id_str(), self.component_property)\n\n def __repr__(self):\n return \"<{} `{}`>\".format(self.__class__.__name__, self)\n\n def component_id_str(self):\n i = self.component_id\n\n def _dump(v):\n return json.dumps(v, sort_keys=True, separators=(\",\", \":\"))\n\n def _json(k, v):\n vstr = v.to_json() if hasattr(v, \"to_json\") else json.dumps(v)\n return \"{}:{}\".format(json.dumps(k), vstr)\n\n if isinstance(i, dict):\n return \"{\" + \",\".join(_json(k, i[k]) for k in sorted(i)) + \"}\"\n\n return i\n\n def to_dict(self):\n return {\"id\": self.component_id_str(), \"property\": self.component_property}\n\n def __eq__(self, other):\n \"\"\"\n We use \"==\" to denote two deps that refer to the same prop on\n the same component. In the case of wildcard deps, this means\n the same prop on *at least one* of the same components.\n \"\"\"\n return (\n isinstance(other, DashDependency)\n and self.component_property == other.component_property\n and self._id_matches(other)\n )\n\n def _id_matches(self, other):\n my_id = self.component_id\n other_id = other.component_id\n self_dict = isinstance(my_id, dict)\n other_dict = isinstance(other_id, dict)\n\n if self_dict != other_dict:\n return False\n if self_dict:\n if set(my_id.keys()) != set(other_id.keys()):\n return False\n\n for k, v in my_id.items():\n other_v = other_id[k]\n if v == other_v:\n continue\n v_wild = isinstance(v, _Wildcard)\n other_wild = isinstance(other_v, _Wildcard)\n if v_wild or other_wild:\n if not (v_wild and other_wild):\n continue # one wild, one not\n if v is ALL or other_v is ALL:\n continue # either ALL\n if v is MATCH or other_v is MATCH:\n return False # one MATCH, one ALLSMALLER\n else:\n return False\n return True\n\n # both strings\n return my_id == other_id\n\n def __hash__(self):\n return hash(str(self))\n\n\nclass Output(DashDependency): # pylint: disable=too-few-public-methods\n \"\"\"Output of a callback.\"\"\"\n\n allowed_wildcards = (MATCH, ALL)\n\n\nclass Input(DashDependency): # pylint: disable=too-few-public-methods\n \"\"\"Input of callback: trigger an update when it is updated.\"\"\"\n\n allowed_wildcards = (MATCH, ALL, ALLSMALLER)\n\n\nclass State(DashDependency): # pylint: disable=too-few-public-methods\n \"\"\"Use the value of a State in a callback but don't trigger updates.\"\"\"\n\n allowed_wildcards = (MATCH, ALL, ALLSMALLER)\n\n\nclass ClientsideFunction: # pylint: disable=too-few-public-methods\n def __init__(self, namespace=None, function_name=None):\n\n if namespace.startswith(\"_dashprivate_\"):\n raise ValueError(\"Namespaces cannot start with '_dashprivate_'.\")\n\n if namespace in [\"PreventUpdate\", \"no_update\"]:\n raise ValueError(\n '\"{}\" is a forbidden namespace in' \" dash_clientside.\".format(namespace)\n )\n\n self.namespace = namespace\n self.function_name = function_name\n\n def __repr__(self):\n return \"ClientsideFunction({}, {})\".format(self.namespace, self.function_name)\n\n\ndef extract_callback_args(args, kwargs, name, type_):\n \"\"\"Extract arguments for callback from a name and type\"\"\"\n parameters = kwargs.get(name, [])\n if not parameters:\n while args and isinstance(args[0], type_):\n parameters.append(args.pop(0))\n return parameters\n\n\ndef handle_callback_args(args, kwargs):\n \"\"\"Split args into outputs, inputs and states\"\"\"\n prevent_initial_call = kwargs.get(\"prevent_initial_call\", None)\n if prevent_initial_call is None and args and isinstance(args[-1], bool):\n prevent_initial_call = args.pop()\n\n # flatten args, to support the older syntax where outputs, inputs, and states\n # each needed to be in their own list\n flat_args = []\n for arg in args:\n flat_args += arg if isinstance(arg, (list, tuple)) else [arg]\n\n outputs = extract_callback_args(flat_args, kwargs, \"output\", Output)\n validate_outputs = outputs\n if len(outputs) == 1:\n out0 = kwargs.get(\"output\", args[0] if args else None)\n if not isinstance(out0, (list, tuple)):\n outputs = outputs[0]\n\n inputs = extract_callback_args(flat_args, kwargs, \"inputs\", Input)\n states = extract_callback_args(flat_args, kwargs, \"state\", State)\n\n types = Input, Output, State\n validate_callback(validate_outputs, inputs, states, flat_args, types)\n\n return outputs, inputs, states, prevent_initial_call\n", "path": "dash/dependencies.py"}]} | 2,463 | 307 |
gh_patches_debug_1929 | rasdani/github-patches | git_diff | bookwyrm-social__bookwyrm-1855 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Let admins set default interface language
Right now, BookWyrm's interface language is determined by, in order of preference:
1. The language selected in the user's settings
2. The language requested by the browser, if it's available in the app
3. English
Admin should be able to set the default display language of the interface for logged out viewers and users that don't have a preference saved.
</issue>
<code>
[start of bookwyrm/settings.py]
1 """ bookwyrm settings and configuration """
2 import os
3 from environs import Env
4
5 import requests
6 from django.utils.translation import gettext_lazy as _
7
8
9 env = Env()
10 env.read_env()
11 DOMAIN = env("DOMAIN")
12 VERSION = "0.2.0"
13
14 PAGE_LENGTH = env("PAGE_LENGTH", 15)
15 DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English")
16
17 JS_CACHE = "76c5ff1f"
18
19 # email
20 EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend")
21 EMAIL_HOST = env("EMAIL_HOST")
22 EMAIL_PORT = env("EMAIL_PORT", 587)
23 EMAIL_HOST_USER = env("EMAIL_HOST_USER")
24 EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
25 EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS", True)
26 EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", False)
27 EMAIL_SENDER_NAME = env("EMAIL_SENDER_NAME", "admin")
28 EMAIL_SENDER_DOMAIN = env("EMAIL_SENDER_DOMAIN", DOMAIN)
29 EMAIL_SENDER = f"{EMAIL_SENDER_NAME}@{EMAIL_SENDER_DOMAIN}"
30
31 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
32 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
33 LOCALE_PATHS = [
34 os.path.join(BASE_DIR, "locale"),
35 ]
36 LANGUAGE_COOKIE_NAME = env.str("LANGUAGE_COOKIE_NAME", "django_language")
37
38 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
39
40 # Preview image
41 ENABLE_PREVIEW_IMAGES = env.bool("ENABLE_PREVIEW_IMAGES", False)
42 PREVIEW_BG_COLOR = env.str("PREVIEW_BG_COLOR", "use_dominant_color_light")
43 PREVIEW_TEXT_COLOR = env.str("PREVIEW_TEXT_COLOR", "#363636")
44 PREVIEW_IMG_WIDTH = env.int("PREVIEW_IMG_WIDTH", 1200)
45 PREVIEW_IMG_HEIGHT = env.int("PREVIEW_IMG_HEIGHT", 630)
46 PREVIEW_DEFAULT_COVER_COLOR = env.str("PREVIEW_DEFAULT_COVER_COLOR", "#002549")
47
48 # Quick-start development settings - unsuitable for production
49 # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
50
51 # SECURITY WARNING: keep the secret key used in production secret!
52 SECRET_KEY = env("SECRET_KEY")
53
54 # SECURITY WARNING: don't run with debug turned on in production!
55 DEBUG = env.bool("DEBUG", True)
56 USE_HTTPS = env.bool("USE_HTTPS", False)
57
58 ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", ["*"])
59
60 # Application definition
61
62 INSTALLED_APPS = [
63 "django.contrib.admin",
64 "django.contrib.auth",
65 "django.contrib.contenttypes",
66 "django.contrib.sessions",
67 "django.contrib.messages",
68 "django.contrib.staticfiles",
69 "django.contrib.humanize",
70 "django_rename_app",
71 "bookwyrm",
72 "celery",
73 "imagekit",
74 "storages",
75 ]
76
77 MIDDLEWARE = [
78 "django.middleware.security.SecurityMiddleware",
79 "django.contrib.sessions.middleware.SessionMiddleware",
80 "django.middleware.locale.LocaleMiddleware",
81 "django.middleware.common.CommonMiddleware",
82 "django.middleware.csrf.CsrfViewMiddleware",
83 "django.contrib.auth.middleware.AuthenticationMiddleware",
84 "bookwyrm.middleware.TimezoneMiddleware",
85 "bookwyrm.middleware.IPBlocklistMiddleware",
86 "django.contrib.messages.middleware.MessageMiddleware",
87 "django.middleware.clickjacking.XFrameOptionsMiddleware",
88 ]
89
90 ROOT_URLCONF = "bookwyrm.urls"
91
92 TEMPLATES = [
93 {
94 "BACKEND": "django.template.backends.django.DjangoTemplates",
95 "DIRS": ["templates"],
96 "APP_DIRS": True,
97 "OPTIONS": {
98 "context_processors": [
99 "django.template.context_processors.debug",
100 "django.template.context_processors.request",
101 "django.contrib.auth.context_processors.auth",
102 "django.contrib.messages.context_processors.messages",
103 "bookwyrm.context_processors.site_settings",
104 ],
105 },
106 },
107 ]
108
109 LOG_LEVEL = env("LOG_LEVEL", "INFO").upper()
110 # Override aspects of the default handler to our taste
111 # See https://docs.djangoproject.com/en/3.2/topics/logging/#default-logging-configuration
112 # for a reference to the defaults we're overriding
113 #
114 # It seems that in order to override anything you have to include its
115 # entire dependency tree (handlers and filters) which makes this a
116 # bit verbose
117 LOGGING = {
118 "version": 1,
119 "disable_existing_loggers": False,
120 "filters": {
121 # These are copied from the default configuration, required for
122 # implementing mail_admins below
123 "require_debug_false": {
124 "()": "django.utils.log.RequireDebugFalse",
125 },
126 "require_debug_true": {
127 "()": "django.utils.log.RequireDebugTrue",
128 },
129 },
130 "handlers": {
131 # Overrides the default handler to make it log to console
132 # regardless of the DEBUG setting (default is to not log to
133 # console if DEBUG=False)
134 "console": {
135 "level": LOG_LEVEL,
136 "class": "logging.StreamHandler",
137 },
138 # This is copied as-is from the default logger, and is
139 # required for the django section below
140 "mail_admins": {
141 "level": "ERROR",
142 "filters": ["require_debug_false"],
143 "class": "django.utils.log.AdminEmailHandler",
144 },
145 },
146 "loggers": {
147 # Install our new console handler for Django's logger, and
148 # override the log level while we're at it
149 "django": {
150 "handlers": ["console", "mail_admins"],
151 "level": LOG_LEVEL,
152 },
153 # Add a bookwyrm-specific logger
154 "bookwyrm": {
155 "handlers": ["console"],
156 "level": LOG_LEVEL,
157 },
158 },
159 }
160
161
162 WSGI_APPLICATION = "bookwyrm.wsgi.application"
163
164 # redis/activity streams settings
165 REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost")
166 REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
167 REDIS_ACTIVITY_PASSWORD = env("REDIS_ACTIVITY_PASSWORD", None)
168 REDIS_ACTIVITY_DB_INDEX = env("REDIS_ACTIVITY_DB_INDEX", 0)
169
170 MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200))
171
172 STREAMS = [
173 {"key": "home", "name": _("Home Timeline"), "shortname": _("Home")},
174 {"key": "books", "name": _("Books Timeline"), "shortname": _("Books")},
175 ]
176
177 # Search configuration
178 # total time in seconds that the instance will spend searching connectors
179 SEARCH_TIMEOUT = int(env("SEARCH_TIMEOUT", 15))
180 # timeout for a query to an individual connector
181 QUERY_TIMEOUT = int(env("QUERY_TIMEOUT", 5))
182
183 # Redis cache backend
184 if env("USE_DUMMY_CACHE", False):
185 CACHES = {
186 "default": {
187 "BACKEND": "django.core.cache.backends.dummy.DummyCache",
188 }
189 }
190 else:
191 # pylint: disable=line-too-long
192 CACHES = {
193 "default": {
194 "BACKEND": "django_redis.cache.RedisCache",
195 "LOCATION": f"redis://:{REDIS_ACTIVITY_PASSWORD}@{REDIS_ACTIVITY_HOST}:{REDIS_ACTIVITY_PORT}/{REDIS_ACTIVITY_DB_INDEX}",
196 "OPTIONS": {
197 "CLIENT_CLASS": "django_redis.client.DefaultClient",
198 },
199 }
200 }
201
202 SESSION_ENGINE = "django.contrib.sessions.backends.cache"
203 SESSION_CACHE_ALIAS = "default"
204
205 # Database
206 # https://docs.djangoproject.com/en/3.2/ref/settings/#databases
207
208 DATABASES = {
209 "default": {
210 "ENGINE": "django.db.backends.postgresql_psycopg2",
211 "NAME": env("POSTGRES_DB", "bookwyrm"),
212 "USER": env("POSTGRES_USER", "bookwyrm"),
213 "PASSWORD": env("POSTGRES_PASSWORD", "bookwyrm"),
214 "HOST": env("POSTGRES_HOST", ""),
215 "PORT": env("PGPORT", 5432),
216 },
217 }
218
219
220 LOGIN_URL = "/login/"
221 AUTH_USER_MODEL = "bookwyrm.User"
222
223 # Password validation
224 # https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators
225
226 # pylint: disable=line-too-long
227 AUTH_PASSWORD_VALIDATORS = [
228 {
229 "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
230 },
231 {
232 "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
233 },
234 {
235 "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
236 },
237 {
238 "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
239 },
240 ]
241
242
243 # Internationalization
244 # https://docs.djangoproject.com/en/3.2/topics/i18n/
245
246 LANGUAGE_CODE = "en-us"
247 LANGUAGES = [
248 ("en-us", _("English")),
249 ("de-de", _("Deutsch (German)")),
250 ("es-es", _("Español (Spanish)")),
251 ("gl-es", _("Galego (Galician)")),
252 ("it-it", _("Italiano (Italian)")),
253 ("fr-fr", _("Français (French)")),
254 ("lt-lt", _("Lietuvių (Lithuanian)")),
255 ("no-no", _("Norsk (Norwegian)")),
256 ("pt-br", _("Português do Brasil (Brazilian Portuguese)")),
257 ("pt-pt", _("Português Europeu (European Portuguese)")),
258 ("zh-hans", _("简体中文 (Simplified Chinese)")),
259 ("zh-hant", _("繁體中文 (Traditional Chinese)")),
260 ]
261
262
263 TIME_ZONE = "UTC"
264
265 USE_I18N = True
266
267 USE_L10N = True
268
269 USE_TZ = True
270
271
272 agent = requests.utils.default_user_agent()
273 USER_AGENT = f"{agent} (BookWyrm/{VERSION}; +https://{DOMAIN}/)"
274
275 # Imagekit generated thumbnails
276 ENABLE_THUMBNAIL_GENERATION = env.bool("ENABLE_THUMBNAIL_GENERATION", False)
277 IMAGEKIT_CACHEFILE_DIR = "thumbnails"
278 IMAGEKIT_DEFAULT_CACHEFILE_STRATEGY = "bookwyrm.thumbnail_generation.Strategy"
279
280 # Static files (CSS, JavaScript, Images)
281 # https://docs.djangoproject.com/en/3.2/howto/static-files/
282
283 PROJECT_DIR = os.path.dirname(os.path.abspath(__file__))
284
285 # Storage
286
287 PROTOCOL = "http"
288 if USE_HTTPS:
289 PROTOCOL = "https"
290
291 USE_S3 = env.bool("USE_S3", False)
292
293 if USE_S3:
294 # AWS settings
295 AWS_ACCESS_KEY_ID = env("AWS_ACCESS_KEY_ID")
296 AWS_SECRET_ACCESS_KEY = env("AWS_SECRET_ACCESS_KEY")
297 AWS_STORAGE_BUCKET_NAME = env("AWS_STORAGE_BUCKET_NAME")
298 AWS_S3_CUSTOM_DOMAIN = env("AWS_S3_CUSTOM_DOMAIN")
299 AWS_S3_REGION_NAME = env("AWS_S3_REGION_NAME", "")
300 AWS_S3_ENDPOINT_URL = env("AWS_S3_ENDPOINT_URL")
301 AWS_DEFAULT_ACL = "public-read"
302 AWS_S3_OBJECT_PARAMETERS = {"CacheControl": "max-age=86400"}
303 # S3 Static settings
304 STATIC_LOCATION = "static"
305 STATIC_URL = f"{PROTOCOL}://{AWS_S3_CUSTOM_DOMAIN}/{STATIC_LOCATION}/"
306 STATICFILES_STORAGE = "bookwyrm.storage_backends.StaticStorage"
307 # S3 Media settings
308 MEDIA_LOCATION = "images"
309 MEDIA_URL = f"{PROTOCOL}://{AWS_S3_CUSTOM_DOMAIN}/{MEDIA_LOCATION}/"
310 MEDIA_FULL_URL = MEDIA_URL
311 STATIC_FULL_URL = STATIC_URL
312 DEFAULT_FILE_STORAGE = "bookwyrm.storage_backends.ImagesStorage"
313 # I don't know if it's used, but the site crashes without it
314 STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static"))
315 MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images"))
316 else:
317 STATIC_URL = "/static/"
318 STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static"))
319 MEDIA_URL = "/images/"
320 MEDIA_FULL_URL = f"{PROTOCOL}://{DOMAIN}{MEDIA_URL}"
321 STATIC_FULL_URL = f"{PROTOCOL}://{DOMAIN}{STATIC_URL}"
322 MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images"))
323
[end of bookwyrm/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/bookwyrm/settings.py b/bookwyrm/settings.py
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -243,7 +243,7 @@
# Internationalization
# https://docs.djangoproject.com/en/3.2/topics/i18n/
-LANGUAGE_CODE = "en-us"
+LANGUAGE_CODE = env("LANGUAGE_CODE", "en-us")
LANGUAGES = [
("en-us", _("English")),
("de-de", _("Deutsch (German)")),
| {"golden_diff": "diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py\n--- a/bookwyrm/settings.py\n+++ b/bookwyrm/settings.py\n@@ -243,7 +243,7 @@\n # Internationalization\n # https://docs.djangoproject.com/en/3.2/topics/i18n/\n \n-LANGUAGE_CODE = \"en-us\"\n+LANGUAGE_CODE = env(\"LANGUAGE_CODE\", \"en-us\")\n LANGUAGES = [\n (\"en-us\", _(\"English\")),\n (\"de-de\", _(\"Deutsch (German)\")),\n", "issue": "Let admins set default interface language\nRight now, BookWyrm's interface language is determined by, in order of preference:\r\n1. The language selected in the user's settings\r\n2. The language requested by the browser, if it's available in the app\r\n3. English\r\n\r\nAdmin should be able to set the default display language of the interface for logged out viewers and users that don't have a preference saved.\n", "before_files": [{"content": "\"\"\" bookwyrm settings and configuration \"\"\"\nimport os\nfrom environs import Env\n\nimport requests\nfrom django.utils.translation import gettext_lazy as _\n\n\nenv = Env()\nenv.read_env()\nDOMAIN = env(\"DOMAIN\")\nVERSION = \"0.2.0\"\n\nPAGE_LENGTH = env(\"PAGE_LENGTH\", 15)\nDEFAULT_LANGUAGE = env(\"DEFAULT_LANGUAGE\", \"English\")\n\nJS_CACHE = \"76c5ff1f\"\n\n# email\nEMAIL_BACKEND = env(\"EMAIL_BACKEND\", \"django.core.mail.backends.smtp.EmailBackend\")\nEMAIL_HOST = env(\"EMAIL_HOST\")\nEMAIL_PORT = env(\"EMAIL_PORT\", 587)\nEMAIL_HOST_USER = env(\"EMAIL_HOST_USER\")\nEMAIL_HOST_PASSWORD = env(\"EMAIL_HOST_PASSWORD\")\nEMAIL_USE_TLS = env.bool(\"EMAIL_USE_TLS\", True)\nEMAIL_USE_SSL = env.bool(\"EMAIL_USE_SSL\", False)\nEMAIL_SENDER_NAME = env(\"EMAIL_SENDER_NAME\", \"admin\")\nEMAIL_SENDER_DOMAIN = env(\"EMAIL_SENDER_DOMAIN\", DOMAIN)\nEMAIL_SENDER = f\"{EMAIL_SENDER_NAME}@{EMAIL_SENDER_DOMAIN}\"\n\n# Build paths inside the project like this: os.path.join(BASE_DIR, ...)\nBASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))\nLOCALE_PATHS = [\n os.path.join(BASE_DIR, \"locale\"),\n]\nLANGUAGE_COOKIE_NAME = env.str(\"LANGUAGE_COOKIE_NAME\", \"django_language\")\n\nDEFAULT_AUTO_FIELD = \"django.db.models.AutoField\"\n\n# Preview image\nENABLE_PREVIEW_IMAGES = env.bool(\"ENABLE_PREVIEW_IMAGES\", False)\nPREVIEW_BG_COLOR = env.str(\"PREVIEW_BG_COLOR\", \"use_dominant_color_light\")\nPREVIEW_TEXT_COLOR = env.str(\"PREVIEW_TEXT_COLOR\", \"#363636\")\nPREVIEW_IMG_WIDTH = env.int(\"PREVIEW_IMG_WIDTH\", 1200)\nPREVIEW_IMG_HEIGHT = env.int(\"PREVIEW_IMG_HEIGHT\", 630)\nPREVIEW_DEFAULT_COVER_COLOR = env.str(\"PREVIEW_DEFAULT_COVER_COLOR\", \"#002549\")\n\n# Quick-start development settings - unsuitable for production\n# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/\n\n# SECURITY WARNING: keep the secret key used in production secret!\nSECRET_KEY = env(\"SECRET_KEY\")\n\n# SECURITY WARNING: don't run with debug turned on in production!\nDEBUG = env.bool(\"DEBUG\", True)\nUSE_HTTPS = env.bool(\"USE_HTTPS\", False)\n\nALLOWED_HOSTS = env.list(\"ALLOWED_HOSTS\", [\"*\"])\n\n# Application definition\n\nINSTALLED_APPS = [\n \"django.contrib.admin\",\n \"django.contrib.auth\",\n \"django.contrib.contenttypes\",\n \"django.contrib.sessions\",\n \"django.contrib.messages\",\n \"django.contrib.staticfiles\",\n \"django.contrib.humanize\",\n \"django_rename_app\",\n \"bookwyrm\",\n \"celery\",\n \"imagekit\",\n \"storages\",\n]\n\nMIDDLEWARE = [\n \"django.middleware.security.SecurityMiddleware\",\n \"django.contrib.sessions.middleware.SessionMiddleware\",\n \"django.middleware.locale.LocaleMiddleware\",\n \"django.middleware.common.CommonMiddleware\",\n \"django.middleware.csrf.CsrfViewMiddleware\",\n \"django.contrib.auth.middleware.AuthenticationMiddleware\",\n \"bookwyrm.middleware.TimezoneMiddleware\",\n \"bookwyrm.middleware.IPBlocklistMiddleware\",\n \"django.contrib.messages.middleware.MessageMiddleware\",\n \"django.middleware.clickjacking.XFrameOptionsMiddleware\",\n]\n\nROOT_URLCONF = \"bookwyrm.urls\"\n\nTEMPLATES = [\n {\n \"BACKEND\": \"django.template.backends.django.DjangoTemplates\",\n \"DIRS\": [\"templates\"],\n \"APP_DIRS\": True,\n \"OPTIONS\": {\n \"context_processors\": [\n \"django.template.context_processors.debug\",\n \"django.template.context_processors.request\",\n \"django.contrib.auth.context_processors.auth\",\n \"django.contrib.messages.context_processors.messages\",\n \"bookwyrm.context_processors.site_settings\",\n ],\n },\n },\n]\n\nLOG_LEVEL = env(\"LOG_LEVEL\", \"INFO\").upper()\n# Override aspects of the default handler to our taste\n# See https://docs.djangoproject.com/en/3.2/topics/logging/#default-logging-configuration\n# for a reference to the defaults we're overriding\n#\n# It seems that in order to override anything you have to include its\n# entire dependency tree (handlers and filters) which makes this a\n# bit verbose\nLOGGING = {\n \"version\": 1,\n \"disable_existing_loggers\": False,\n \"filters\": {\n # These are copied from the default configuration, required for\n # implementing mail_admins below\n \"require_debug_false\": {\n \"()\": \"django.utils.log.RequireDebugFalse\",\n },\n \"require_debug_true\": {\n \"()\": \"django.utils.log.RequireDebugTrue\",\n },\n },\n \"handlers\": {\n # Overrides the default handler to make it log to console\n # regardless of the DEBUG setting (default is to not log to\n # console if DEBUG=False)\n \"console\": {\n \"level\": LOG_LEVEL,\n \"class\": \"logging.StreamHandler\",\n },\n # This is copied as-is from the default logger, and is\n # required for the django section below\n \"mail_admins\": {\n \"level\": \"ERROR\",\n \"filters\": [\"require_debug_false\"],\n \"class\": \"django.utils.log.AdminEmailHandler\",\n },\n },\n \"loggers\": {\n # Install our new console handler for Django's logger, and\n # override the log level while we're at it\n \"django\": {\n \"handlers\": [\"console\", \"mail_admins\"],\n \"level\": LOG_LEVEL,\n },\n # Add a bookwyrm-specific logger\n \"bookwyrm\": {\n \"handlers\": [\"console\"],\n \"level\": LOG_LEVEL,\n },\n },\n}\n\n\nWSGI_APPLICATION = \"bookwyrm.wsgi.application\"\n\n# redis/activity streams settings\nREDIS_ACTIVITY_HOST = env(\"REDIS_ACTIVITY_HOST\", \"localhost\")\nREDIS_ACTIVITY_PORT = env(\"REDIS_ACTIVITY_PORT\", 6379)\nREDIS_ACTIVITY_PASSWORD = env(\"REDIS_ACTIVITY_PASSWORD\", None)\nREDIS_ACTIVITY_DB_INDEX = env(\"REDIS_ACTIVITY_DB_INDEX\", 0)\n\nMAX_STREAM_LENGTH = int(env(\"MAX_STREAM_LENGTH\", 200))\n\nSTREAMS = [\n {\"key\": \"home\", \"name\": _(\"Home Timeline\"), \"shortname\": _(\"Home\")},\n {\"key\": \"books\", \"name\": _(\"Books Timeline\"), \"shortname\": _(\"Books\")},\n]\n\n# Search configuration\n# total time in seconds that the instance will spend searching connectors\nSEARCH_TIMEOUT = int(env(\"SEARCH_TIMEOUT\", 15))\n# timeout for a query to an individual connector\nQUERY_TIMEOUT = int(env(\"QUERY_TIMEOUT\", 5))\n\n# Redis cache backend\nif env(\"USE_DUMMY_CACHE\", False):\n CACHES = {\n \"default\": {\n \"BACKEND\": \"django.core.cache.backends.dummy.DummyCache\",\n }\n }\nelse:\n # pylint: disable=line-too-long\n CACHES = {\n \"default\": {\n \"BACKEND\": \"django_redis.cache.RedisCache\",\n \"LOCATION\": f\"redis://:{REDIS_ACTIVITY_PASSWORD}@{REDIS_ACTIVITY_HOST}:{REDIS_ACTIVITY_PORT}/{REDIS_ACTIVITY_DB_INDEX}\",\n \"OPTIONS\": {\n \"CLIENT_CLASS\": \"django_redis.client.DefaultClient\",\n },\n }\n }\n\n SESSION_ENGINE = \"django.contrib.sessions.backends.cache\"\n SESSION_CACHE_ALIAS = \"default\"\n\n# Database\n# https://docs.djangoproject.com/en/3.2/ref/settings/#databases\n\nDATABASES = {\n \"default\": {\n \"ENGINE\": \"django.db.backends.postgresql_psycopg2\",\n \"NAME\": env(\"POSTGRES_DB\", \"bookwyrm\"),\n \"USER\": env(\"POSTGRES_USER\", \"bookwyrm\"),\n \"PASSWORD\": env(\"POSTGRES_PASSWORD\", \"bookwyrm\"),\n \"HOST\": env(\"POSTGRES_HOST\", \"\"),\n \"PORT\": env(\"PGPORT\", 5432),\n },\n}\n\n\nLOGIN_URL = \"/login/\"\nAUTH_USER_MODEL = \"bookwyrm.User\"\n\n# Password validation\n# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators\n\n# pylint: disable=line-too-long\nAUTH_PASSWORD_VALIDATORS = [\n {\n \"NAME\": \"django.contrib.auth.password_validation.UserAttributeSimilarityValidator\",\n },\n {\n \"NAME\": \"django.contrib.auth.password_validation.MinimumLengthValidator\",\n },\n {\n \"NAME\": \"django.contrib.auth.password_validation.CommonPasswordValidator\",\n },\n {\n \"NAME\": \"django.contrib.auth.password_validation.NumericPasswordValidator\",\n },\n]\n\n\n# Internationalization\n# https://docs.djangoproject.com/en/3.2/topics/i18n/\n\nLANGUAGE_CODE = \"en-us\"\nLANGUAGES = [\n (\"en-us\", _(\"English\")),\n (\"de-de\", _(\"Deutsch (German)\")),\n (\"es-es\", _(\"Espa\u00f1ol (Spanish)\")),\n (\"gl-es\", _(\"Galego (Galician)\")),\n (\"it-it\", _(\"Italiano (Italian)\")),\n (\"fr-fr\", _(\"Fran\u00e7ais (French)\")),\n (\"lt-lt\", _(\"Lietuvi\u0173 (Lithuanian)\")),\n (\"no-no\", _(\"Norsk (Norwegian)\")),\n (\"pt-br\", _(\"Portugu\u00eas do Brasil (Brazilian Portuguese)\")),\n (\"pt-pt\", _(\"Portugu\u00eas Europeu (European Portuguese)\")),\n (\"zh-hans\", _(\"\u7b80\u4f53\u4e2d\u6587 (Simplified Chinese)\")),\n (\"zh-hant\", _(\"\u7e41\u9ad4\u4e2d\u6587 (Traditional Chinese)\")),\n]\n\n\nTIME_ZONE = \"UTC\"\n\nUSE_I18N = True\n\nUSE_L10N = True\n\nUSE_TZ = True\n\n\nagent = requests.utils.default_user_agent()\nUSER_AGENT = f\"{agent} (BookWyrm/{VERSION}; +https://{DOMAIN}/)\"\n\n# Imagekit generated thumbnails\nENABLE_THUMBNAIL_GENERATION = env.bool(\"ENABLE_THUMBNAIL_GENERATION\", False)\nIMAGEKIT_CACHEFILE_DIR = \"thumbnails\"\nIMAGEKIT_DEFAULT_CACHEFILE_STRATEGY = \"bookwyrm.thumbnail_generation.Strategy\"\n\n# Static files (CSS, JavaScript, Images)\n# https://docs.djangoproject.com/en/3.2/howto/static-files/\n\nPROJECT_DIR = os.path.dirname(os.path.abspath(__file__))\n\n# Storage\n\nPROTOCOL = \"http\"\nif USE_HTTPS:\n PROTOCOL = \"https\"\n\nUSE_S3 = env.bool(\"USE_S3\", False)\n\nif USE_S3:\n # AWS settings\n AWS_ACCESS_KEY_ID = env(\"AWS_ACCESS_KEY_ID\")\n AWS_SECRET_ACCESS_KEY = env(\"AWS_SECRET_ACCESS_KEY\")\n AWS_STORAGE_BUCKET_NAME = env(\"AWS_STORAGE_BUCKET_NAME\")\n AWS_S3_CUSTOM_DOMAIN = env(\"AWS_S3_CUSTOM_DOMAIN\")\n AWS_S3_REGION_NAME = env(\"AWS_S3_REGION_NAME\", \"\")\n AWS_S3_ENDPOINT_URL = env(\"AWS_S3_ENDPOINT_URL\")\n AWS_DEFAULT_ACL = \"public-read\"\n AWS_S3_OBJECT_PARAMETERS = {\"CacheControl\": \"max-age=86400\"}\n # S3 Static settings\n STATIC_LOCATION = \"static\"\n STATIC_URL = f\"{PROTOCOL}://{AWS_S3_CUSTOM_DOMAIN}/{STATIC_LOCATION}/\"\n STATICFILES_STORAGE = \"bookwyrm.storage_backends.StaticStorage\"\n # S3 Media settings\n MEDIA_LOCATION = \"images\"\n MEDIA_URL = f\"{PROTOCOL}://{AWS_S3_CUSTOM_DOMAIN}/{MEDIA_LOCATION}/\"\n MEDIA_FULL_URL = MEDIA_URL\n STATIC_FULL_URL = STATIC_URL\n DEFAULT_FILE_STORAGE = \"bookwyrm.storage_backends.ImagesStorage\"\n # I don't know if it's used, but the site crashes without it\n STATIC_ROOT = os.path.join(BASE_DIR, env(\"STATIC_ROOT\", \"static\"))\n MEDIA_ROOT = os.path.join(BASE_DIR, env(\"MEDIA_ROOT\", \"images\"))\nelse:\n STATIC_URL = \"/static/\"\n STATIC_ROOT = os.path.join(BASE_DIR, env(\"STATIC_ROOT\", \"static\"))\n MEDIA_URL = \"/images/\"\n MEDIA_FULL_URL = f\"{PROTOCOL}://{DOMAIN}{MEDIA_URL}\"\n STATIC_FULL_URL = f\"{PROTOCOL}://{DOMAIN}{STATIC_URL}\"\n MEDIA_ROOT = os.path.join(BASE_DIR, env(\"MEDIA_ROOT\", \"images\"))\n", "path": "bookwyrm/settings.py"}]} | 4,089 | 114 |
gh_patches_debug_14643 | rasdani/github-patches | git_diff | pulp__pulpcore-3034 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Remove orphans: Repository matching query does not exist.
**Version**
```
$ rpm -qa | grep tfm-rubygem-pulp
tfm-rubygem-pulp_certguard_client-1.5.0-1.el7.noarch
tfm-rubygem-pulp_ansible_client-0.13.1-1.el7.noarch
tfm-rubygem-pulp_deb_client-2.18.0-1.el7.noarch
tfm-rubygem-pulp_rpm_client-3.17.4-1.el7.noarch
tfm-rubygem-pulp_python_client-3.6.0-1.el7.noarch
tfm-rubygem-pulp_ostree_client-2.0.0-0.1.a1.el7.noarch
tfm-rubygem-pulpcore_client-3.18.5-1.el7.noarch
tfm-rubygem-pulp_container_client-2.10.3-1.el7.noarch
tfm-rubygem-pulp_file_client-1.10.0-1.el7.noarch
$ rpm -qa | grep katello-4
tfm-rubygem-katello-4.5.0-1.el7.noarch
katello-4.5.0-1.el7.noarch
```
**Describe the bug**
Running `foreman-rake katello:delete_orphaned_content RAILS_ENV=production` creates two tasks.
One of the tasks gets stuck in _paused_ with the following error: `Repository matching query does not exist.`
**To Reproduce**
- Run
`foreman-rake katello:delete_orphaned_content RAILS_ENV=production`.
- After a few minutes run
`hammer --no-headers --output json task list --order 'started_at DESC' --search 'state = "paused"'`
**Expected behavior**
We expected both tasks to run successfully.
**Additional context**
We had to manually apply this patch: https://github.com/pulp/pulp_rpm/pull/2619 - before that, we had his same issue: https://github.com/pulp/pulp_rpm/issues/2459 .
```
$ hammer --no-headers --output json task list --order 'started_at DESC' --search 'state = "paused" '
[
{
"ID": "a8aae19c-7c62-4a60-ab12-935687e3723e",
"Action": "Remove orphans ",
"State": "paused",
"Result": "error",
"Started at": "2022-07-21 15:29:02 UTC",
"Ended at": null,
"Duration": "00:02:29.56437",
"Owner": "foreman_admin",
"Task errors": [
"Repository matching query does not exist."
]
}
]
```
```
$ http_pulp /pulp/api/v3/tasks/e7df82c7-cb38-4fac-a28a-edd8842b3b69/
HTTP/1.1 200 OK
Access-Control-Expose-Headers: Correlation-ID
Allow: GET, PATCH, DELETE, HEAD, OPTIONS
Connection: Keep-Alive
Content-Length: 3335
Content-Type: application/json
Correlation-ID: e1f2e082da6e401196007424799a05b5
Date: Thu, 21 Jul 2022 17:10:58 GMT
Keep-Alive: timeout=15, max=100
Referrer-Policy: same-origin
Server: gunicorn
Vary: Accept,Cookie
Via: 1.1 updates.eurotux.com
X-Content-Type-Options: nosniff
X-Frame-Options: DENY
{
"child_tasks": [],
"created_resources": [],
"error": {
"description": "Repository matching query does not exist.",
"traceback": " File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/pulpcore/tasking/pulpcore_worker.py\", line 410, in _perform_task\n result = func(*args, **kwargs)\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/pulpcore/app/tasks/orphan.py\", line 66, in orphan_cleanup\n c.delete()\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/query.py\", line 746, in delete\n deleted, _rows_count = collector.delete()\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/deletion.py\", line 435, in delete\n signals.post_delete.send(\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/dispatch/dispatcher.py\", line 180, in send\n return [\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/dispatch/dispatcher.py\", line 181, in <listcomp>\n (receiver, receiver(signal=self, sender=sender, **named))\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/pulp_rpm/app/models/distribution.py\", line 340, in cleanup_subrepos\n Variant.objects.filter(repository=subrepo).delete()\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/query.py\", line 746, in delete\n deleted, _rows_count = collector.delete()\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/deletion.py\", line 435, in delete\n signals.post_delete.send(\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/dispatch/dispatcher.py\", line 180, in send\n return [\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/dispatch/dispatcher.py\", line 181, in <listcomp>\n (receiver, receiver(signal=self, sender=sender, **named))\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/pulp_rpm/app/models/distribution.py\", line 338, in cleanup_subrepos\n subrepo = instance.repository\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/fields/related_descriptors.py\", line 187, in __get__\n rel_obj = self.get_object(instance)\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/fields/related_descriptors.py\", line 154, in get_object\n return qs.get(self.field.get_reverse_related_filter(instance))\n File \"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/query.py\", line 435, in get\n raise self.model.DoesNotExist(\n"
},
"finished_at": "2022-07-21T15:30:11.075104Z",
"logging_cid": "ac4070d63c764578bb854f97873ba88a",
"name": "pulpcore.app.tasks.orphan.orphan_cleanup",
"parent_task": null,
"progress_reports": [
{
"code": "clean-up.content",
"done": 2000,
"message": "Clean up orphan Content",
"state": "running",
"suffix": null,
"total": 17098
}
],
"pulp_created": "2022-07-21T15:29:58.868921Z",
"pulp_href": "/pulp/api/v3/tasks/e7df82c7-cb38-4fac-a28a-edd8842b3b69/",
"reserved_resources_record": [],
"started_at": "2022-07-21T15:29:59.335110Z",
"state": "failed",
"task_group": null,
"worker": "/pulp/api/v3/workers/6ff07070-3e14-49b3-b508-a0c300683f28/"
}
```
edit: related to https://community.theforeman.org/t/delete-orphaned-content-fails/29494/6
https://bugzilla.redhat.com/show_bug.cgi?id=2115881
</issue>
<code>
[start of pulpcore/app/views/orphans.py]
1 from drf_spectacular.utils import extend_schema
2 from rest_framework.views import APIView
3
4 from pulpcore.app.response import OperationPostponedResponse
5 from pulpcore.app.serializers import AsyncOperationResponseSerializer
6 from pulpcore.app.tasks import orphan_cleanup
7 from pulpcore.tasking.tasks import dispatch
8
9
10 class OrphansView(APIView):
11 @extend_schema(
12 description="DEPRECATED! Trigger an asynchronous task that deletes all "
13 "orphaned content and artifacts. Use the `POST /pulp/api/v3/orphans/cleanup/` call "
14 "instead.",
15 summary="Delete orphans",
16 responses={202: AsyncOperationResponseSerializer},
17 )
18 def delete(self, request, format=None):
19 """
20 Cleans up all the Content and Artifact orphans in the system
21 """
22 task = dispatch(orphan_cleanup)
23
24 return OperationPostponedResponse(task, request)
25
[end of pulpcore/app/views/orphans.py]
[start of pulpcore/app/viewsets/orphans.py]
1 from drf_spectacular.utils import extend_schema
2 from rest_framework.viewsets import ViewSet
3
4 from pulpcore.app.response import OperationPostponedResponse
5 from pulpcore.app.serializers import AsyncOperationResponseSerializer, OrphansCleanupSerializer
6 from pulpcore.app.tasks import orphan_cleanup
7 from pulpcore.tasking.tasks import dispatch
8
9
10 class OrphansCleanupViewset(ViewSet):
11 serializer_class = OrphansCleanupSerializer
12
13 @extend_schema(
14 description="Trigger an asynchronous orphan cleanup operation.",
15 responses={202: AsyncOperationResponseSerializer},
16 )
17 def cleanup(self, request):
18 """
19 Triggers an asynchronous orphan cleanup operation.
20 """
21 serializer = OrphansCleanupSerializer(data=request.data)
22 serializer.is_valid(raise_exception=True)
23
24 content_pks = serializer.validated_data.get("content_hrefs", None)
25 orphan_protection_time = serializer.validated_data.get("orphan_protection_time")
26
27 task = dispatch(
28 orphan_cleanup,
29 kwargs={"content_pks": content_pks, "orphan_protection_time": orphan_protection_time},
30 )
31
32 return OperationPostponedResponse(task, request)
33
[end of pulpcore/app/viewsets/orphans.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/pulpcore/app/views/orphans.py b/pulpcore/app/views/orphans.py
--- a/pulpcore/app/views/orphans.py
+++ b/pulpcore/app/views/orphans.py
@@ -19,6 +19,6 @@
"""
Cleans up all the Content and Artifact orphans in the system
"""
- task = dispatch(orphan_cleanup)
+ task = dispatch(orphan_cleanup, exclusive_resources=["/pulp/api/v3/orphans/cleanup/"])
return OperationPostponedResponse(task, request)
diff --git a/pulpcore/app/viewsets/orphans.py b/pulpcore/app/viewsets/orphans.py
--- a/pulpcore/app/viewsets/orphans.py
+++ b/pulpcore/app/viewsets/orphans.py
@@ -26,6 +26,7 @@
task = dispatch(
orphan_cleanup,
+ exclusive_resources=["/pulp/api/v3/orphans/cleanup/"],
kwargs={"content_pks": content_pks, "orphan_protection_time": orphan_protection_time},
)
| {"golden_diff": "diff --git a/pulpcore/app/views/orphans.py b/pulpcore/app/views/orphans.py\n--- a/pulpcore/app/views/orphans.py\n+++ b/pulpcore/app/views/orphans.py\n@@ -19,6 +19,6 @@\n \"\"\"\n Cleans up all the Content and Artifact orphans in the system\n \"\"\"\n- task = dispatch(orphan_cleanup)\n+ task = dispatch(orphan_cleanup, exclusive_resources=[\"/pulp/api/v3/orphans/cleanup/\"])\n \n return OperationPostponedResponse(task, request)\ndiff --git a/pulpcore/app/viewsets/orphans.py b/pulpcore/app/viewsets/orphans.py\n--- a/pulpcore/app/viewsets/orphans.py\n+++ b/pulpcore/app/viewsets/orphans.py\n@@ -26,6 +26,7 @@\n \n task = dispatch(\n orphan_cleanup,\n+ exclusive_resources=[\"/pulp/api/v3/orphans/cleanup/\"],\n kwargs={\"content_pks\": content_pks, \"orphan_protection_time\": orphan_protection_time},\n )\n", "issue": "Remove orphans: Repository matching query does not exist.\n**Version**\r\n```\r\n$ rpm -qa | grep tfm-rubygem-pulp\r\ntfm-rubygem-pulp_certguard_client-1.5.0-1.el7.noarch\r\ntfm-rubygem-pulp_ansible_client-0.13.1-1.el7.noarch\r\ntfm-rubygem-pulp_deb_client-2.18.0-1.el7.noarch\r\ntfm-rubygem-pulp_rpm_client-3.17.4-1.el7.noarch\r\ntfm-rubygem-pulp_python_client-3.6.0-1.el7.noarch\r\ntfm-rubygem-pulp_ostree_client-2.0.0-0.1.a1.el7.noarch\r\ntfm-rubygem-pulpcore_client-3.18.5-1.el7.noarch\r\ntfm-rubygem-pulp_container_client-2.10.3-1.el7.noarch\r\ntfm-rubygem-pulp_file_client-1.10.0-1.el7.noarch\r\n\r\n$ rpm -qa | grep katello-4\r\ntfm-rubygem-katello-4.5.0-1.el7.noarch\r\nkatello-4.5.0-1.el7.noarch\r\n```\r\n\r\n**Describe the bug**\r\nRunning `foreman-rake katello:delete_orphaned_content RAILS_ENV=production` creates two tasks.\r\nOne of the tasks gets stuck in _paused_ with the following error: `Repository matching query does not exist.`\r\n\r\n\r\n**To Reproduce**\r\n\r\n- Run \r\n `foreman-rake katello:delete_orphaned_content RAILS_ENV=production`.\r\n\r\n- After a few minutes run \r\n `hammer --no-headers --output json task list --order 'started_at DESC' --search 'state = \"paused\"'`\r\n\r\n**Expected behavior**\r\nWe expected both tasks to run successfully.\r\n\r\n**Additional context**\r\nWe had to manually apply this patch: https://github.com/pulp/pulp_rpm/pull/2619 - before that, we had his same issue: https://github.com/pulp/pulp_rpm/issues/2459 .\r\n\r\n```\r\n$ hammer --no-headers --output json task list --order 'started_at DESC' --search 'state = \"paused\" '\r\n[\r\n {\r\n \"ID\": \"a8aae19c-7c62-4a60-ab12-935687e3723e\",\r\n \"Action\": \"Remove orphans \",\r\n \"State\": \"paused\",\r\n \"Result\": \"error\",\r\n \"Started at\": \"2022-07-21 15:29:02 UTC\",\r\n \"Ended at\": null,\r\n \"Duration\": \"00:02:29.56437\",\r\n \"Owner\": \"foreman_admin\",\r\n \"Task errors\": [\r\n \"Repository matching query does not exist.\"\r\n ]\r\n }\r\n]\r\n```\r\n```\r\n$ http_pulp /pulp/api/v3/tasks/e7df82c7-cb38-4fac-a28a-edd8842b3b69/\r\nHTTP/1.1 200 OK\r\nAccess-Control-Expose-Headers: Correlation-ID\r\nAllow: GET, PATCH, DELETE, HEAD, OPTIONS\r\nConnection: Keep-Alive\r\nContent-Length: 3335\r\nContent-Type: application/json\r\nCorrelation-ID: e1f2e082da6e401196007424799a05b5\r\nDate: Thu, 21 Jul 2022 17:10:58 GMT\r\nKeep-Alive: timeout=15, max=100\r\nReferrer-Policy: same-origin\r\nServer: gunicorn\r\nVary: Accept,Cookie\r\nVia: 1.1 updates.eurotux.com\r\nX-Content-Type-Options: nosniff\r\nX-Frame-Options: DENY\r\n\r\n{\r\n \"child_tasks\": [],\r\n \"created_resources\": [],\r\n \"error\": {\r\n \"description\": \"Repository matching query does not exist.\",\r\n \"traceback\": \" File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/pulpcore/tasking/pulpcore_worker.py\\\", line 410, in _perform_task\\n result = func(*args, **kwargs)\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/pulpcore/app/tasks/orphan.py\\\", line 66, in orphan_cleanup\\n c.delete()\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/query.py\\\", line 746, in delete\\n deleted, _rows_count = collector.delete()\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/deletion.py\\\", line 435, in delete\\n signals.post_delete.send(\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/dispatch/dispatcher.py\\\", line 180, in send\\n return [\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/dispatch/dispatcher.py\\\", line 181, in <listcomp>\\n (receiver, receiver(signal=self, sender=sender, **named))\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/pulp_rpm/app/models/distribution.py\\\", line 340, in cleanup_subrepos\\n Variant.objects.filter(repository=subrepo).delete()\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/query.py\\\", line 746, in delete\\n deleted, _rows_count = collector.delete()\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/deletion.py\\\", line 435, in delete\\n signals.post_delete.send(\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/dispatch/dispatcher.py\\\", line 180, in send\\n return [\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/dispatch/dispatcher.py\\\", line 181, in <listcomp>\\n (receiver, receiver(signal=self, sender=sender, **named))\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/pulp_rpm/app/models/distribution.py\\\", line 338, in cleanup_subrepos\\n subrepo = instance.repository\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/fields/related_descriptors.py\\\", line 187, in __get__\\n rel_obj = self.get_object(instance)\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/fields/related_descriptors.py\\\", line 154, in get_object\\n return qs.get(self.field.get_reverse_related_filter(instance))\\n File \\\"/opt/theforeman/tfm-pulpcore/root/usr/lib/python3.8/site-packages/django/db/models/query.py\\\", line 435, in get\\n raise self.model.DoesNotExist(\\n\"\r\n },\r\n \"finished_at\": \"2022-07-21T15:30:11.075104Z\",\r\n \"logging_cid\": \"ac4070d63c764578bb854f97873ba88a\",\r\n \"name\": \"pulpcore.app.tasks.orphan.orphan_cleanup\",\r\n \"parent_task\": null,\r\n \"progress_reports\": [\r\n {\r\n \"code\": \"clean-up.content\",\r\n \"done\": 2000,\r\n \"message\": \"Clean up orphan Content\",\r\n \"state\": \"running\",\r\n \"suffix\": null,\r\n \"total\": 17098\r\n }\r\n ],\r\n \"pulp_created\": \"2022-07-21T15:29:58.868921Z\",\r\n \"pulp_href\": \"/pulp/api/v3/tasks/e7df82c7-cb38-4fac-a28a-edd8842b3b69/\",\r\n \"reserved_resources_record\": [],\r\n \"started_at\": \"2022-07-21T15:29:59.335110Z\",\r\n \"state\": \"failed\",\r\n \"task_group\": null,\r\n \"worker\": \"/pulp/api/v3/workers/6ff07070-3e14-49b3-b508-a0c300683f28/\"\r\n}\r\n```\r\n\r\nedit: related to https://community.theforeman.org/t/delete-orphaned-content-fails/29494/6\r\n\r\nhttps://bugzilla.redhat.com/show_bug.cgi?id=2115881\r\n\r\n\n", "before_files": [{"content": "from drf_spectacular.utils import extend_schema\nfrom rest_framework.views import APIView\n\nfrom pulpcore.app.response import OperationPostponedResponse\nfrom pulpcore.app.serializers import AsyncOperationResponseSerializer\nfrom pulpcore.app.tasks import orphan_cleanup\nfrom pulpcore.tasking.tasks import dispatch\n\n\nclass OrphansView(APIView):\n @extend_schema(\n description=\"DEPRECATED! Trigger an asynchronous task that deletes all \"\n \"orphaned content and artifacts. Use the `POST /pulp/api/v3/orphans/cleanup/` call \"\n \"instead.\",\n summary=\"Delete orphans\",\n responses={202: AsyncOperationResponseSerializer},\n )\n def delete(self, request, format=None):\n \"\"\"\n Cleans up all the Content and Artifact orphans in the system\n \"\"\"\n task = dispatch(orphan_cleanup)\n\n return OperationPostponedResponse(task, request)\n", "path": "pulpcore/app/views/orphans.py"}, {"content": "from drf_spectacular.utils import extend_schema\nfrom rest_framework.viewsets import ViewSet\n\nfrom pulpcore.app.response import OperationPostponedResponse\nfrom pulpcore.app.serializers import AsyncOperationResponseSerializer, OrphansCleanupSerializer\nfrom pulpcore.app.tasks import orphan_cleanup\nfrom pulpcore.tasking.tasks import dispatch\n\n\nclass OrphansCleanupViewset(ViewSet):\n serializer_class = OrphansCleanupSerializer\n\n @extend_schema(\n description=\"Trigger an asynchronous orphan cleanup operation.\",\n responses={202: AsyncOperationResponseSerializer},\n )\n def cleanup(self, request):\n \"\"\"\n Triggers an asynchronous orphan cleanup operation.\n \"\"\"\n serializer = OrphansCleanupSerializer(data=request.data)\n serializer.is_valid(raise_exception=True)\n\n content_pks = serializer.validated_data.get(\"content_hrefs\", None)\n orphan_protection_time = serializer.validated_data.get(\"orphan_protection_time\")\n\n task = dispatch(\n orphan_cleanup,\n kwargs={\"content_pks\": content_pks, \"orphan_protection_time\": orphan_protection_time},\n )\n\n return OperationPostponedResponse(task, request)\n", "path": "pulpcore/app/viewsets/orphans.py"}]} | 3,172 | 231 |
gh_patches_debug_15084 | rasdani/github-patches | git_diff | apache__tvm-2220 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[RELAY][PASS] Check Positiveness in FoldScaleAxis
This issue is bought up by @merrymercy . So far FoldScaleAxis is able to pass through functions like relu. However, this is only true if the scaling factor is all positive number -- we didn't encounter this problem so far because most networks only have scaling coming from BN and the result is positive constant.
We should update the pass by running the following thing:
- Do constant folding before running FoldScaleAxis
- Check positiveness of the scale(since scale is constant it is not hard to do so)
- Only allow passing relu through if the scale is positive.
</issue>
<code>
[start of python/tvm/relay/build_module.py]
1 """
2 Construct the necessary state for the TVM graph runtime
3 from a Relay expression.
4 """
5 from ..build_module import build as _tvm_build_module
6 from .. import nd as _nd, target as _target, autotvm
7 from ..contrib import graph_runtime as _graph_rt
8 from . import ir_pass
9 from . import expr
10 from .backend import interpreter as _interpreter
11 from .backend import graph_runtime_codegen as _graph_gen
12
13 # List of optimization pass and level when switch on
14 OPT_PASS_LEVEL = {
15 "SimplifyInference": 0,
16 "OpFusion": 1,
17 "FoldConstant": 2,
18 "CombineParallelConv2D": 3,
19 "FoldScaleAxis": 3,
20 "AlterOpLayout": 3,
21 }
22
23 class BuildConfig(object):
24 """Configuration scope to set a build config option.
25
26 Parameters
27 ----------
28 kwargs
29 Keyword arguments of configurations to set.
30 """
31 current = None
32 defaults = {
33 "opt_level": 2,
34 "add_pass": None,
35 }
36 def __init__(self, **kwargs):
37 self._old_scope = None
38 for k, _ in kwargs.items():
39 if k not in BuildConfig.defaults:
40 raise ValueError(
41 "invalid argument %s, candidates are %s" % (k, BuildConfig.defaults.keys()))
42 self._attr = kwargs
43
44 def __getattr__(self, name):
45 if name not in self._attr:
46 return BuildConfig.defaults[name]
47 return self._attr[name]
48
49 def __enter__(self):
50 # pylint: disable=protected-access
51 self._old_scope = BuildConfig.current
52 attr = BuildConfig.current._attr.copy()
53 attr.update(self._attr)
54 self._attr = attr
55 BuildConfig.current = self
56 return self
57
58 def __exit__(self, ptype, value, trace):
59 assert self._old_scope
60 BuildConfig.current = self._old_scope
61
62 def pass_enabled(self, pass_name):
63 """Get whether pass is enabled.
64
65 Parameters
66 ----------
67 pass_name : str
68 The optimization pass name
69
70 Returns
71 -------
72 enabled : bool
73 Whether pass is enabled.
74 """
75 if self.add_pass and pass_name in self.add_pass:
76 return True
77 return self.opt_level >= OPT_PASS_LEVEL[pass_name]
78
79
80 BuildConfig.current = BuildConfig()
81
82
83 def build_config(**kwargs):
84 """Configure the build behavior by setting config variables.
85
86 Parameters
87 ----------
88 opt_level: int, default=2
89 Optimization level. See OPT_PASS_LEVEL for level of each pass.
90
91 add_pass: set of str
92 Optimization pass to be added regardless of optimization level.
93
94 Returns
95 -------
96 config: BuildConfig
97 The build configuration
98 """
99 return BuildConfig(**kwargs)
100
101
102 def _bind_params_by_name(func, params):
103 """Bind parameters of function by its name."""
104 name_dict = {}
105 for arg in func.params:
106 name = arg.name_hint
107 if name in name_dict:
108 name_dict[name] = None
109 else:
110 name_dict[name] = arg
111 bind_dict = {}
112 for k, v in params.items():
113 if k not in name_dict:
114 continue
115 arg = name_dict[k]
116 if arg is None:
117 raise ValueError("Multiple args in the function have name %s" % k)
118 bind_dict[arg] = expr.const(v)
119 return expr.bind(func, bind_dict)
120
121
122 def optimize(func, params=None):
123 """Perform target invariant optimizations.
124
125 Parameters
126 ----------
127 func : tvm.relay.Function
128 The input to optimization.
129
130 params : Optional[Dict[str, tvm.nd.NDArray]]
131 Input parameters to the graph that do not change
132 during inference time. used for constant folding.
133
134 Returns
135 -------
136 opt_func : tvm.relay.Function
137 The optimized version of the function.
138 """
139 cfg = BuildConfig.current
140
141 # bind expressions
142 if params:
143 func = _bind_params_by_name(func, params)
144
145 if cfg.pass_enabled("SimplifyInference"):
146 func = ir_pass.infer_type(func)
147 func = ir_pass.simplify_inference(func)
148
149 if cfg.pass_enabled("CombineParallelConv2D"):
150 func = ir_pass.infer_type(func)
151 func = ir_pass.combine_parallel_conv2d(func)
152
153 if cfg.pass_enabled("FoldScaleAxis"):
154 func = ir_pass.infer_type(func)
155 func = ir_pass.backward_fold_scale_axis(func)
156 func = ir_pass.infer_type(func)
157 func = ir_pass.forward_fold_scale_axis(func)
158
159 if cfg.pass_enabled("FoldConstant"):
160 func = ir_pass.fold_constant(func)
161
162 if cfg.pass_enabled("AlterOpLayout"):
163 func = ir_pass.infer_type(func)
164 func = ir_pass.canonicalize_ops(func)
165 func = ir_pass.infer_type(func)
166 func = ir_pass.alter_op_layout(func)
167
168 return func
169
170
171 def build(func,
172 target=None,
173 target_host=None,
174 params=None):
175 """Build a function to run on TVM graph runtime.
176
177 Parameters
178 ----------
179 func: relay.Function
180 The function to build.
181
182 target : str or :any:`tvm.target.Target`, optional
183 The build target
184
185 target_host : str or :any:`tvm.target.Target` optional
186 Host compilation target, if target is device.
187 When TVM compiles device specific program such as CUDA,
188 we also need host(CPU) side code to interact with the driver
189 setup the dimensions and parameters correctly.
190 target_host is used to specify the host side codegen target.
191 By default, llvm is used if it is enabled,
192 otherwise a stackvm intepreter is used.
193
194 params : dict of str to NDArray
195 Input parameters to the graph that do not change
196 during inference time. Used for constant folding.
197
198 Returns
199 -------
200 graph_json : str
201 The json string that can be accepted by graph runtime.
202
203 mod : tvm.Module
204 The module containing necessary libraries.
205
206 params : dict
207 The parameters of the final graph.
208 """
209 target = target if target else _target.current_target()
210 if target is None:
211 raise ValueError("Target is not set in env or passed as argument.")
212 target = _target.create(target)
213
214 # If current dispatch context is fallback context (the default root context),
215 # then load pre-tuned parameters from TopHub
216 if isinstance(autotvm.DispatchContext.current, autotvm.FallbackContext):
217 tophub_context = autotvm.tophub.context(target)
218 else:
219 tophub_context = autotvm.util.EmptyContext()
220
221 cfg = BuildConfig.current
222
223 with tophub_context:
224 func = optimize(func, params)
225 # Fuse ops before running code gen
226 func = ir_pass.infer_type(func)
227 func = ir_pass.fuse_ops(func, cfg.opt_level)
228 # Graph code generation
229 func = ir_pass.infer_type(func)
230 graph_gen = _graph_gen.GraphRuntimeCodegen(mod=None, target=target)
231 graph_json, lowered_funcs, params = graph_gen.codegen(func)
232 mod = _tvm_build_module(lowered_funcs, target=target, target_host=target_host)
233 return graph_json, mod, params
234
235
236 class GraphExecutor(_interpreter.Executor):
237 """Wrapper around Executor interface.
238
239 This executor is used for debug and testing purpoes.
240
241 Parameters
242 ----------
243 mod : :py:class:`~tvm.relay.module.Module`
244 The module to support the execution.
245
246 ctx : :py:class:`TVMContext`
247 The runtime context to run the code on.
248
249 target : :py:class:`Target`
250 The target option to build the function.
251 """
252 def __init__(self, mod, ctx, target):
253 self.mod = mod
254 self.ctx = ctx
255 self.target = target
256
257 def _make_executor(self, func):
258 graph_json, mod, params = build(func, target=self.target)
259 gmodule = _graph_rt.create(graph_json, mod, self.ctx)
260 if params:
261 gmodule.set_input(*params)
262 def _graph_wrapper(*args):
263 # Create map of inputs.
264 for i, arg in enumerate(args):
265 gmodule.set_input(i, arg)
266 # Run the module, and fetch the output.
267 gmodule.run()
268 # make a copy so multiple invocation won't hurt perf.
269 return gmodule.get_output(0).copyto(_nd.cpu(0))
270
271 return _graph_wrapper
272
273
274 def create_executor(kind="debug",
275 mod=None,
276 ctx=None,
277 target="llvm"):
278 """Factory function to create an executor.
279
280 Parameters
281 ----------
282 kind : str
283 The type of executor
284
285 mod : :py:class:`~tvm.relay.module.Module`
286 The Relay module containing collection of functions
287
288 ctx : :py:class:`tvm.TVMContext`
289 The context to execute the code.
290
291 target : :py:class:`tvm.Target`
292 The corresponding context
293 """
294 if ctx is not None:
295 assert ctx.device_type == _nd.context(str(target), 0).device_type
296 else:
297 ctx = _nd.context(str(target), 0)
298
299 if isinstance(target, str):
300 target = _target.create(target)
301 if kind == "debug":
302 return _interpreter.Interpreter(mod, ctx, target)
303 elif kind == "graph":
304 return GraphExecutor(mod, ctx, target)
305 else:
306 raise RuntimeError("unknown mode {0}".format(mode))
307
[end of python/tvm/relay/build_module.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/python/tvm/relay/build_module.py b/python/tvm/relay/build_module.py
--- a/python/tvm/relay/build_module.py
+++ b/python/tvm/relay/build_module.py
@@ -150,13 +150,14 @@
func = ir_pass.infer_type(func)
func = ir_pass.combine_parallel_conv2d(func)
+ if cfg.pass_enabled("FoldConstant"):
+ func = ir_pass.fold_constant(func)
+
if cfg.pass_enabled("FoldScaleAxis"):
func = ir_pass.infer_type(func)
func = ir_pass.backward_fold_scale_axis(func)
func = ir_pass.infer_type(func)
func = ir_pass.forward_fold_scale_axis(func)
-
- if cfg.pass_enabled("FoldConstant"):
func = ir_pass.fold_constant(func)
if cfg.pass_enabled("AlterOpLayout"):
| {"golden_diff": "diff --git a/python/tvm/relay/build_module.py b/python/tvm/relay/build_module.py\n--- a/python/tvm/relay/build_module.py\n+++ b/python/tvm/relay/build_module.py\n@@ -150,13 +150,14 @@\n func = ir_pass.infer_type(func)\n func = ir_pass.combine_parallel_conv2d(func)\n \n+ if cfg.pass_enabled(\"FoldConstant\"):\n+ func = ir_pass.fold_constant(func)\n+\n if cfg.pass_enabled(\"FoldScaleAxis\"):\n func = ir_pass.infer_type(func)\n func = ir_pass.backward_fold_scale_axis(func)\n func = ir_pass.infer_type(func)\n func = ir_pass.forward_fold_scale_axis(func)\n-\n- if cfg.pass_enabled(\"FoldConstant\"):\n func = ir_pass.fold_constant(func)\n \n if cfg.pass_enabled(\"AlterOpLayout\"):\n", "issue": "[RELAY][PASS] Check Positiveness in FoldScaleAxis\nThis issue is bought up by @merrymercy . So far FoldScaleAxis is able to pass through functions like relu. However, this is only true if the scaling factor is all positive number -- we didn't encounter this problem so far because most networks only have scaling coming from BN and the result is positive constant. \r\n\r\nWe should update the pass by running the following thing:\r\n- Do constant folding before running FoldScaleAxis\r\n- Check positiveness of the scale(since scale is constant it is not hard to do so)\r\n- Only allow passing relu through if the scale is positive.\r\n\n", "before_files": [{"content": "\"\"\"\nConstruct the necessary state for the TVM graph runtime\nfrom a Relay expression.\n\"\"\"\nfrom ..build_module import build as _tvm_build_module\nfrom .. import nd as _nd, target as _target, autotvm\nfrom ..contrib import graph_runtime as _graph_rt\nfrom . import ir_pass\nfrom . import expr\nfrom .backend import interpreter as _interpreter\nfrom .backend import graph_runtime_codegen as _graph_gen\n\n# List of optimization pass and level when switch on\nOPT_PASS_LEVEL = {\n \"SimplifyInference\": 0,\n \"OpFusion\": 1,\n \"FoldConstant\": 2,\n \"CombineParallelConv2D\": 3,\n \"FoldScaleAxis\": 3,\n \"AlterOpLayout\": 3,\n}\n\nclass BuildConfig(object):\n \"\"\"Configuration scope to set a build config option.\n\n Parameters\n ----------\n kwargs\n Keyword arguments of configurations to set.\n \"\"\"\n current = None\n defaults = {\n \"opt_level\": 2,\n \"add_pass\": None,\n }\n def __init__(self, **kwargs):\n self._old_scope = None\n for k, _ in kwargs.items():\n if k not in BuildConfig.defaults:\n raise ValueError(\n \"invalid argument %s, candidates are %s\" % (k, BuildConfig.defaults.keys()))\n self._attr = kwargs\n\n def __getattr__(self, name):\n if name not in self._attr:\n return BuildConfig.defaults[name]\n return self._attr[name]\n\n def __enter__(self):\n # pylint: disable=protected-access\n self._old_scope = BuildConfig.current\n attr = BuildConfig.current._attr.copy()\n attr.update(self._attr)\n self._attr = attr\n BuildConfig.current = self\n return self\n\n def __exit__(self, ptype, value, trace):\n assert self._old_scope\n BuildConfig.current = self._old_scope\n\n def pass_enabled(self, pass_name):\n \"\"\"Get whether pass is enabled.\n\n Parameters\n ----------\n pass_name : str\n The optimization pass name\n\n Returns\n -------\n enabled : bool\n Whether pass is enabled.\n \"\"\"\n if self.add_pass and pass_name in self.add_pass:\n return True\n return self.opt_level >= OPT_PASS_LEVEL[pass_name]\n\n\nBuildConfig.current = BuildConfig()\n\n\ndef build_config(**kwargs):\n \"\"\"Configure the build behavior by setting config variables.\n\n Parameters\n ----------\n opt_level: int, default=2\n Optimization level. See OPT_PASS_LEVEL for level of each pass.\n\n add_pass: set of str\n Optimization pass to be added regardless of optimization level.\n\n Returns\n -------\n config: BuildConfig\n The build configuration\n \"\"\"\n return BuildConfig(**kwargs)\n\n\ndef _bind_params_by_name(func, params):\n \"\"\"Bind parameters of function by its name.\"\"\"\n name_dict = {}\n for arg in func.params:\n name = arg.name_hint\n if name in name_dict:\n name_dict[name] = None\n else:\n name_dict[name] = arg\n bind_dict = {}\n for k, v in params.items():\n if k not in name_dict:\n continue\n arg = name_dict[k]\n if arg is None:\n raise ValueError(\"Multiple args in the function have name %s\" % k)\n bind_dict[arg] = expr.const(v)\n return expr.bind(func, bind_dict)\n\n\ndef optimize(func, params=None):\n \"\"\"Perform target invariant optimizations.\n\n Parameters\n ----------\n func : tvm.relay.Function\n The input to optimization.\n\n params : Optional[Dict[str, tvm.nd.NDArray]]\n Input parameters to the graph that do not change\n during inference time. used for constant folding.\n\n Returns\n -------\n opt_func : tvm.relay.Function\n The optimized version of the function.\n \"\"\"\n cfg = BuildConfig.current\n\n # bind expressions\n if params:\n func = _bind_params_by_name(func, params)\n\n if cfg.pass_enabled(\"SimplifyInference\"):\n func = ir_pass.infer_type(func)\n func = ir_pass.simplify_inference(func)\n\n if cfg.pass_enabled(\"CombineParallelConv2D\"):\n func = ir_pass.infer_type(func)\n func = ir_pass.combine_parallel_conv2d(func)\n\n if cfg.pass_enabled(\"FoldScaleAxis\"):\n func = ir_pass.infer_type(func)\n func = ir_pass.backward_fold_scale_axis(func)\n func = ir_pass.infer_type(func)\n func = ir_pass.forward_fold_scale_axis(func)\n\n if cfg.pass_enabled(\"FoldConstant\"):\n func = ir_pass.fold_constant(func)\n\n if cfg.pass_enabled(\"AlterOpLayout\"):\n func = ir_pass.infer_type(func)\n func = ir_pass.canonicalize_ops(func)\n func = ir_pass.infer_type(func)\n func = ir_pass.alter_op_layout(func)\n\n return func\n\n\ndef build(func,\n target=None,\n target_host=None,\n params=None):\n \"\"\"Build a function to run on TVM graph runtime.\n\n Parameters\n ----------\n func: relay.Function\n The function to build.\n\n target : str or :any:`tvm.target.Target`, optional\n The build target\n\n target_host : str or :any:`tvm.target.Target` optional\n Host compilation target, if target is device.\n When TVM compiles device specific program such as CUDA,\n we also need host(CPU) side code to interact with the driver\n setup the dimensions and parameters correctly.\n target_host is used to specify the host side codegen target.\n By default, llvm is used if it is enabled,\n otherwise a stackvm intepreter is used.\n\n params : dict of str to NDArray\n Input parameters to the graph that do not change\n during inference time. Used for constant folding.\n\n Returns\n -------\n graph_json : str\n The json string that can be accepted by graph runtime.\n\n mod : tvm.Module\n The module containing necessary libraries.\n\n params : dict\n The parameters of the final graph.\n \"\"\"\n target = target if target else _target.current_target()\n if target is None:\n raise ValueError(\"Target is not set in env or passed as argument.\")\n target = _target.create(target)\n\n # If current dispatch context is fallback context (the default root context),\n # then load pre-tuned parameters from TopHub\n if isinstance(autotvm.DispatchContext.current, autotvm.FallbackContext):\n tophub_context = autotvm.tophub.context(target)\n else:\n tophub_context = autotvm.util.EmptyContext()\n\n cfg = BuildConfig.current\n\n with tophub_context:\n func = optimize(func, params)\n # Fuse ops before running code gen\n func = ir_pass.infer_type(func)\n func = ir_pass.fuse_ops(func, cfg.opt_level)\n # Graph code generation\n func = ir_pass.infer_type(func)\n graph_gen = _graph_gen.GraphRuntimeCodegen(mod=None, target=target)\n graph_json, lowered_funcs, params = graph_gen.codegen(func)\n mod = _tvm_build_module(lowered_funcs, target=target, target_host=target_host)\n return graph_json, mod, params\n\n\nclass GraphExecutor(_interpreter.Executor):\n \"\"\"Wrapper around Executor interface.\n\n This executor is used for debug and testing purpoes.\n\n Parameters\n ----------\n mod : :py:class:`~tvm.relay.module.Module`\n The module to support the execution.\n\n ctx : :py:class:`TVMContext`\n The runtime context to run the code on.\n\n target : :py:class:`Target`\n The target option to build the function.\n \"\"\"\n def __init__(self, mod, ctx, target):\n self.mod = mod\n self.ctx = ctx\n self.target = target\n\n def _make_executor(self, func):\n graph_json, mod, params = build(func, target=self.target)\n gmodule = _graph_rt.create(graph_json, mod, self.ctx)\n if params:\n gmodule.set_input(*params)\n def _graph_wrapper(*args):\n # Create map of inputs.\n for i, arg in enumerate(args):\n gmodule.set_input(i, arg)\n # Run the module, and fetch the output.\n gmodule.run()\n # make a copy so multiple invocation won't hurt perf.\n return gmodule.get_output(0).copyto(_nd.cpu(0))\n\n return _graph_wrapper\n\n\ndef create_executor(kind=\"debug\",\n mod=None,\n ctx=None,\n target=\"llvm\"):\n \"\"\"Factory function to create an executor.\n\n Parameters\n ----------\n kind : str\n The type of executor\n\n mod : :py:class:`~tvm.relay.module.Module`\n The Relay module containing collection of functions\n\n ctx : :py:class:`tvm.TVMContext`\n The context to execute the code.\n\n target : :py:class:`tvm.Target`\n The corresponding context\n \"\"\"\n if ctx is not None:\n assert ctx.device_type == _nd.context(str(target), 0).device_type\n else:\n ctx = _nd.context(str(target), 0)\n\n if isinstance(target, str):\n target = _target.create(target)\n if kind == \"debug\":\n return _interpreter.Interpreter(mod, ctx, target)\n elif kind == \"graph\":\n return GraphExecutor(mod, ctx, target)\n else:\n raise RuntimeError(\"unknown mode {0}\".format(mode))\n", "path": "python/tvm/relay/build_module.py"}]} | 3,572 | 187 |
gh_patches_debug_618 | rasdani/github-patches | git_diff | Bitmessage__PyBitmessage-1387 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Better logging
Using the built-in python logging module I've made various log levels possible and made the creation of a log file a matter of changing the configuration in debug.py. The python logging module is thread-safe so we can safely replace all `print` calls with calls to `logger`. I only replaced some of them mainly to test the configuration (and there are a lot of `print` calls)
There are some commits in my merge that mention translation files, I'm working on that but didn't mean to include them in this merge. I deleted them but the commit history is already there.
</issue>
<code>
[start of checkdeps.py]
1 #!/usr/bin/env python2
2 """
3 Check dependendies and give recommendations about how to satisfy them
4
5 Limitations:
6
7 * Does not detect whether packages are already installed. Solving this requires writing more of a configuration
8 management system. Or we could switch to an existing one.
9 * Not fully PEP508 compliant. Not slightly. It makes bold assumptions about the simplicity of the contents of
10 EXTRAS_REQUIRE. This is fine because most developers do, too.
11 """
12
13 import os
14 import sys
15 from distutils.errors import CompileError
16 try:
17 from setuptools.dist import Distribution
18 from setuptools.extension import Extension
19 from setuptools.command.build_ext import build_ext
20 HAVE_SETUPTOOLS = True
21 # another import from setuptools is in setup.py
22 from setup import EXTRAS_REQUIRE
23 except ImportError:
24 HAVE_SETUPTOOLS = False
25 EXTRAS_REQUIRE = []
26
27 from importlib import import_module
28
29 from src.depends import detectOS, PACKAGES, PACKAGE_MANAGER
30
31
32 COMPILING = {
33 "Debian": "build-essential libssl-dev",
34 "Ubuntu": "build-essential libssl-dev",
35 "Fedora": "gcc-c++ redhat-rpm-config python-devel openssl-devel",
36 "openSUSE": "gcc-c++ libopenssl-devel python-devel",
37 "optional": False,
38 }
39
40 # OS-specific dependencies for optional components listed in EXTRAS_REQUIRE
41 EXTRAS_REQUIRE_DEPS = {
42 # The values from setup.EXTRAS_REQUIRE
43 'python_prctl': {
44 # The packages needed for this requirement, by OS
45 "OpenBSD": [""],
46 "FreeBSD": [""],
47 "Debian": ["libcap-dev python-prctl"],
48 "Ubuntu": ["libcap-dev python-prctl"],
49 "Ubuntu 12": ["libcap-dev python-prctl"],
50 "openSUSE": [""],
51 "Fedora": ["prctl"],
52 "Guix": [""],
53 "Gentoo": ["dev-python/python-prctl"],
54 },
55 }
56
57
58 def detectPrereqs(missing=True):
59 available = []
60 for module in PACKAGES:
61 try:
62 import_module(module)
63 if not missing:
64 available.append(module)
65 except ImportError:
66 if missing:
67 available.append(module)
68 return available
69
70
71 def prereqToPackages():
72 if not detectPrereqs():
73 return
74 print("%s %s" % (
75 PACKAGE_MANAGER[detectOS()], " ".join(
76 PACKAGES[x][detectOS()] for x in detectPrereqs())))
77
78
79 def compilerToPackages():
80 if not detectOS() in COMPILING:
81 return
82 print("%s %s" % (
83 PACKAGE_MANAGER[detectOS.result], COMPILING[detectOS.result]))
84
85
86 def testCompiler():
87 if not HAVE_SETUPTOOLS:
88 # silent, we can't test without setuptools
89 return True
90
91 bitmsghash = Extension(
92 'bitmsghash',
93 sources=['src/bitmsghash/bitmsghash.cpp'],
94 libraries=['pthread', 'crypto'],
95 )
96
97 dist = Distribution()
98 dist.ext_modules = [bitmsghash]
99 cmd = build_ext(dist)
100 cmd.initialize_options()
101 cmd.finalize_options()
102 cmd.force = True
103 try:
104 cmd.run()
105 except CompileError:
106 return False
107 else:
108 fullPath = os.path.join(cmd.build_lib, cmd.get_ext_filename("bitmsghash"))
109 return os.path.isfile(fullPath)
110
111
112 prereqs = detectPrereqs()
113 compiler = testCompiler()
114
115 if (not compiler or prereqs) and detectOS() in PACKAGE_MANAGER:
116 print(
117 "It looks like you're using %s. "
118 "It is highly recommended to use the package manager\n"
119 "to install the missing dependencies." % detectOS.result)
120
121 if not compiler:
122 print(
123 "Building the bitmsghash module failed.\n"
124 "You may be missing a C++ compiler and/or the OpenSSL headers.")
125
126 if prereqs:
127 mandatory = [x for x in prereqs if not PACKAGES[x].get("optional")]
128 optional = [x for x in prereqs if PACKAGES[x].get("optional")]
129 if mandatory:
130 print("Missing mandatory dependencies: %s" % " ".join(mandatory))
131 if optional:
132 print("Missing optional dependencies: %s" % " ".join(optional))
133 for package in optional:
134 print(PACKAGES[package].get('description'))
135
136 # Install the system dependencies of optional extras_require components
137 OPSYS = detectOS()
138 CMD = PACKAGE_MANAGER[OPSYS] if OPSYS in PACKAGE_MANAGER else 'UNKNOWN_INSTALLER'
139 for lhs, rhs in EXTRAS_REQUIRE.items():
140 if OPSYS is None:
141 break
142 if rhs and any([
143 EXTRAS_REQUIRE_DEPS[x][OPSYS]
144 for x in rhs
145 if x in EXTRAS_REQUIRE_DEPS
146 ]):
147 rhs_cmd = ''.join([
148 CMD,
149 ' ',
150 ' '.join([
151 ''. join([
152 xx for xx in EXTRAS_REQUIRE_DEPS[x][OPSYS]
153 ])
154 for x in rhs
155 if x in EXTRAS_REQUIRE_DEPS
156 ]),
157 ])
158 print(
159 "Optional dependency `pip install .[{}]` would require `{}`"
160 " to be run as root".format(lhs, rhs_cmd))
161
162 if (not compiler or prereqs) and OPSYS in PACKAGE_MANAGER:
163 print("You can install the missing dependencies by running, as root:")
164 if not compiler:
165 compilerToPackages()
166 prereqToPackages()
167 if mandatory:
168 sys.exit(1)
169 else:
170 print("All the dependencies satisfied, you can install PyBitmessage")
171
[end of checkdeps.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/checkdeps.py b/checkdeps.py
--- a/checkdeps.py
+++ b/checkdeps.py
@@ -22,7 +22,7 @@
from setup import EXTRAS_REQUIRE
except ImportError:
HAVE_SETUPTOOLS = False
- EXTRAS_REQUIRE = []
+ EXTRAS_REQUIRE = {}
from importlib import import_module
| {"golden_diff": "diff --git a/checkdeps.py b/checkdeps.py\n--- a/checkdeps.py\n+++ b/checkdeps.py\n@@ -22,7 +22,7 @@\n from setup import EXTRAS_REQUIRE\n except ImportError:\n HAVE_SETUPTOOLS = False\n- EXTRAS_REQUIRE = []\n+ EXTRAS_REQUIRE = {}\n \n from importlib import import_module\n", "issue": "Better logging\nUsing the built-in python logging module I've made various log levels possible and made the creation of a log file a matter of changing the configuration in debug.py. The python logging module is thread-safe so we can safely replace all `print` calls with calls to `logger`. I only replaced some of them mainly to test the configuration (and there are a lot of `print` calls)\n\nThere are some commits in my merge that mention translation files, I'm working on that but didn't mean to include them in this merge. I deleted them but the commit history is already there.\n\n", "before_files": [{"content": "#!/usr/bin/env python2\n\"\"\"\nCheck dependendies and give recommendations about how to satisfy them\n\nLimitations:\n\n * Does not detect whether packages are already installed. Solving this requires writing more of a configuration\n management system. Or we could switch to an existing one.\n * Not fully PEP508 compliant. Not slightly. It makes bold assumptions about the simplicity of the contents of\n EXTRAS_REQUIRE. This is fine because most developers do, too.\n\"\"\"\n\nimport os\nimport sys\nfrom distutils.errors import CompileError\ntry:\n from setuptools.dist import Distribution\n from setuptools.extension import Extension\n from setuptools.command.build_ext import build_ext\n HAVE_SETUPTOOLS = True\n # another import from setuptools is in setup.py\n from setup import EXTRAS_REQUIRE\nexcept ImportError:\n HAVE_SETUPTOOLS = False\n EXTRAS_REQUIRE = []\n\nfrom importlib import import_module\n\nfrom src.depends import detectOS, PACKAGES, PACKAGE_MANAGER\n\n\nCOMPILING = {\n \"Debian\": \"build-essential libssl-dev\",\n \"Ubuntu\": \"build-essential libssl-dev\",\n \"Fedora\": \"gcc-c++ redhat-rpm-config python-devel openssl-devel\",\n \"openSUSE\": \"gcc-c++ libopenssl-devel python-devel\",\n \"optional\": False,\n}\n\n# OS-specific dependencies for optional components listed in EXTRAS_REQUIRE\nEXTRAS_REQUIRE_DEPS = {\n # The values from setup.EXTRAS_REQUIRE\n 'python_prctl': {\n # The packages needed for this requirement, by OS\n \"OpenBSD\": [\"\"],\n \"FreeBSD\": [\"\"],\n \"Debian\": [\"libcap-dev python-prctl\"],\n \"Ubuntu\": [\"libcap-dev python-prctl\"],\n \"Ubuntu 12\": [\"libcap-dev python-prctl\"],\n \"openSUSE\": [\"\"],\n \"Fedora\": [\"prctl\"],\n \"Guix\": [\"\"],\n \"Gentoo\": [\"dev-python/python-prctl\"],\n },\n}\n\n\ndef detectPrereqs(missing=True):\n available = []\n for module in PACKAGES:\n try:\n import_module(module)\n if not missing:\n available.append(module)\n except ImportError:\n if missing:\n available.append(module)\n return available\n\n\ndef prereqToPackages():\n if not detectPrereqs():\n return\n print(\"%s %s\" % (\n PACKAGE_MANAGER[detectOS()], \" \".join(\n PACKAGES[x][detectOS()] for x in detectPrereqs())))\n\n\ndef compilerToPackages():\n if not detectOS() in COMPILING:\n return\n print(\"%s %s\" % (\n PACKAGE_MANAGER[detectOS.result], COMPILING[detectOS.result]))\n\n\ndef testCompiler():\n if not HAVE_SETUPTOOLS:\n # silent, we can't test without setuptools\n return True\n\n bitmsghash = Extension(\n 'bitmsghash',\n sources=['src/bitmsghash/bitmsghash.cpp'],\n libraries=['pthread', 'crypto'],\n )\n\n dist = Distribution()\n dist.ext_modules = [bitmsghash]\n cmd = build_ext(dist)\n cmd.initialize_options()\n cmd.finalize_options()\n cmd.force = True\n try:\n cmd.run()\n except CompileError:\n return False\n else:\n fullPath = os.path.join(cmd.build_lib, cmd.get_ext_filename(\"bitmsghash\"))\n return os.path.isfile(fullPath)\n\n\nprereqs = detectPrereqs()\ncompiler = testCompiler()\n\nif (not compiler or prereqs) and detectOS() in PACKAGE_MANAGER:\n print(\n \"It looks like you're using %s. \"\n \"It is highly recommended to use the package manager\\n\"\n \"to install the missing dependencies.\" % detectOS.result)\n\nif not compiler:\n print(\n \"Building the bitmsghash module failed.\\n\"\n \"You may be missing a C++ compiler and/or the OpenSSL headers.\")\n\nif prereqs:\n mandatory = [x for x in prereqs if not PACKAGES[x].get(\"optional\")]\n optional = [x for x in prereqs if PACKAGES[x].get(\"optional\")]\n if mandatory:\n print(\"Missing mandatory dependencies: %s\" % \" \".join(mandatory))\n if optional:\n print(\"Missing optional dependencies: %s\" % \" \".join(optional))\n for package in optional:\n print(PACKAGES[package].get('description'))\n\n# Install the system dependencies of optional extras_require components\nOPSYS = detectOS()\nCMD = PACKAGE_MANAGER[OPSYS] if OPSYS in PACKAGE_MANAGER else 'UNKNOWN_INSTALLER'\nfor lhs, rhs in EXTRAS_REQUIRE.items():\n if OPSYS is None:\n break\n if rhs and any([\n EXTRAS_REQUIRE_DEPS[x][OPSYS]\n for x in rhs\n if x in EXTRAS_REQUIRE_DEPS\n ]):\n rhs_cmd = ''.join([\n CMD,\n ' ',\n ' '.join([\n ''. join([\n xx for xx in EXTRAS_REQUIRE_DEPS[x][OPSYS]\n ])\n for x in rhs\n if x in EXTRAS_REQUIRE_DEPS\n ]),\n ])\n print(\n \"Optional dependency `pip install .[{}]` would require `{}`\"\n \" to be run as root\".format(lhs, rhs_cmd))\n\nif (not compiler or prereqs) and OPSYS in PACKAGE_MANAGER:\n print(\"You can install the missing dependencies by running, as root:\")\n if not compiler:\n compilerToPackages()\n prereqToPackages()\n if mandatory:\n sys.exit(1)\nelse:\n print(\"All the dependencies satisfied, you can install PyBitmessage\")\n", "path": "checkdeps.py"}]} | 2,291 | 82 |
gh_patches_debug_15985 | rasdani/github-patches | git_diff | pytorch__text-745 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Use "cpu" instead of None for representing device
I think using device value as `cpu` instead of `None` will make `Iterator` class compatible with PyTorch device types [1] i.e., "cpu" and "gpu".
[1] https://pytorch.org/docs/stable/tensor_attributes.html
</issue>
<code>
[start of torchtext/data/iterator.py]
1 import math
2 import random
3
4 import logging
5
6 from .utils import RandomShuffler
7 from .batch import Batch
8 from .dataset import Dataset
9
10 logger = logging.getLogger(__name__)
11
12
13 class Iterator(object):
14 """Defines an iterator that loads batches of data from a Dataset.
15
16 Attributes:
17 dataset: The Dataset object to load Examples from.
18 batch_size: Batch size.
19 batch_size_fn: Function of three arguments (new example to add, current
20 count of examples in the batch, and current effective batch size)
21 that returns the new effective batch size resulting from adding
22 that example to a batch. This is useful for dynamic batching, where
23 this function would add to the current effective batch size the
24 number of tokens in the new example.
25 sort_key: A key to use for sorting examples in order to batch together
26 examples with similar lengths and minimize padding. The sort_key
27 provided to the Iterator constructor overrides the sort_key
28 attribute of the Dataset, or defers to it if None.
29 train: Whether the iterator represents a train set.
30 repeat: Whether to repeat the iterator for multiple epochs. Default: False.
31 shuffle: Whether to shuffle examples between epochs.
32 sort: Whether to sort examples according to self.sort_key.
33 Note that shuffle and sort default to train and (not train).
34 sort_within_batch: Whether to sort (in descending order according to
35 self.sort_key) within each batch. If None, defaults to self.sort.
36 If self.sort is True and this is False, the batch is left in the
37 original (ascending) sorted order.
38 device (str or `torch.device`): A string or instance of `torch.device`
39 specifying which device the Variables are going to be created on.
40 If left as default, the tensors will be created on cpu. Default: None.
41 """
42
43 def __init__(self, dataset, batch_size, sort_key=None, device=None,
44 batch_size_fn=None, train=True,
45 repeat=False, shuffle=None, sort=None,
46 sort_within_batch=None):
47 self.batch_size, self.train, self.dataset = batch_size, train, dataset
48 self.batch_size_fn = batch_size_fn
49 self.iterations = 0
50 self.repeat = repeat
51 self.shuffle = train if shuffle is None else shuffle
52 self.sort = not train if sort is None else sort
53
54 if sort_within_batch is None:
55 self.sort_within_batch = self.sort
56 else:
57 self.sort_within_batch = sort_within_batch
58 if sort_key is None:
59 self.sort_key = dataset.sort_key
60 else:
61 self.sort_key = sort_key
62
63 if isinstance(device, int):
64 logger.warning("The `device` argument should be set by using `torch.device`"
65 + " or passing a string as an argument. This behavior will be"
66 + " deprecated soon and currently defaults to cpu.")
67 device = None
68 self.device = device
69 self.random_shuffler = RandomShuffler()
70
71 # For state loading/saving only
72 self._iterations_this_epoch = 0
73 self._random_state_this_epoch = None
74 self._restored_from_state = False
75
76 @classmethod
77 def splits(cls, datasets, batch_sizes=None, **kwargs):
78 """Create Iterator objects for multiple splits of a dataset.
79
80 Arguments:
81 datasets: Tuple of Dataset objects corresponding to the splits. The
82 first such object should be the train set.
83 batch_sizes: Tuple of batch sizes to use for the different splits,
84 or None to use the same batch_size for all splits.
85 Remaining keyword arguments: Passed to the constructor of the
86 iterator class being used.
87 """
88 if batch_sizes is None:
89 batch_sizes = [kwargs.pop('batch_size')] * len(datasets)
90 ret = []
91 for i in range(len(datasets)):
92 train = i == 0
93 ret.append(cls(
94 datasets[i], batch_size=batch_sizes[i], train=train, **kwargs))
95 return tuple(ret)
96
97 def data(self):
98 """Return the examples in the dataset in order, sorted, or shuffled."""
99 if self.sort:
100 xs = sorted(self.dataset, key=self.sort_key)
101 elif self.shuffle:
102 xs = [self.dataset[i] for i in self.random_shuffler(range(len(self.dataset)))]
103 else:
104 xs = self.dataset
105 return xs
106
107 def init_epoch(self):
108 """Set up the batch generator for a new epoch."""
109
110 if self._restored_from_state:
111 self.random_shuffler.random_state = self._random_state_this_epoch
112 else:
113 self._random_state_this_epoch = self.random_shuffler.random_state
114
115 self.create_batches()
116
117 if self._restored_from_state:
118 self._restored_from_state = False
119 else:
120 self._iterations_this_epoch = 0
121
122 if not self.repeat:
123 self.iterations = 0
124
125 def create_batches(self):
126 self.batches = batch(self.data(), self.batch_size, self.batch_size_fn)
127
128 @property
129 def epoch(self):
130 return math.floor(self.iterations / len(self))
131
132 def __len__(self):
133 if self.batch_size_fn is not None:
134 raise NotImplementedError
135 return math.ceil(len(self.dataset) / self.batch_size)
136
137 def __iter__(self):
138 while True:
139 self.init_epoch()
140 for idx, minibatch in enumerate(self.batches):
141 # fast-forward if loaded from state
142 if self._iterations_this_epoch > idx:
143 continue
144 self.iterations += 1
145 self._iterations_this_epoch += 1
146 if self.sort_within_batch:
147 # NOTE: `rnn.pack_padded_sequence` requires that a minibatch
148 # be sorted by decreasing order, which requires reversing
149 # relative to typical sort keys
150 if self.sort:
151 minibatch.reverse()
152 else:
153 minibatch.sort(key=self.sort_key, reverse=True)
154 yield Batch(minibatch, self.dataset, self.device)
155 if not self.repeat:
156 return
157
158 def state_dict(self):
159 return {
160 "iterations": self.iterations,
161 "iterations_this_epoch": self._iterations_this_epoch,
162 "random_state_this_epoch": self._random_state_this_epoch}
163
164 def load_state_dict(self, state_dict):
165 self.iterations = state_dict["iterations"]
166 self._iterations_this_epoch = state_dict["iterations_this_epoch"]
167 self._random_state_this_epoch = state_dict["random_state_this_epoch"]
168 self._restored_from_state = True
169
170
171 class BPTTIterator(Iterator):
172 """Defines an iterator for language modeling tasks that use BPTT.
173
174 Provides contiguous streams of examples together with targets that are
175 one timestep further forward, for language modeling training with
176 backpropagation through time (BPTT). Expects a Dataset with a single
177 example and a single field called 'text' and produces Batches with text and
178 target attributes.
179
180 Attributes:
181 dataset: The Dataset object to load Examples from.
182 batch_size: Batch size.
183 bptt_len: Length of sequences for backpropagation through time.
184 sort_key: A key to use for sorting examples in order to batch together
185 examples with similar lengths and minimize padding. The sort_key
186 provided to the Iterator constructor overrides the sort_key
187 attribute of the Dataset, or defers to it if None.
188 train: Whether the iterator represents a train set.
189 repeat: Whether to repeat the iterator for multiple epochs. Default: False.
190 shuffle: Whether to shuffle examples between epochs.
191 sort: Whether to sort examples according to self.sort_key.
192 Note that shuffle and sort default to train and (not train).
193 device (str or torch.device): A string or instance of `torch.device`
194 specifying which device the Variables are going to be created on.
195 If left as default, the tensors will be created on cpu. Default: None.
196 """
197
198 def __init__(self, dataset, batch_size, bptt_len, **kwargs):
199 self.bptt_len = bptt_len
200 super(BPTTIterator, self).__init__(dataset, batch_size, **kwargs)
201
202 def __len__(self):
203 return math.ceil((len(self.dataset[0].text) / self.batch_size - 1)
204 / self.bptt_len)
205
206 def __iter__(self):
207 text = self.dataset[0].text
208 TEXT = self.dataset.fields['text']
209 TEXT.eos_token = None
210 text = text + ([TEXT.pad_token] * int(math.ceil(len(text) / self.batch_size)
211 * self.batch_size - len(text)))
212 data = TEXT.numericalize(
213 [text], device=self.device)
214 data = data.view(self.batch_size, -1).t().contiguous()
215 dataset = Dataset(examples=self.dataset.examples, fields=[
216 ('text', TEXT), ('target', TEXT)])
217 while True:
218 for i in range(0, len(self) * self.bptt_len, self.bptt_len):
219 self.iterations += 1
220 seq_len = min(self.bptt_len, len(data) - i - 1)
221 batch_text = data[i:i + seq_len]
222 batch_target = data[i + 1:i + 1 + seq_len]
223 if TEXT.batch_first:
224 batch_text = batch_text.t().contiguous()
225 batch_target = batch_target.t().contiguous()
226 yield Batch.fromvars(
227 dataset, self.batch_size,
228 text=batch_text,
229 target=batch_target)
230 if not self.repeat:
231 return
232
233
234 class BucketIterator(Iterator):
235 """Defines an iterator that batches examples of similar lengths together.
236
237 Minimizes amount of padding needed while producing freshly shuffled
238 batches for each new epoch. See pool for the bucketing procedure used.
239 """
240
241 def create_batches(self):
242 if self.sort:
243 self.batches = batch(self.data(), self.batch_size,
244 self.batch_size_fn)
245 else:
246 self.batches = pool(self.data(), self.batch_size,
247 self.sort_key, self.batch_size_fn,
248 random_shuffler=self.random_shuffler,
249 shuffle=self.shuffle,
250 sort_within_batch=self.sort_within_batch)
251
252
253 def batch(data, batch_size, batch_size_fn=None):
254 """Yield elements from data in chunks of batch_size."""
255 if batch_size_fn is None:
256 def batch_size_fn(new, count, sofar):
257 return count
258 minibatch, size_so_far = [], 0
259 for ex in data:
260 minibatch.append(ex)
261 size_so_far = batch_size_fn(ex, len(minibatch), size_so_far)
262 if size_so_far == batch_size:
263 yield minibatch
264 minibatch, size_so_far = [], 0
265 elif size_so_far > batch_size:
266 yield minibatch[:-1]
267 minibatch, size_so_far = minibatch[-1:], batch_size_fn(ex, 1, 0)
268 if minibatch:
269 yield minibatch
270
271
272 def pool(data, batch_size, key, batch_size_fn=lambda new, count, sofar: count,
273 random_shuffler=None, shuffle=False, sort_within_batch=False):
274 """Sort within buckets, then batch, then shuffle batches.
275
276 Partitions data into chunks of size 100*batch_size, sorts examples within
277 each chunk using sort_key, then batch these examples and shuffle the
278 batches.
279 """
280 if random_shuffler is None:
281 random_shuffler = random.shuffle
282 for p in batch(data, batch_size * 100, batch_size_fn):
283 p_batch = batch(sorted(p, key=key), batch_size, batch_size_fn) \
284 if sort_within_batch \
285 else batch(p, batch_size, batch_size_fn)
286 if shuffle:
287 for b in random_shuffler(list(p_batch)):
288 yield b
289 else:
290 for b in list(p_batch):
291 yield b
292
[end of torchtext/data/iterator.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/torchtext/data/iterator.py b/torchtext/data/iterator.py
--- a/torchtext/data/iterator.py
+++ b/torchtext/data/iterator.py
@@ -3,6 +3,7 @@
import logging
+import torch
from .utils import RandomShuffler
from .batch import Batch
from .dataset import Dataset
@@ -65,6 +66,12 @@
+ " or passing a string as an argument. This behavior will be"
+ " deprecated soon and currently defaults to cpu.")
device = None
+
+ if device is None:
+ device = torch.device('cpu')
+ elif isinstance(device, str):
+ device = torch.device(device)
+
self.device = device
self.random_shuffler = RandomShuffler()
| {"golden_diff": "diff --git a/torchtext/data/iterator.py b/torchtext/data/iterator.py\n--- a/torchtext/data/iterator.py\n+++ b/torchtext/data/iterator.py\n@@ -3,6 +3,7 @@\n \n import logging\n \n+import torch\n from .utils import RandomShuffler\n from .batch import Batch\n from .dataset import Dataset\n@@ -65,6 +66,12 @@\n + \" or passing a string as an argument. This behavior will be\"\n + \" deprecated soon and currently defaults to cpu.\")\n device = None\n+\n+ if device is None:\n+ device = torch.device('cpu')\n+ elif isinstance(device, str):\n+ device = torch.device(device)\n+\n self.device = device\n self.random_shuffler = RandomShuffler()\n", "issue": "Use \"cpu\" instead of None for representing device\nI think using device value as `cpu` instead of `None` will make `Iterator` class compatible with PyTorch device types [1] i.e., \"cpu\" and \"gpu\". \r\n\r\n[1] https://pytorch.org/docs/stable/tensor_attributes.html \n", "before_files": [{"content": "import math\nimport random\n\nimport logging\n\nfrom .utils import RandomShuffler\nfrom .batch import Batch\nfrom .dataset import Dataset\n\nlogger = logging.getLogger(__name__)\n\n\nclass Iterator(object):\n \"\"\"Defines an iterator that loads batches of data from a Dataset.\n\n Attributes:\n dataset: The Dataset object to load Examples from.\n batch_size: Batch size.\n batch_size_fn: Function of three arguments (new example to add, current\n count of examples in the batch, and current effective batch size)\n that returns the new effective batch size resulting from adding\n that example to a batch. This is useful for dynamic batching, where\n this function would add to the current effective batch size the\n number of tokens in the new example.\n sort_key: A key to use for sorting examples in order to batch together\n examples with similar lengths and minimize padding. The sort_key\n provided to the Iterator constructor overrides the sort_key\n attribute of the Dataset, or defers to it if None.\n train: Whether the iterator represents a train set.\n repeat: Whether to repeat the iterator for multiple epochs. Default: False.\n shuffle: Whether to shuffle examples between epochs.\n sort: Whether to sort examples according to self.sort_key.\n Note that shuffle and sort default to train and (not train).\n sort_within_batch: Whether to sort (in descending order according to\n self.sort_key) within each batch. If None, defaults to self.sort.\n If self.sort is True and this is False, the batch is left in the\n original (ascending) sorted order.\n device (str or `torch.device`): A string or instance of `torch.device`\n specifying which device the Variables are going to be created on.\n If left as default, the tensors will be created on cpu. Default: None.\n \"\"\"\n\n def __init__(self, dataset, batch_size, sort_key=None, device=None,\n batch_size_fn=None, train=True,\n repeat=False, shuffle=None, sort=None,\n sort_within_batch=None):\n self.batch_size, self.train, self.dataset = batch_size, train, dataset\n self.batch_size_fn = batch_size_fn\n self.iterations = 0\n self.repeat = repeat\n self.shuffle = train if shuffle is None else shuffle\n self.sort = not train if sort is None else sort\n\n if sort_within_batch is None:\n self.sort_within_batch = self.sort\n else:\n self.sort_within_batch = sort_within_batch\n if sort_key is None:\n self.sort_key = dataset.sort_key\n else:\n self.sort_key = sort_key\n\n if isinstance(device, int):\n logger.warning(\"The `device` argument should be set by using `torch.device`\"\n + \" or passing a string as an argument. This behavior will be\"\n + \" deprecated soon and currently defaults to cpu.\")\n device = None\n self.device = device\n self.random_shuffler = RandomShuffler()\n\n # For state loading/saving only\n self._iterations_this_epoch = 0\n self._random_state_this_epoch = None\n self._restored_from_state = False\n\n @classmethod\n def splits(cls, datasets, batch_sizes=None, **kwargs):\n \"\"\"Create Iterator objects for multiple splits of a dataset.\n\n Arguments:\n datasets: Tuple of Dataset objects corresponding to the splits. The\n first such object should be the train set.\n batch_sizes: Tuple of batch sizes to use for the different splits,\n or None to use the same batch_size for all splits.\n Remaining keyword arguments: Passed to the constructor of the\n iterator class being used.\n \"\"\"\n if batch_sizes is None:\n batch_sizes = [kwargs.pop('batch_size')] * len(datasets)\n ret = []\n for i in range(len(datasets)):\n train = i == 0\n ret.append(cls(\n datasets[i], batch_size=batch_sizes[i], train=train, **kwargs))\n return tuple(ret)\n\n def data(self):\n \"\"\"Return the examples in the dataset in order, sorted, or shuffled.\"\"\"\n if self.sort:\n xs = sorted(self.dataset, key=self.sort_key)\n elif self.shuffle:\n xs = [self.dataset[i] for i in self.random_shuffler(range(len(self.dataset)))]\n else:\n xs = self.dataset\n return xs\n\n def init_epoch(self):\n \"\"\"Set up the batch generator for a new epoch.\"\"\"\n\n if self._restored_from_state:\n self.random_shuffler.random_state = self._random_state_this_epoch\n else:\n self._random_state_this_epoch = self.random_shuffler.random_state\n\n self.create_batches()\n\n if self._restored_from_state:\n self._restored_from_state = False\n else:\n self._iterations_this_epoch = 0\n\n if not self.repeat:\n self.iterations = 0\n\n def create_batches(self):\n self.batches = batch(self.data(), self.batch_size, self.batch_size_fn)\n\n @property\n def epoch(self):\n return math.floor(self.iterations / len(self))\n\n def __len__(self):\n if self.batch_size_fn is not None:\n raise NotImplementedError\n return math.ceil(len(self.dataset) / self.batch_size)\n\n def __iter__(self):\n while True:\n self.init_epoch()\n for idx, minibatch in enumerate(self.batches):\n # fast-forward if loaded from state\n if self._iterations_this_epoch > idx:\n continue\n self.iterations += 1\n self._iterations_this_epoch += 1\n if self.sort_within_batch:\n # NOTE: `rnn.pack_padded_sequence` requires that a minibatch\n # be sorted by decreasing order, which requires reversing\n # relative to typical sort keys\n if self.sort:\n minibatch.reverse()\n else:\n minibatch.sort(key=self.sort_key, reverse=True)\n yield Batch(minibatch, self.dataset, self.device)\n if not self.repeat:\n return\n\n def state_dict(self):\n return {\n \"iterations\": self.iterations,\n \"iterations_this_epoch\": self._iterations_this_epoch,\n \"random_state_this_epoch\": self._random_state_this_epoch}\n\n def load_state_dict(self, state_dict):\n self.iterations = state_dict[\"iterations\"]\n self._iterations_this_epoch = state_dict[\"iterations_this_epoch\"]\n self._random_state_this_epoch = state_dict[\"random_state_this_epoch\"]\n self._restored_from_state = True\n\n\nclass BPTTIterator(Iterator):\n \"\"\"Defines an iterator for language modeling tasks that use BPTT.\n\n Provides contiguous streams of examples together with targets that are\n one timestep further forward, for language modeling training with\n backpropagation through time (BPTT). Expects a Dataset with a single\n example and a single field called 'text' and produces Batches with text and\n target attributes.\n\n Attributes:\n dataset: The Dataset object to load Examples from.\n batch_size: Batch size.\n bptt_len: Length of sequences for backpropagation through time.\n sort_key: A key to use for sorting examples in order to batch together\n examples with similar lengths and minimize padding. The sort_key\n provided to the Iterator constructor overrides the sort_key\n attribute of the Dataset, or defers to it if None.\n train: Whether the iterator represents a train set.\n repeat: Whether to repeat the iterator for multiple epochs. Default: False.\n shuffle: Whether to shuffle examples between epochs.\n sort: Whether to sort examples according to self.sort_key.\n Note that shuffle and sort default to train and (not train).\n device (str or torch.device): A string or instance of `torch.device`\n specifying which device the Variables are going to be created on.\n If left as default, the tensors will be created on cpu. Default: None.\n \"\"\"\n\n def __init__(self, dataset, batch_size, bptt_len, **kwargs):\n self.bptt_len = bptt_len\n super(BPTTIterator, self).__init__(dataset, batch_size, **kwargs)\n\n def __len__(self):\n return math.ceil((len(self.dataset[0].text) / self.batch_size - 1)\n / self.bptt_len)\n\n def __iter__(self):\n text = self.dataset[0].text\n TEXT = self.dataset.fields['text']\n TEXT.eos_token = None\n text = text + ([TEXT.pad_token] * int(math.ceil(len(text) / self.batch_size)\n * self.batch_size - len(text)))\n data = TEXT.numericalize(\n [text], device=self.device)\n data = data.view(self.batch_size, -1).t().contiguous()\n dataset = Dataset(examples=self.dataset.examples, fields=[\n ('text', TEXT), ('target', TEXT)])\n while True:\n for i in range(0, len(self) * self.bptt_len, self.bptt_len):\n self.iterations += 1\n seq_len = min(self.bptt_len, len(data) - i - 1)\n batch_text = data[i:i + seq_len]\n batch_target = data[i + 1:i + 1 + seq_len]\n if TEXT.batch_first:\n batch_text = batch_text.t().contiguous()\n batch_target = batch_target.t().contiguous()\n yield Batch.fromvars(\n dataset, self.batch_size,\n text=batch_text,\n target=batch_target)\n if not self.repeat:\n return\n\n\nclass BucketIterator(Iterator):\n \"\"\"Defines an iterator that batches examples of similar lengths together.\n\n Minimizes amount of padding needed while producing freshly shuffled\n batches for each new epoch. See pool for the bucketing procedure used.\n \"\"\"\n\n def create_batches(self):\n if self.sort:\n self.batches = batch(self.data(), self.batch_size,\n self.batch_size_fn)\n else:\n self.batches = pool(self.data(), self.batch_size,\n self.sort_key, self.batch_size_fn,\n random_shuffler=self.random_shuffler,\n shuffle=self.shuffle,\n sort_within_batch=self.sort_within_batch)\n\n\ndef batch(data, batch_size, batch_size_fn=None):\n \"\"\"Yield elements from data in chunks of batch_size.\"\"\"\n if batch_size_fn is None:\n def batch_size_fn(new, count, sofar):\n return count\n minibatch, size_so_far = [], 0\n for ex in data:\n minibatch.append(ex)\n size_so_far = batch_size_fn(ex, len(minibatch), size_so_far)\n if size_so_far == batch_size:\n yield minibatch\n minibatch, size_so_far = [], 0\n elif size_so_far > batch_size:\n yield minibatch[:-1]\n minibatch, size_so_far = minibatch[-1:], batch_size_fn(ex, 1, 0)\n if minibatch:\n yield minibatch\n\n\ndef pool(data, batch_size, key, batch_size_fn=lambda new, count, sofar: count,\n random_shuffler=None, shuffle=False, sort_within_batch=False):\n \"\"\"Sort within buckets, then batch, then shuffle batches.\n\n Partitions data into chunks of size 100*batch_size, sorts examples within\n each chunk using sort_key, then batch these examples and shuffle the\n batches.\n \"\"\"\n if random_shuffler is None:\n random_shuffler = random.shuffle\n for p in batch(data, batch_size * 100, batch_size_fn):\n p_batch = batch(sorted(p, key=key), batch_size, batch_size_fn) \\\n if sort_within_batch \\\n else batch(p, batch_size, batch_size_fn)\n if shuffle:\n for b in random_shuffler(list(p_batch)):\n yield b\n else:\n for b in list(p_batch):\n yield b\n", "path": "torchtext/data/iterator.py"}]} | 3,934 | 176 |
gh_patches_debug_13498 | rasdani/github-patches | git_diff | iterative__dvc-1004 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
`dvc status` print something even if project is just initialized
Empty outputs look like a bug
</issue>
<code>
[start of dvc/command/status.py]
1 from dvc.command.data_sync import CmdDataBase
2
3
4 class CmdDataStatus(CmdDataBase):
5 STATUS_LEN = 10
6 STATUS_INDENT = '\t'
7
8 def _normalize(self, s):
9 s += ':'
10 assert len(s) < self.STATUS_LEN
11 return s + (self.STATUS_LEN - len(s))*' '
12
13 def _show(self, status, indent=0):
14 ind = indent * self.STATUS_INDENT
15
16 for key, value in status.items():
17 if isinstance(value, dict):
18 self.project.logger.info('{}{}'.format(ind, key))
19 self._show(value, indent+1)
20 else:
21 msg = '{}{}{}'.format(ind, self._normalize(value), key)
22 self.project.logger.info(msg)
23
24 def do_run(self, target=None):
25 indent = 1 if self.args.cloud else 0
26 try:
27 st = self.project.status(target=target,
28 jobs=self.args.jobs,
29 cloud=self.args.cloud,
30 show_checksums=self.args.show_checksums,
31 remote=self.args.remote)
32 self._show(st, indent)
33 except Exception as exc:
34 self.project.logger.error('Failed to obtain data status', exc)
35 return 1
36 return 0
37
[end of dvc/command/status.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/command/status.py b/dvc/command/status.py
--- a/dvc/command/status.py
+++ b/dvc/command/status.py
@@ -29,7 +29,11 @@
cloud=self.args.cloud,
show_checksums=self.args.show_checksums,
remote=self.args.remote)
- self._show(st, indent)
+ if st:
+ self._show(st, indent)
+ else:
+ self.project.logger.info("Nothing to reproduce. "
+ "Pipeline is up to date.")
except Exception as exc:
self.project.logger.error('Failed to obtain data status', exc)
return 1
| {"golden_diff": "diff --git a/dvc/command/status.py b/dvc/command/status.py\n--- a/dvc/command/status.py\n+++ b/dvc/command/status.py\n@@ -29,7 +29,11 @@\n cloud=self.args.cloud,\n show_checksums=self.args.show_checksums,\n remote=self.args.remote)\n- self._show(st, indent)\n+ if st:\n+ self._show(st, indent)\n+ else:\n+ self.project.logger.info(\"Nothing to reproduce. \"\n+ \"Pipeline is up to date.\")\n except Exception as exc:\n self.project.logger.error('Failed to obtain data status', exc)\n return 1\n", "issue": "`dvc status` print something even if project is just initialized\nEmpty outputs look like a bug\n", "before_files": [{"content": "from dvc.command.data_sync import CmdDataBase\n\n\nclass CmdDataStatus(CmdDataBase):\n STATUS_LEN = 10\n STATUS_INDENT = '\\t'\n\n def _normalize(self, s):\n s += ':'\n assert len(s) < self.STATUS_LEN\n return s + (self.STATUS_LEN - len(s))*' '\n\n def _show(self, status, indent=0):\n ind = indent * self.STATUS_INDENT\n\n for key, value in status.items():\n if isinstance(value, dict):\n self.project.logger.info('{}{}'.format(ind, key))\n self._show(value, indent+1)\n else:\n msg = '{}{}{}'.format(ind, self._normalize(value), key)\n self.project.logger.info(msg)\n\n def do_run(self, target=None):\n indent = 1 if self.args.cloud else 0\n try:\n st = self.project.status(target=target,\n jobs=self.args.jobs,\n cloud=self.args.cloud,\n show_checksums=self.args.show_checksums,\n remote=self.args.remote)\n self._show(st, indent)\n except Exception as exc:\n self.project.logger.error('Failed to obtain data status', exc)\n return 1\n return 0\n", "path": "dvc/command/status.py"}]} | 884 | 140 |
gh_patches_debug_27613 | rasdani/github-patches | git_diff | microsoft__Qcodes-1266 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Group parameter does not have label , description and unit (and possibly other) kwargs
Currently, because the group parameter inherits from `_BaseParameter`, it does not have often used keyword arguments.
</issue>
<code>
[start of qcodes/instrument/group_parameter.py]
1 from collections import OrderedDict
2 from typing import List, Union, Callable, Dict, Any
3
4 from qcodes.instrument.parameter import _BaseParameter
5 from qcodes import Instrument
6
7
8 class GroupParameter(_BaseParameter):
9 """
10 Group parameter is a `Parameter` which value can be set or gotten only
11 together with other group parameters. This happens when an instrument
12 has commands which set and get more than one parameter per call.
13
14 The `set_raw` method of a group parameter forwards the call to the
15 group, and the group then makes sure that the values of other parameters
16 within the group are left unchanged. The `get_raw` method of a group
17 parameter also forwards the call to the group, and the group makes sure
18 that the command output is parsed correctly, and the value of the
19 parameter of interest is returned.
20
21 After initialization, the group parameters need to be added to a group.
22 See `Group` for more information.
23
24 Args:
25 name
26 name of the parameter
27 instrument
28 instrument that this parameter belongs to; this instrument is
29 used by the group to call its get and set commands
30 """
31
32 def __init__(self, name: str, instrument: Instrument, **kwargs) -> None:
33 self.group: Union[Group, None] = None
34 super().__init__(name, instrument=instrument, **kwargs)
35
36 self.set_raw = lambda value: self.group.set(self, value)
37 self.set = self._wrap_set(self.set_raw)
38
39 self.get_raw = lambda result=None: result if result is not None \
40 else self._get_raw_value()
41
42 self.get = self._wrap_get(self.get_raw)
43
44 def _get_raw_value(self) -> Any:
45 self.group.update()
46 return self.raw_value
47
48
49 class Group:
50 """
51 The group combines `GroupParameter`s that are to be gotten or set via the
52 same command. The command has to be a string, for example, a VISA command.
53
54 The `Group`'s methods are used within `GroupParameter` in order to
55 properly implement setting and getting of a single parameter in the
56 situation where one command sets or gets more than one parameter.
57
58 The command used for setting values of parameters has to be a format
59 string which contains the names of the parameters the group has been
60 initialized with. For example, if a command has syntax `"CMD a_value,
61 b_value"`, where `'a_value'` and `'b_value'` are values of two parameters
62 with names `"a"` and `"b"`, then the command string has to be "CMD {a},
63 {b}", and the group has to be initialized with two `GroupParameter`s
64 `a_param` and `b_param`, where `a_param.name=="a"` and `b_param.name=="b"`.
65
66 Note that by default, it is assumed that the command used for getting
67 values returns a comma-separated list of values of parameters, and their
68 order corresponds to the order of `GroupParameter`s in the list that is
69 passed to the `Group`'s constructor. Through keyword arguments of the
70 `Group`'s constructor, it is possible to change the separator, and even
71 the parser of the output of the get command.
72
73 The get and set commands are called via the instrument that the first
74 parameter belongs to. It is assumed that all the parameters within the
75 group belong to the same instrument.
76
77 Example:
78 ```
79 class InstrumentWithGroupParameters(VisaInstrument):
80 def __init__(self, name, address, **kwargs):
81 super().__init__(name, address, **kwargs)
82
83 ...
84
85 # Here is how group of group parameters is defined for
86 # a simple case of an example "SGP" command that sets and gets
87 # values of "enabled" and "gain" parameters (it is assumed that
88 # "SGP?" returns the parameter values as comma-separated list
89 # "enabled_value,gain_value")
90 self.add_parameter('enabled',
91 label='Enabled',
92 val_mapping={True: 1, False: 0},
93 parameter_class=GroupParameter)
94 self.add_parameter('gain',
95 label='Some gain value',
96 get_parser=float,
97 parameter_class=GroupParameter)
98 self.output_group = Group([self.enabled, self.gain],
99 set_cmd='SGP {enabled}, {gain}',
100 get_cmd='SGP?')
101
102 ...
103 ```
104
105 Args:
106 parameters
107 a list of `GroupParameter` instances which have to be gotten and
108 set via the same command; the order of parameters in the list
109 should correspond to the order of the values returned by the
110 `get_cmd`
111 set_cmd
112 format string of the command that is used for setting the values
113 of the parameters; for example, "CMD {a}, {b}"
114 get_cmd
115 string of the command that is used for getting the values of the
116 parameters; for example, "CMD?"
117 separator
118 a separator that is used when parsing the output of the `get_cmd`
119 in order to obtain the values of the parameters; it is ignored in
120 case a custom `get_parser` is used
121 get_parser
122 a callable with a single string argument that is used to parse
123 the output of the `get_cmd`; the callable has to return a
124 dictionary where parameter names are keys, and the values are the
125 values (as directly obtained from the output of the get command;
126 note that parsers within the parameters will take care of
127 individual parsing of their values)
128 """
129 def __init__(self,
130 parameters: List[GroupParameter],
131 set_cmd: str=None,
132 get_cmd: str=None,
133 get_parser: Union[Callable[[str], Dict[str, Any]], None]=None,
134 separator: str=','
135 ) -> None:
136 self.parameters = OrderedDict((p.name, p) for p in parameters)
137
138 for p in parameters:
139 p.group = self
140
141 if len(set([p.root_instrument for p in parameters])) > 1:
142 raise ValueError(
143 "All parameters should belong to the same instrument")
144
145 self.instrument = parameters[0].root_instrument
146
147 self.set_cmd = set_cmd
148 self.get_cmd = get_cmd
149
150 if get_parser:
151 self.get_parser = get_parser
152 else:
153 self.get_parser = self._separator_parser(separator)
154
155 def _separator_parser(self, separator: str
156 ) -> Callable[[str], Dict[str, Any]]:
157 """A default separator-based string parser"""
158 def parser(ret_str: str) -> Dict[str, Any]:
159 keys = self.parameters.keys()
160 values = ret_str.split(separator)
161 return dict(zip(keys, values))
162
163 return parser
164
165 def set(self, set_parameter: GroupParameter, value: Any):
166 """
167 Sets the value of the given parameter within a group to the given
168 value by calling the `set_cmd`
169
170 Args:
171 set_parameter
172 the parameter within the group to set
173 value
174 the new value for this parameter
175 """
176 if any((p.get_latest() is None) for p in self.parameters.values()):
177 self.update()
178 calling_dict = {name: p.raw_value
179 for name, p in self.parameters.items()}
180 calling_dict[set_parameter.name] = value
181 command_str = self.set_cmd.format(**calling_dict)
182 self.instrument.write(command_str)
183
184 def update(self):
185 """
186 Update the values of all the parameters within the group by calling
187 the `get_cmd`
188 """
189 ret = self.get_parser(self.instrument.ask(self.get_cmd))
190 for name, p in list(self.parameters.items()):
191 p.get(result=ret[name])
192
[end of qcodes/instrument/group_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/qcodes/instrument/group_parameter.py b/qcodes/instrument/group_parameter.py
--- a/qcodes/instrument/group_parameter.py
+++ b/qcodes/instrument/group_parameter.py
@@ -1,11 +1,11 @@
from collections import OrderedDict
-from typing import List, Union, Callable, Dict, Any
+from typing import List, Union, Callable, Dict, Any, Optional
-from qcodes.instrument.parameter import _BaseParameter
+from qcodes.instrument.parameter import Parameter
from qcodes import Instrument
-class GroupParameter(_BaseParameter):
+class GroupParameter(Parameter):
"""
Group parameter is a `Parameter` which value can be set or gotten only
together with other group parameters. This happens when an instrument
@@ -27,9 +27,21 @@
instrument
instrument that this parameter belongs to; this instrument is
used by the group to call its get and set commands
+
+ **kwargs:
+ All kwargs used by the Parameter class, except set_cmd and get_cmd
"""
- def __init__(self, name: str, instrument: Instrument, **kwargs) -> None:
+ def __init__(
+ self, name: str,
+ instrument: Optional['Instrument'] = None,
+ **kwargs
+ ) -> None:
+
+ if "set_cmd" in kwargs or "get_cmd" in kwargs:
+ raise ValueError("A GroupParameter does not use 'set_cmd' or "
+ "'get_cmd' kwarg")
+
self.group: Union[Group, None] = None
super().__init__(name, instrument=instrument, **kwargs)
| {"golden_diff": "diff --git a/qcodes/instrument/group_parameter.py b/qcodes/instrument/group_parameter.py\n--- a/qcodes/instrument/group_parameter.py\n+++ b/qcodes/instrument/group_parameter.py\n@@ -1,11 +1,11 @@\n from collections import OrderedDict\n-from typing import List, Union, Callable, Dict, Any\n+from typing import List, Union, Callable, Dict, Any, Optional\n \n-from qcodes.instrument.parameter import _BaseParameter\n+from qcodes.instrument.parameter import Parameter\n from qcodes import Instrument\n \n \n-class GroupParameter(_BaseParameter):\n+class GroupParameter(Parameter):\n \"\"\"\n Group parameter is a `Parameter` which value can be set or gotten only\n together with other group parameters. This happens when an instrument\n@@ -27,9 +27,21 @@\n instrument\n instrument that this parameter belongs to; this instrument is\n used by the group to call its get and set commands\n+\n+ **kwargs:\n+ All kwargs used by the Parameter class, except set_cmd and get_cmd\n \"\"\"\n \n- def __init__(self, name: str, instrument: Instrument, **kwargs) -> None:\n+ def __init__(\n+ self, name: str,\n+ instrument: Optional['Instrument'] = None,\n+ **kwargs\n+ ) -> None:\n+\n+ if \"set_cmd\" in kwargs or \"get_cmd\" in kwargs:\n+ raise ValueError(\"A GroupParameter does not use 'set_cmd' or \"\n+ \"'get_cmd' kwarg\")\n+\n self.group: Union[Group, None] = None\n super().__init__(name, instrument=instrument, **kwargs)\n", "issue": "Group parameter does not have label , description and unit (and possibly other) kwargs\nCurrently, because the group parameter inherits from `_BaseParameter`, it does not have often used keyword arguments. \n", "before_files": [{"content": "from collections import OrderedDict\nfrom typing import List, Union, Callable, Dict, Any\n\nfrom qcodes.instrument.parameter import _BaseParameter\nfrom qcodes import Instrument\n\n\nclass GroupParameter(_BaseParameter):\n \"\"\"\n Group parameter is a `Parameter` which value can be set or gotten only\n together with other group parameters. This happens when an instrument\n has commands which set and get more than one parameter per call.\n\n The `set_raw` method of a group parameter forwards the call to the\n group, and the group then makes sure that the values of other parameters\n within the group are left unchanged. The `get_raw` method of a group\n parameter also forwards the call to the group, and the group makes sure\n that the command output is parsed correctly, and the value of the\n parameter of interest is returned.\n\n After initialization, the group parameters need to be added to a group.\n See `Group` for more information.\n\n Args:\n name\n name of the parameter\n instrument\n instrument that this parameter belongs to; this instrument is\n used by the group to call its get and set commands\n \"\"\"\n\n def __init__(self, name: str, instrument: Instrument, **kwargs) -> None:\n self.group: Union[Group, None] = None\n super().__init__(name, instrument=instrument, **kwargs)\n\n self.set_raw = lambda value: self.group.set(self, value)\n self.set = self._wrap_set(self.set_raw)\n\n self.get_raw = lambda result=None: result if result is not None \\\n else self._get_raw_value()\n\n self.get = self._wrap_get(self.get_raw)\n\n def _get_raw_value(self) -> Any:\n self.group.update()\n return self.raw_value\n\n\nclass Group:\n \"\"\"\n The group combines `GroupParameter`s that are to be gotten or set via the\n same command. The command has to be a string, for example, a VISA command.\n\n The `Group`'s methods are used within `GroupParameter` in order to\n properly implement setting and getting of a single parameter in the\n situation where one command sets or gets more than one parameter.\n\n The command used for setting values of parameters has to be a format\n string which contains the names of the parameters the group has been\n initialized with. For example, if a command has syntax `\"CMD a_value,\n b_value\"`, where `'a_value'` and `'b_value'` are values of two parameters\n with names `\"a\"` and `\"b\"`, then the command string has to be \"CMD {a},\n {b}\", and the group has to be initialized with two `GroupParameter`s\n `a_param` and `b_param`, where `a_param.name==\"a\"` and `b_param.name==\"b\"`.\n\n Note that by default, it is assumed that the command used for getting\n values returns a comma-separated list of values of parameters, and their\n order corresponds to the order of `GroupParameter`s in the list that is\n passed to the `Group`'s constructor. Through keyword arguments of the\n `Group`'s constructor, it is possible to change the separator, and even\n the parser of the output of the get command.\n\n The get and set commands are called via the instrument that the first\n parameter belongs to. It is assumed that all the parameters within the\n group belong to the same instrument.\n\n Example:\n ```\n class InstrumentWithGroupParameters(VisaInstrument):\n def __init__(self, name, address, **kwargs):\n super().__init__(name, address, **kwargs)\n\n ...\n\n # Here is how group of group parameters is defined for\n # a simple case of an example \"SGP\" command that sets and gets\n # values of \"enabled\" and \"gain\" parameters (it is assumed that\n # \"SGP?\" returns the parameter values as comma-separated list\n # \"enabled_value,gain_value\")\n self.add_parameter('enabled',\n label='Enabled',\n val_mapping={True: 1, False: 0},\n parameter_class=GroupParameter)\n self.add_parameter('gain',\n label='Some gain value',\n get_parser=float,\n parameter_class=GroupParameter)\n self.output_group = Group([self.enabled, self.gain],\n set_cmd='SGP {enabled}, {gain}',\n get_cmd='SGP?')\n\n ...\n ```\n\n Args:\n parameters\n a list of `GroupParameter` instances which have to be gotten and\n set via the same command; the order of parameters in the list\n should correspond to the order of the values returned by the\n `get_cmd`\n set_cmd\n format string of the command that is used for setting the values\n of the parameters; for example, \"CMD {a}, {b}\"\n get_cmd\n string of the command that is used for getting the values of the\n parameters; for example, \"CMD?\"\n separator\n a separator that is used when parsing the output of the `get_cmd`\n in order to obtain the values of the parameters; it is ignored in\n case a custom `get_parser` is used\n get_parser\n a callable with a single string argument that is used to parse\n the output of the `get_cmd`; the callable has to return a\n dictionary where parameter names are keys, and the values are the\n values (as directly obtained from the output of the get command;\n note that parsers within the parameters will take care of\n individual parsing of their values)\n \"\"\"\n def __init__(self,\n parameters: List[GroupParameter],\n set_cmd: str=None,\n get_cmd: str=None,\n get_parser: Union[Callable[[str], Dict[str, Any]], None]=None,\n separator: str=','\n ) -> None:\n self.parameters = OrderedDict((p.name, p) for p in parameters)\n\n for p in parameters:\n p.group = self\n\n if len(set([p.root_instrument for p in parameters])) > 1:\n raise ValueError(\n \"All parameters should belong to the same instrument\")\n\n self.instrument = parameters[0].root_instrument\n\n self.set_cmd = set_cmd\n self.get_cmd = get_cmd\n\n if get_parser:\n self.get_parser = get_parser\n else:\n self.get_parser = self._separator_parser(separator)\n\n def _separator_parser(self, separator: str\n ) -> Callable[[str], Dict[str, Any]]:\n \"\"\"A default separator-based string parser\"\"\"\n def parser(ret_str: str) -> Dict[str, Any]:\n keys = self.parameters.keys()\n values = ret_str.split(separator)\n return dict(zip(keys, values))\n\n return parser\n\n def set(self, set_parameter: GroupParameter, value: Any):\n \"\"\"\n Sets the value of the given parameter within a group to the given\n value by calling the `set_cmd`\n\n Args:\n set_parameter\n the parameter within the group to set\n value\n the new value for this parameter\n \"\"\"\n if any((p.get_latest() is None) for p in self.parameters.values()):\n self.update()\n calling_dict = {name: p.raw_value\n for name, p in self.parameters.items()}\n calling_dict[set_parameter.name] = value\n command_str = self.set_cmd.format(**calling_dict)\n self.instrument.write(command_str)\n\n def update(self):\n \"\"\"\n Update the values of all the parameters within the group by calling\n the `get_cmd`\n \"\"\"\n ret = self.get_parser(self.instrument.ask(self.get_cmd))\n for name, p in list(self.parameters.items()):\n p.get(result=ret[name])\n", "path": "qcodes/instrument/group_parameter.py"}]} | 2,724 | 354 |
gh_patches_debug_10716 | rasdani/github-patches | git_diff | nextcloud__appstore-406 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
RSS/Atom Feed: Don't show Changes headline if Changelog is empty
Needs a check if item.changelog is empty https://github.com/nextcloud/appstore/blob/master/nextcloudappstore/core/feeds.py#L36
</issue>
<code>
[start of nextcloudappstore/core/feeds.py]
1 from django.conf import settings
2 from django.contrib.syndication.views import Feed
3 from django.urls import reverse
4 from django.urls import reverse_lazy
5 from django.utils.feedgenerator import Atom1Feed
6 from django.utils.translation import ugettext_lazy as _ # type: ignore
7 from parler.models import TranslationDoesNotExist
8
9 from nextcloudappstore.core.models import AppRelease
10 from markdown import markdown
11 from bleach import clean
12
13
14 class AppReleaseRssFeed(Feed):
15 title = _('Newest app releases')
16 description = _('Get the newest app release updates')
17 link = reverse_lazy('home')
18
19 def __call__(self, request, *args, **kwargs):
20 self.request = request
21 return super().__call__(request, *args, **kwargs)
22
23 def items(self):
24 queryset = AppRelease.objects.order_by('-last_modified')
25 if 'nightly' not in self.request.GET:
26 queryset = queryset.filter(is_nightly=False)
27 if 'prerelease' not in self.request.GET:
28 queryset = queryset.exclude(version__contains='-')
29 return queryset[:10]
30
31 def item_title(self, item):
32 return '%s (%s)' % (item.app.name, item.version)
33
34 def item_description(self, item):
35 try:
36 content = ('%s\n\n# %s\n\n%s' % (
37 item.app.description, _('Changes'), item.changelog))
38 except TranslationDoesNotExist:
39 content = item.app.description
40 content += '\n\n [%s](%s)' % (_('Download'), item.download)
41 return clean(markdown(content),
42 attributes=settings.MARKDOWN_ALLOWED_ATTRIBUTES,
43 tags=settings.MARKDOWN_ALLOWED_TAGS)
44
45 def item_guid(self, obj):
46 if obj.is_nightly:
47 nightly = '-nightly'
48 else:
49 nightly = ''
50 return '%s-%s%s' % (obj.app.id, obj.version, nightly)
51
52 def item_link(self, item):
53 return reverse('app-detail', kwargs={'id': item.app.id})
54
55 def item_author_name(self, item):
56 return '%s %s' % (item.app.owner.first_name, item.app.owner.last_name)
57
58 def item_pubdate(self, item):
59 return item.last_modified
60
61 def item_updateddate(self, item):
62 return item.last_modified
63
64
65 class AppReleaseAtomFeed(AppReleaseRssFeed):
66 feed_type = Atom1Feed
67 subtitle = AppReleaseRssFeed.description
68
[end of nextcloudappstore/core/feeds.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/nextcloudappstore/core/feeds.py b/nextcloudappstore/core/feeds.py
--- a/nextcloudappstore/core/feeds.py
+++ b/nextcloudappstore/core/feeds.py
@@ -33,8 +33,11 @@
def item_description(self, item):
try:
- content = ('%s\n\n# %s\n\n%s' % (
- item.app.description, _('Changes'), item.changelog))
+ if item.changelog:
+ changelog = '\n\n# %s\n\n%s' % (_('Changes'), item.changelog)
+ else:
+ changelog = ''
+ content = '%s%s' % (item.app.description, changelog)
except TranslationDoesNotExist:
content = item.app.description
content += '\n\n [%s](%s)' % (_('Download'), item.download)
| {"golden_diff": "diff --git a/nextcloudappstore/core/feeds.py b/nextcloudappstore/core/feeds.py\n--- a/nextcloudappstore/core/feeds.py\n+++ b/nextcloudappstore/core/feeds.py\n@@ -33,8 +33,11 @@\n \n def item_description(self, item):\n try:\n- content = ('%s\\n\\n# %s\\n\\n%s' % (\n- item.app.description, _('Changes'), item.changelog))\n+ if item.changelog:\n+ changelog = '\\n\\n# %s\\n\\n%s' % (_('Changes'), item.changelog)\n+ else:\n+ changelog = ''\n+ content = '%s%s' % (item.app.description, changelog)\n except TranslationDoesNotExist:\n content = item.app.description\n content += '\\n\\n [%s](%s)' % (_('Download'), item.download)\n", "issue": "RSS/Atom Feed: Don't show Changes headline if Changelog is empty\nNeeds a check if item.changelog is empty https://github.com/nextcloud/appstore/blob/master/nextcloudappstore/core/feeds.py#L36\n", "before_files": [{"content": "from django.conf import settings\nfrom django.contrib.syndication.views import Feed\nfrom django.urls import reverse\nfrom django.urls import reverse_lazy\nfrom django.utils.feedgenerator import Atom1Feed\nfrom django.utils.translation import ugettext_lazy as _ # type: ignore\nfrom parler.models import TranslationDoesNotExist\n\nfrom nextcloudappstore.core.models import AppRelease\nfrom markdown import markdown\nfrom bleach import clean\n\n\nclass AppReleaseRssFeed(Feed):\n title = _('Newest app releases')\n description = _('Get the newest app release updates')\n link = reverse_lazy('home')\n\n def __call__(self, request, *args, **kwargs):\n self.request = request\n return super().__call__(request, *args, **kwargs)\n\n def items(self):\n queryset = AppRelease.objects.order_by('-last_modified')\n if 'nightly' not in self.request.GET:\n queryset = queryset.filter(is_nightly=False)\n if 'prerelease' not in self.request.GET:\n queryset = queryset.exclude(version__contains='-')\n return queryset[:10]\n\n def item_title(self, item):\n return '%s (%s)' % (item.app.name, item.version)\n\n def item_description(self, item):\n try:\n content = ('%s\\n\\n# %s\\n\\n%s' % (\n item.app.description, _('Changes'), item.changelog))\n except TranslationDoesNotExist:\n content = item.app.description\n content += '\\n\\n [%s](%s)' % (_('Download'), item.download)\n return clean(markdown(content),\n attributes=settings.MARKDOWN_ALLOWED_ATTRIBUTES,\n tags=settings.MARKDOWN_ALLOWED_TAGS)\n\n def item_guid(self, obj):\n if obj.is_nightly:\n nightly = '-nightly'\n else:\n nightly = ''\n return '%s-%s%s' % (obj.app.id, obj.version, nightly)\n\n def item_link(self, item):\n return reverse('app-detail', kwargs={'id': item.app.id})\n\n def item_author_name(self, item):\n return '%s %s' % (item.app.owner.first_name, item.app.owner.last_name)\n\n def item_pubdate(self, item):\n return item.last_modified\n\n def item_updateddate(self, item):\n return item.last_modified\n\n\nclass AppReleaseAtomFeed(AppReleaseRssFeed):\n feed_type = Atom1Feed\n subtitle = AppReleaseRssFeed.description\n", "path": "nextcloudappstore/core/feeds.py"}]} | 1,239 | 195 |
gh_patches_debug_41827 | rasdani/github-patches | git_diff | streamlink__streamlink-5771 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
plugins.bilibili: Playable streams can't be found on stream pages with custom layout
### Checklist
- [X] This is a [plugin issue](https://streamlink.github.io/plugins.html) and not [a different kind of issue](https://github.com/streamlink/streamlink/issues/new/choose)
- [X] [I have read the contribution guidelines](https://github.com/streamlink/streamlink/blob/master/CONTRIBUTING.md#contributing-to-streamlink)
- [X] [I have checked the list of open and recently closed plugin issues](https://github.com/streamlink/streamlink/issues?q=is%3Aissue+label%3A%22plugin+issue%22)
- [X] [I have checked the commit log of the master branch](https://github.com/streamlink/streamlink/commits/master)
### Streamlink version
streamlink 6.5.0
### Description
It appears that for Bilibili streams with custom pages, the plugin will simply say there's no playable stream found, even if a stream is actually live. An example of [a stream with a custom page at the time of posting](https://live.bilibili.com/27888667) is given in the debug log (screenshot shown here).
### Debug log
```text
PS C:\Users\Admin> streamlink --loglevel=debug https://live.bilibili.com/27888667 best
[cli][debug] OS: Windows 10
[cli][debug] Python: 3.11.7
[cli][debug] OpenSSL: OpenSSL 3.0.11 19 Sep 2023
[cli][debug] Streamlink: 6.5.0
[cli][debug] Dependencies:
[cli][debug] certifi: 2023.11.17
[cli][debug] isodate: 0.6.1
[cli][debug] lxml: 4.9.3
[cli][debug] pycountry: 23.12.11
[cli][debug] pycryptodome: 3.19.0
[cli][debug] PySocks: 1.7.1
[cli][debug] requests: 2.31.0
[cli][debug] trio: 0.23.2
[cli][debug] trio-websocket: 0.11.1
[cli][debug] typing-extensions: 4.9.0
[cli][debug] urllib3: 2.1.0
[cli][debug] websocket-client: 1.7.0
[cli][debug] Arguments:
[cli][debug] url=https://live.bilibili.com/27888667
[cli][debug] stream=['best']
[cli][debug] --loglevel=debug
[cli][debug] --ffmpeg-ffmpeg=C:\Program Files\Streamlink\ffmpeg\ffmpeg.exe
[cli][info] Found matching plugin bilibili for URL https://live.bilibili.com/27888667
error: No playable streams found on this URL: https://live.bilibili.com/27888667
```
</issue>
<code>
[start of src/streamlink/plugins/bilibili.py]
1 """
2 $description Chinese video sharing website based in Shanghai, themed around animation, comics, and games (ACG).
3 $url live.bilibili.com
4 $type live
5 """
6
7 import re
8
9 from streamlink.plugin import Plugin, pluginmatcher
10 from streamlink.plugin.api import validate
11 from streamlink.stream.hls import HLSStream
12
13
14 @pluginmatcher(re.compile(
15 r"https?://live\.bilibili\.com/(?P<channel>[^/]+)",
16 ))
17 class Bilibili(Plugin):
18 SHOW_STATUS_OFFLINE = 0
19 SHOW_STATUS_ONLINE = 1
20 SHOW_STATUS_ROUND = 2
21
22 def _get_streams(self):
23 schema_stream = validate.all(
24 [{
25 "protocol_name": str,
26 "format": validate.all(
27 [{
28 "format_name": str,
29 "codec": validate.all(
30 [{
31 "codec_name": str,
32 "base_url": str,
33 "url_info": [{
34 "host": validate.url(),
35 "extra": str,
36 }],
37 }],
38 validate.filter(lambda item: item["codec_name"] == "avc"),
39 ),
40 }],
41 validate.filter(lambda item: item["format_name"] == "fmp4"),
42 ),
43 }],
44 validate.filter(lambda item: item["protocol_name"] == "http_hls"),
45 )
46
47 data = self.session.http.get(
48 self.url,
49 schema=validate.Schema(
50 validate.parse_html(),
51 validate.xml_xpath_string(".//script[contains(text(),'window.__NEPTUNE_IS_MY_WAIFU__={')][1]/text()"),
52 validate.none_or_all(
53 validate.transform(str.replace, "window.__NEPTUNE_IS_MY_WAIFU__=", ""),
54 validate.parse_json(),
55 {
56 "roomInitRes": {
57 "data": {
58 "live_status": int,
59 "playurl_info": {
60 "playurl": {
61 "stream": schema_stream,
62 },
63 },
64 },
65 },
66 "roomInfoRes": {
67 "data": {
68 "room_info": {
69 "live_id": int,
70 "title": str,
71 "area_name": str,
72 },
73 "anchor_info": {
74 "base_info": {
75 "uname": str,
76 },
77 },
78 },
79 },
80 },
81 validate.union_get(
82 ("roomInfoRes", "data", "room_info", "live_id"),
83 ("roomInfoRes", "data", "anchor_info", "base_info", "uname"),
84 ("roomInfoRes", "data", "room_info", "area_name"),
85 ("roomInfoRes", "data", "room_info", "title"),
86 ("roomInitRes", "data", "live_status"),
87 ("roomInitRes", "data", "playurl_info", "playurl", "stream"),
88 ),
89 ),
90 ),
91 )
92 if not data:
93 return
94
95 self.id, self.author, self.category, self.title, live_status, streams = data
96 if live_status != self.SHOW_STATUS_ONLINE:
97 return
98
99 for stream in streams:
100 for stream_format in stream["format"]:
101 for codec in stream_format["codec"]:
102 for url_info in codec["url_info"]:
103 url = f"{url_info['host']}{codec['base_url']}{url_info['extra']}"
104 yield "live", HLSStream(self.session, url)
105
106
107 __plugin__ = Bilibili
108
[end of src/streamlink/plugins/bilibili.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/streamlink/plugins/bilibili.py b/src/streamlink/plugins/bilibili.py
--- a/src/streamlink/plugins/bilibili.py
+++ b/src/streamlink/plugins/bilibili.py
@@ -4,23 +4,31 @@
$type live
"""
+import logging
import re
+from streamlink.exceptions import NoStreamsError
from streamlink.plugin import Plugin, pluginmatcher
from streamlink.plugin.api import validate
from streamlink.stream.hls import HLSStream
+log = logging.getLogger(__name__)
+
+
@pluginmatcher(re.compile(
r"https?://live\.bilibili\.com/(?P<channel>[^/]+)",
))
class Bilibili(Plugin):
+ _URL_API_PLAYINFO = "https://api.live.bilibili.com/xlive/web-room/v2/index/getRoomPlayInfo"
+
SHOW_STATUS_OFFLINE = 0
SHOW_STATUS_ONLINE = 1
SHOW_STATUS_ROUND = 2
- def _get_streams(self):
- schema_stream = validate.all(
+ @staticmethod
+ def _schema_streams():
+ return validate.all(
[{
"protocol_name": str,
"format": validate.all(
@@ -44,6 +52,38 @@
validate.filter(lambda item: item["protocol_name"] == "http_hls"),
)
+ def _get_api_playinfo(self, room_id):
+ return self.session.http.get(
+ self._URL_API_PLAYINFO,
+ params={
+ "room_id": room_id,
+ "no_playurl": 0,
+ "mask": 1,
+ "qn": 0,
+ "platform": "web",
+ "protocol": "0,1",
+ "format": "0,1,2",
+ "codec": "0,1,2",
+ "dolby": 5,
+ "panorama": 1,
+ },
+ schema=validate.Schema(
+ validate.parse_json(),
+ {
+ "code": 0,
+ "data": {
+ "playurl_info": {
+ "playurl": {
+ "stream": self._schema_streams(),
+ },
+ },
+ },
+ },
+ validate.get(("data", "playurl_info", "playurl", "stream")),
+ ),
+ )
+
+ def _get_page_playinfo(self):
data = self.session.http.get(
self.url,
schema=validate.Schema(
@@ -58,7 +98,7 @@
"live_status": int,
"playurl_info": {
"playurl": {
- "stream": schema_stream,
+ "stream": self._schema_streams(),
},
},
},
@@ -94,9 +134,18 @@
self.id, self.author, self.category, self.title, live_status, streams = data
if live_status != self.SHOW_STATUS_ONLINE:
- return
+ log.info("Channel is offline")
+ raise NoStreamsError
+
+ return streams
+
+ def _get_streams(self):
+ streams = self._get_page_playinfo()
+ if not streams:
+ log.debug("Falling back to _get_api_playinfo()")
+ streams = self._get_api_playinfo(self.match["channel"])
- for stream in streams:
+ for stream in streams or []:
for stream_format in stream["format"]:
for codec in stream_format["codec"]:
for url_info in codec["url_info"]:
| {"golden_diff": "diff --git a/src/streamlink/plugins/bilibili.py b/src/streamlink/plugins/bilibili.py\n--- a/src/streamlink/plugins/bilibili.py\n+++ b/src/streamlink/plugins/bilibili.py\n@@ -4,23 +4,31 @@\n $type live\n \"\"\"\n \n+import logging\n import re\n \n+from streamlink.exceptions import NoStreamsError\n from streamlink.plugin import Plugin, pluginmatcher\n from streamlink.plugin.api import validate\n from streamlink.stream.hls import HLSStream\n \n \n+log = logging.getLogger(__name__)\n+\n+\n @pluginmatcher(re.compile(\n r\"https?://live\\.bilibili\\.com/(?P<channel>[^/]+)\",\n ))\n class Bilibili(Plugin):\n+ _URL_API_PLAYINFO = \"https://api.live.bilibili.com/xlive/web-room/v2/index/getRoomPlayInfo\"\n+\n SHOW_STATUS_OFFLINE = 0\n SHOW_STATUS_ONLINE = 1\n SHOW_STATUS_ROUND = 2\n \n- def _get_streams(self):\n- schema_stream = validate.all(\n+ @staticmethod\n+ def _schema_streams():\n+ return validate.all(\n [{\n \"protocol_name\": str,\n \"format\": validate.all(\n@@ -44,6 +52,38 @@\n validate.filter(lambda item: item[\"protocol_name\"] == \"http_hls\"),\n )\n \n+ def _get_api_playinfo(self, room_id):\n+ return self.session.http.get(\n+ self._URL_API_PLAYINFO,\n+ params={\n+ \"room_id\": room_id,\n+ \"no_playurl\": 0,\n+ \"mask\": 1,\n+ \"qn\": 0,\n+ \"platform\": \"web\",\n+ \"protocol\": \"0,1\",\n+ \"format\": \"0,1,2\",\n+ \"codec\": \"0,1,2\",\n+ \"dolby\": 5,\n+ \"panorama\": 1,\n+ },\n+ schema=validate.Schema(\n+ validate.parse_json(),\n+ {\n+ \"code\": 0,\n+ \"data\": {\n+ \"playurl_info\": {\n+ \"playurl\": {\n+ \"stream\": self._schema_streams(),\n+ },\n+ },\n+ },\n+ },\n+ validate.get((\"data\", \"playurl_info\", \"playurl\", \"stream\")),\n+ ),\n+ )\n+\n+ def _get_page_playinfo(self):\n data = self.session.http.get(\n self.url,\n schema=validate.Schema(\n@@ -58,7 +98,7 @@\n \"live_status\": int,\n \"playurl_info\": {\n \"playurl\": {\n- \"stream\": schema_stream,\n+ \"stream\": self._schema_streams(),\n },\n },\n },\n@@ -94,9 +134,18 @@\n \n self.id, self.author, self.category, self.title, live_status, streams = data\n if live_status != self.SHOW_STATUS_ONLINE:\n- return\n+ log.info(\"Channel is offline\")\n+ raise NoStreamsError\n+\n+ return streams\n+\n+ def _get_streams(self):\n+ streams = self._get_page_playinfo()\n+ if not streams:\n+ log.debug(\"Falling back to _get_api_playinfo()\")\n+ streams = self._get_api_playinfo(self.match[\"channel\"])\n \n- for stream in streams:\n+ for stream in streams or []:\n for stream_format in stream[\"format\"]:\n for codec in stream_format[\"codec\"]:\n for url_info in codec[\"url_info\"]:\n", "issue": "plugins.bilibili: Playable streams can't be found on stream pages with custom layout\n### Checklist\r\n\r\n- [X] This is a [plugin issue](https://streamlink.github.io/plugins.html) and not [a different kind of issue](https://github.com/streamlink/streamlink/issues/new/choose)\r\n- [X] [I have read the contribution guidelines](https://github.com/streamlink/streamlink/blob/master/CONTRIBUTING.md#contributing-to-streamlink)\r\n- [X] [I have checked the list of open and recently closed plugin issues](https://github.com/streamlink/streamlink/issues?q=is%3Aissue+label%3A%22plugin+issue%22)\r\n- [X] [I have checked the commit log of the master branch](https://github.com/streamlink/streamlink/commits/master)\r\n\r\n### Streamlink version\r\n\r\nstreamlink 6.5.0\r\n\r\n### Description\r\n\r\nIt appears that for Bilibili streams with custom pages, the plugin will simply say there's no playable stream found, even if a stream is actually live. An example of [a stream with a custom page at the time of posting](https://live.bilibili.com/27888667) is given in the debug log (screenshot shown here).\r\n\r\n\r\n\r\n### Debug log\r\n\r\n```text\r\nPS C:\\Users\\Admin> streamlink --loglevel=debug https://live.bilibili.com/27888667 best\r\n[cli][debug] OS: Windows 10\r\n[cli][debug] Python: 3.11.7\r\n[cli][debug] OpenSSL: OpenSSL 3.0.11 19 Sep 2023\r\n[cli][debug] Streamlink: 6.5.0\r\n[cli][debug] Dependencies:\r\n[cli][debug] certifi: 2023.11.17\r\n[cli][debug] isodate: 0.6.1\r\n[cli][debug] lxml: 4.9.3\r\n[cli][debug] pycountry: 23.12.11\r\n[cli][debug] pycryptodome: 3.19.0\r\n[cli][debug] PySocks: 1.7.1\r\n[cli][debug] requests: 2.31.0\r\n[cli][debug] trio: 0.23.2\r\n[cli][debug] trio-websocket: 0.11.1\r\n[cli][debug] typing-extensions: 4.9.0\r\n[cli][debug] urllib3: 2.1.0\r\n[cli][debug] websocket-client: 1.7.0\r\n[cli][debug] Arguments:\r\n[cli][debug] url=https://live.bilibili.com/27888667\r\n[cli][debug] stream=['best']\r\n[cli][debug] --loglevel=debug\r\n[cli][debug] --ffmpeg-ffmpeg=C:\\Program Files\\Streamlink\\ffmpeg\\ffmpeg.exe\r\n[cli][info] Found matching plugin bilibili for URL https://live.bilibili.com/27888667\r\nerror: No playable streams found on this URL: https://live.bilibili.com/27888667\r\n```\r\n\n", "before_files": [{"content": "\"\"\"\n$description Chinese video sharing website based in Shanghai, themed around animation, comics, and games (ACG).\n$url live.bilibili.com\n$type live\n\"\"\"\n\nimport re\n\nfrom streamlink.plugin import Plugin, pluginmatcher\nfrom streamlink.plugin.api import validate\nfrom streamlink.stream.hls import HLSStream\n\n\n@pluginmatcher(re.compile(\n r\"https?://live\\.bilibili\\.com/(?P<channel>[^/]+)\",\n))\nclass Bilibili(Plugin):\n SHOW_STATUS_OFFLINE = 0\n SHOW_STATUS_ONLINE = 1\n SHOW_STATUS_ROUND = 2\n\n def _get_streams(self):\n schema_stream = validate.all(\n [{\n \"protocol_name\": str,\n \"format\": validate.all(\n [{\n \"format_name\": str,\n \"codec\": validate.all(\n [{\n \"codec_name\": str,\n \"base_url\": str,\n \"url_info\": [{\n \"host\": validate.url(),\n \"extra\": str,\n }],\n }],\n validate.filter(lambda item: item[\"codec_name\"] == \"avc\"),\n ),\n }],\n validate.filter(lambda item: item[\"format_name\"] == \"fmp4\"),\n ),\n }],\n validate.filter(lambda item: item[\"protocol_name\"] == \"http_hls\"),\n )\n\n data = self.session.http.get(\n self.url,\n schema=validate.Schema(\n validate.parse_html(),\n validate.xml_xpath_string(\".//script[contains(text(),'window.__NEPTUNE_IS_MY_WAIFU__={')][1]/text()\"),\n validate.none_or_all(\n validate.transform(str.replace, \"window.__NEPTUNE_IS_MY_WAIFU__=\", \"\"),\n validate.parse_json(),\n {\n \"roomInitRes\": {\n \"data\": {\n \"live_status\": int,\n \"playurl_info\": {\n \"playurl\": {\n \"stream\": schema_stream,\n },\n },\n },\n },\n \"roomInfoRes\": {\n \"data\": {\n \"room_info\": {\n \"live_id\": int,\n \"title\": str,\n \"area_name\": str,\n },\n \"anchor_info\": {\n \"base_info\": {\n \"uname\": str,\n },\n },\n },\n },\n },\n validate.union_get(\n (\"roomInfoRes\", \"data\", \"room_info\", \"live_id\"),\n (\"roomInfoRes\", \"data\", \"anchor_info\", \"base_info\", \"uname\"),\n (\"roomInfoRes\", \"data\", \"room_info\", \"area_name\"),\n (\"roomInfoRes\", \"data\", \"room_info\", \"title\"),\n (\"roomInitRes\", \"data\", \"live_status\"),\n (\"roomInitRes\", \"data\", \"playurl_info\", \"playurl\", \"stream\"),\n ),\n ),\n ),\n )\n if not data:\n return\n\n self.id, self.author, self.category, self.title, live_status, streams = data\n if live_status != self.SHOW_STATUS_ONLINE:\n return\n\n for stream in streams:\n for stream_format in stream[\"format\"]:\n for codec in stream_format[\"codec\"]:\n for url_info in codec[\"url_info\"]:\n url = f\"{url_info['host']}{codec['base_url']}{url_info['extra']}\"\n yield \"live\", HLSStream(self.session, url)\n\n\n__plugin__ = Bilibili\n", "path": "src/streamlink/plugins/bilibili.py"}]} | 2,263 | 775 |
gh_patches_debug_20710 | rasdani/github-patches | git_diff | googleapis__google-auth-library-python-755 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Silent dependency on urllib3 in _aiohttp_requests
#### Environment details
- OS: OSX, Linux
- Python version: 3.7
- pip version:
- `google-auth` version: 1.24.0
#### Steps to reproduce
1. Setup a clean virtualenv
2. pip install google-auth==1.24.0 aiohttp==3.5.4 (version I happen to be using)
3. Run "from google.auth.transport import _aiohttp_requests" in a python3 session
You should get a ModuleNotFoundError for "urllib3"
</issue>
<code>
[start of noxfile.py]
1 # Copyright 2019 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 import shutil
16 import os
17 import nox
18
19 TEST_DEPENDENCIES = [
20 "flask",
21 "freezegun",
22 "mock",
23 "oauth2client",
24 "pyopenssl",
25 "pytest",
26 "pytest-cov",
27 "pytest-localserver",
28 "pyu2f",
29 "requests",
30 "urllib3",
31 "cryptography",
32 "responses",
33 "grpcio",
34 ]
35
36 ASYNC_DEPENDENCIES = [
37 "pytest-asyncio",
38 "aioresponses",
39 "asynctest",
40 "aiohttp!=3.7.4.post0",
41 ]
42
43 BLACK_VERSION = "black==19.3b0"
44 BLACK_PATHS = [
45 "google",
46 "tests",
47 "tests_async",
48 "noxfile.py",
49 "setup.py",
50 "docs/conf.py",
51 ]
52
53
54 @nox.session(python="3.7")
55 def lint(session):
56 session.install("flake8", "flake8-import-order", "docutils", BLACK_VERSION)
57 session.install(".")
58 session.run("black", "--check", *BLACK_PATHS)
59 session.run(
60 "flake8",
61 "--import-order-style=google",
62 "--application-import-names=google,tests,system_tests",
63 "google",
64 "tests",
65 "tests_async",
66 )
67 session.run(
68 "python", "setup.py", "check", "--metadata", "--restructuredtext", "--strict"
69 )
70
71
72 @nox.session(python="3.6")
73 def blacken(session):
74 """Run black.
75 Format code to uniform standard.
76 This currently uses Python 3.6 due to the automated Kokoro run of synthtool.
77 That run uses an image that doesn't have 3.6 installed. Before updating this
78 check the state of the `gcp_ubuntu_config` we use for that Kokoro run.
79 """
80 session.install(BLACK_VERSION)
81 session.run("black", *BLACK_PATHS)
82
83
84 @nox.session(python=["3.6", "3.7", "3.8", "3.9"])
85 def unit(session):
86 session.install(*TEST_DEPENDENCIES)
87 session.install(*(ASYNC_DEPENDENCIES))
88 session.install(".")
89 session.run(
90 "pytest",
91 f"--junitxml=unit_{session.python}_sponge_log.xml",
92 "--cov=google.auth",
93 "--cov=google.oauth2",
94 "--cov=tests",
95 "tests",
96 "tests_async",
97 )
98
99
100 @nox.session(python=["2.7"])
101 def unit_prev_versions(session):
102 session.install(".")
103 session.install(*TEST_DEPENDENCIES)
104 session.run(
105 "pytest",
106 f"--junitxml=unit_{session.python}_sponge_log.xml",
107 "--cov=google.auth",
108 "--cov=google.oauth2",
109 "--cov=tests",
110 "tests",
111 )
112
113
114 @nox.session(python="3.7")
115 def cover(session):
116 session.install(*TEST_DEPENDENCIES)
117 session.install(*(ASYNC_DEPENDENCIES))
118 session.install(".")
119 session.run(
120 "pytest",
121 "--cov=google.auth",
122 "--cov=google.oauth2",
123 "--cov=tests",
124 "--cov=tests_async",
125 "--cov-report=",
126 "tests",
127 "tests_async",
128 )
129 session.run("coverage", "report", "--show-missing", "--fail-under=100")
130
131
132 @nox.session(python="3.7")
133 def docgen(session):
134 session.env["SPHINX_APIDOC_OPTIONS"] = "members,inherited-members,show-inheritance"
135 session.install(*TEST_DEPENDENCIES)
136 session.install("sphinx")
137 session.install(".")
138 session.run("rm", "-r", "docs/reference")
139 session.run(
140 "sphinx-apidoc",
141 "--output-dir",
142 "docs/reference",
143 "--separate",
144 "--module-first",
145 "google",
146 )
147
148
149 @nox.session(python="3.7")
150 def docs(session):
151 """Build the docs for this library."""
152
153 session.install("-e", ".[aiohttp]")
154 session.install(
155 "sphinx<3.0.0", "alabaster", "recommonmark", "sphinx-docstring-typing"
156 )
157
158 shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
159 session.run(
160 "sphinx-build",
161 "-T", # show full traceback on exception
162 "-W", # warnings as errors
163 "-N", # no colors
164 "-b",
165 "html",
166 "-d",
167 os.path.join("docs", "_build", "doctrees", ""),
168 os.path.join("docs", ""),
169 os.path.join("docs", "_build", "html", ""),
170 )
171
172
173 @nox.session(python="pypy")
174 def pypy(session):
175 session.install(*TEST_DEPENDENCIES)
176 session.install(*ASYNC_DEPENDENCIES)
177 session.install(".")
178 session.run(
179 "pytest",
180 f"--junitxml=unit_{session.python}_sponge_log.xml",
181 "--cov=google.auth",
182 "--cov=google.oauth2",
183 "--cov=tests",
184 "tests",
185 "tests_async",
186 )
187
[end of noxfile.py]
[start of setup.py]
1 # Copyright 2014 Google Inc.
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 io
16 import os
17
18 from setuptools import find_packages
19 from setuptools import setup
20
21
22 DEPENDENCIES = (
23 "cachetools>=2.0.0,<5.0",
24 "pyasn1-modules>=0.2.1",
25 # rsa==4.5 is the last version to support 2.7
26 # https://github.com/sybrenstuvel/python-rsa/issues/152#issuecomment-643470233
27 'rsa<4.6; python_version < "3.6"',
28 'rsa>=3.1.4,<5; python_version >= "3.6"',
29 "setuptools>=40.3.0",
30 "six>=1.9.0",
31 )
32
33 extras = {
34 "aiohttp": "aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'",
35 "pyopenssl": "pyopenssl>=20.0.0",
36 "reauth": "pyu2f>=0.1.5",
37 }
38
39 with io.open("README.rst", "r") as fh:
40 long_description = fh.read()
41
42 package_root = os.path.abspath(os.path.dirname(__file__))
43
44 version = {}
45 with open(os.path.join(package_root, "google/auth/version.py")) as fp:
46 exec(fp.read(), version)
47 version = version["__version__"]
48
49 setup(
50 name="google-auth",
51 version=version,
52 author="Google Cloud Platform",
53 author_email="[email protected]",
54 description="Google Authentication Library",
55 long_description=long_description,
56 url="https://github.com/googleapis/google-auth-library-python",
57 packages=find_packages(exclude=("tests*", "system_tests*")),
58 namespace_packages=("google",),
59 install_requires=DEPENDENCIES,
60 extras_require=extras,
61 python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*",
62 license="Apache 2.0",
63 keywords="google auth oauth client",
64 classifiers=[
65 "Programming Language :: Python :: 2",
66 "Programming Language :: Python :: 2.7",
67 "Programming Language :: Python :: 3",
68 "Programming Language :: Python :: 3.6",
69 "Programming Language :: Python :: 3.7",
70 "Programming Language :: Python :: 3.8",
71 "Programming Language :: Python :: 3.9",
72 "Development Status :: 5 - Production/Stable",
73 "Intended Audience :: Developers",
74 "License :: OSI Approved :: Apache Software License",
75 "Operating System :: POSIX",
76 "Operating System :: Microsoft :: Windows",
77 "Operating System :: MacOS :: MacOS X",
78 "Operating System :: OS Independent",
79 "Topic :: Internet :: WWW/HTTP",
80 ],
81 )
82
[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/noxfile.py b/noxfile.py
--- a/noxfile.py
+++ b/noxfile.py
@@ -69,13 +69,14 @@
)
[email protected](python="3.6")
[email protected](python="3.8")
def blacken(session):
"""Run black.
Format code to uniform standard.
- This currently uses Python 3.6 due to the automated Kokoro run of synthtool.
- That run uses an image that doesn't have 3.6 installed. Before updating this
- check the state of the `gcp_ubuntu_config` we use for that Kokoro run.
+ The Python version should be consistent with what is
+ supplied in the Python Owlbot postprocessor.
+
+ https://github.com/googleapis/synthtool/blob/master/docker/owlbot/python/Dockerfile
"""
session.install(BLACK_VERSION)
session.run("black", *BLACK_PATHS)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,11 @@
)
extras = {
- "aiohttp": "aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'",
+ "aiohttp": [
+ "aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'",
+ "requests >= 2.18.0, < 3.0.0dev",
+ "urllib3 >= 1.0.0, <2.0.0dev",
+ ],
"pyopenssl": "pyopenssl>=20.0.0",
"reauth": "pyu2f>=0.1.5",
}
| {"golden_diff": "diff --git a/noxfile.py b/noxfile.py\n--- a/noxfile.py\n+++ b/noxfile.py\n@@ -69,13 +69,14 @@\n )\n \n \[email protected](python=\"3.6\")\[email protected](python=\"3.8\")\n def blacken(session):\n \"\"\"Run black.\n Format code to uniform standard.\n- This currently uses Python 3.6 due to the automated Kokoro run of synthtool.\n- That run uses an image that doesn't have 3.6 installed. Before updating this\n- check the state of the `gcp_ubuntu_config` we use for that Kokoro run.\n+ The Python version should be consistent with what is\n+ supplied in the Python Owlbot postprocessor.\n+\n+ https://github.com/googleapis/synthtool/blob/master/docker/owlbot/python/Dockerfile\n \"\"\"\n session.install(BLACK_VERSION)\n session.run(\"black\", *BLACK_PATHS)\ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -31,7 +31,11 @@\n )\n \n extras = {\n- \"aiohttp\": \"aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'\",\n+ \"aiohttp\": [\n+ \"aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'\",\n+ \"requests >= 2.18.0, < 3.0.0dev\",\n+ \"urllib3 >= 1.0.0, <2.0.0dev\",\n+ ],\n \"pyopenssl\": \"pyopenssl>=20.0.0\",\n \"reauth\": \"pyu2f>=0.1.5\",\n }\n", "issue": "Silent dependency on urllib3 in _aiohttp_requests\n#### Environment details\r\n\r\n - OS: OSX, Linux\r\n - Python version: 3.7\r\n - pip version:\r\n - `google-auth` version: 1.24.0\r\n\r\n#### Steps to reproduce\r\n\r\n 1. Setup a clean virtualenv\r\n 2. pip install google-auth==1.24.0 aiohttp==3.5.4 (version I happen to be using)\r\n 3. Run \"from google.auth.transport import _aiohttp_requests\" in a python3 session\r\n\r\nYou should get a ModuleNotFoundError for \"urllib3\"\n", "before_files": [{"content": "# Copyright 2019 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\nimport shutil\nimport os\nimport nox\n\nTEST_DEPENDENCIES = [\n \"flask\",\n \"freezegun\",\n \"mock\",\n \"oauth2client\",\n \"pyopenssl\",\n \"pytest\",\n \"pytest-cov\",\n \"pytest-localserver\",\n \"pyu2f\",\n \"requests\",\n \"urllib3\",\n \"cryptography\",\n \"responses\",\n \"grpcio\",\n]\n\nASYNC_DEPENDENCIES = [\n \"pytest-asyncio\",\n \"aioresponses\",\n \"asynctest\",\n \"aiohttp!=3.7.4.post0\",\n]\n\nBLACK_VERSION = \"black==19.3b0\"\nBLACK_PATHS = [\n \"google\",\n \"tests\",\n \"tests_async\",\n \"noxfile.py\",\n \"setup.py\",\n \"docs/conf.py\",\n]\n\n\[email protected](python=\"3.7\")\ndef lint(session):\n session.install(\"flake8\", \"flake8-import-order\", \"docutils\", BLACK_VERSION)\n session.install(\".\")\n session.run(\"black\", \"--check\", *BLACK_PATHS)\n session.run(\n \"flake8\",\n \"--import-order-style=google\",\n \"--application-import-names=google,tests,system_tests\",\n \"google\",\n \"tests\",\n \"tests_async\",\n )\n session.run(\n \"python\", \"setup.py\", \"check\", \"--metadata\", \"--restructuredtext\", \"--strict\"\n )\n\n\[email protected](python=\"3.6\")\ndef blacken(session):\n \"\"\"Run black.\n Format code to uniform standard.\n This currently uses Python 3.6 due to the automated Kokoro run of synthtool.\n That run uses an image that doesn't have 3.6 installed. Before updating this\n check the state of the `gcp_ubuntu_config` we use for that Kokoro run.\n \"\"\"\n session.install(BLACK_VERSION)\n session.run(\"black\", *BLACK_PATHS)\n\n\[email protected](python=[\"3.6\", \"3.7\", \"3.8\", \"3.9\"])\ndef unit(session):\n session.install(*TEST_DEPENDENCIES)\n session.install(*(ASYNC_DEPENDENCIES))\n session.install(\".\")\n session.run(\n \"pytest\",\n f\"--junitxml=unit_{session.python}_sponge_log.xml\",\n \"--cov=google.auth\",\n \"--cov=google.oauth2\",\n \"--cov=tests\",\n \"tests\",\n \"tests_async\",\n )\n\n\[email protected](python=[\"2.7\"])\ndef unit_prev_versions(session):\n session.install(\".\")\n session.install(*TEST_DEPENDENCIES)\n session.run(\n \"pytest\",\n f\"--junitxml=unit_{session.python}_sponge_log.xml\",\n \"--cov=google.auth\",\n \"--cov=google.oauth2\",\n \"--cov=tests\",\n \"tests\",\n )\n\n\[email protected](python=\"3.7\")\ndef cover(session):\n session.install(*TEST_DEPENDENCIES)\n session.install(*(ASYNC_DEPENDENCIES))\n session.install(\".\")\n session.run(\n \"pytest\",\n \"--cov=google.auth\",\n \"--cov=google.oauth2\",\n \"--cov=tests\",\n \"--cov=tests_async\",\n \"--cov-report=\",\n \"tests\",\n \"tests_async\",\n )\n session.run(\"coverage\", \"report\", \"--show-missing\", \"--fail-under=100\")\n\n\[email protected](python=\"3.7\")\ndef docgen(session):\n session.env[\"SPHINX_APIDOC_OPTIONS\"] = \"members,inherited-members,show-inheritance\"\n session.install(*TEST_DEPENDENCIES)\n session.install(\"sphinx\")\n session.install(\".\")\n session.run(\"rm\", \"-r\", \"docs/reference\")\n session.run(\n \"sphinx-apidoc\",\n \"--output-dir\",\n \"docs/reference\",\n \"--separate\",\n \"--module-first\",\n \"google\",\n )\n\n\[email protected](python=\"3.7\")\ndef docs(session):\n \"\"\"Build the docs for this library.\"\"\"\n\n session.install(\"-e\", \".[aiohttp]\")\n session.install(\n \"sphinx<3.0.0\", \"alabaster\", \"recommonmark\", \"sphinx-docstring-typing\"\n )\n\n shutil.rmtree(os.path.join(\"docs\", \"_build\"), ignore_errors=True)\n session.run(\n \"sphinx-build\",\n \"-T\", # show full traceback on exception\n \"-W\", # warnings as errors\n \"-N\", # no colors\n \"-b\",\n \"html\",\n \"-d\",\n os.path.join(\"docs\", \"_build\", \"doctrees\", \"\"),\n os.path.join(\"docs\", \"\"),\n os.path.join(\"docs\", \"_build\", \"html\", \"\"),\n )\n\n\[email protected](python=\"pypy\")\ndef pypy(session):\n session.install(*TEST_DEPENDENCIES)\n session.install(*ASYNC_DEPENDENCIES)\n session.install(\".\")\n session.run(\n \"pytest\",\n f\"--junitxml=unit_{session.python}_sponge_log.xml\",\n \"--cov=google.auth\",\n \"--cov=google.oauth2\",\n \"--cov=tests\",\n \"tests\",\n \"tests_async\",\n )\n", "path": "noxfile.py"}, {"content": "# Copyright 2014 Google 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\nimport io\nimport os\n\nfrom setuptools import find_packages\nfrom setuptools import setup\n\n\nDEPENDENCIES = (\n \"cachetools>=2.0.0,<5.0\",\n \"pyasn1-modules>=0.2.1\",\n # rsa==4.5 is the last version to support 2.7\n # https://github.com/sybrenstuvel/python-rsa/issues/152#issuecomment-643470233\n 'rsa<4.6; python_version < \"3.6\"',\n 'rsa>=3.1.4,<5; python_version >= \"3.6\"',\n \"setuptools>=40.3.0\",\n \"six>=1.9.0\",\n)\n\nextras = {\n \"aiohttp\": \"aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'\",\n \"pyopenssl\": \"pyopenssl>=20.0.0\",\n \"reauth\": \"pyu2f>=0.1.5\",\n}\n\nwith io.open(\"README.rst\", \"r\") as fh:\n long_description = fh.read()\n\npackage_root = os.path.abspath(os.path.dirname(__file__))\n\nversion = {}\nwith open(os.path.join(package_root, \"google/auth/version.py\")) as fp:\n exec(fp.read(), version)\nversion = version[\"__version__\"]\n\nsetup(\n name=\"google-auth\",\n version=version,\n author=\"Google Cloud Platform\",\n author_email=\"[email protected]\",\n description=\"Google Authentication Library\",\n long_description=long_description,\n url=\"https://github.com/googleapis/google-auth-library-python\",\n packages=find_packages(exclude=(\"tests*\", \"system_tests*\")),\n namespace_packages=(\"google\",),\n install_requires=DEPENDENCIES,\n extras_require=extras,\n python_requires=\">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*\",\n license=\"Apache 2.0\",\n keywords=\"google auth oauth client\",\n classifiers=[\n \"Programming Language :: Python :: 2\",\n \"Programming Language :: Python :: 2.7\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.6\",\n \"Programming Language :: Python :: 3.7\",\n \"Programming Language :: Python :: 3.8\",\n \"Programming Language :: Python :: 3.9\",\n \"Development Status :: 5 - Production/Stable\",\n \"Intended Audience :: Developers\",\n \"License :: OSI Approved :: Apache Software License\",\n \"Operating System :: POSIX\",\n \"Operating System :: Microsoft :: Windows\",\n \"Operating System :: MacOS :: MacOS X\",\n \"Operating System :: OS Independent\",\n \"Topic :: Internet :: WWW/HTTP\",\n ],\n)\n", "path": "setup.py"}]} | 3,290 | 408 |
gh_patches_debug_16520 | rasdani/github-patches | git_diff | sopel-irc__sopel-1249 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
FreeBSD [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:777)
sopel/config/core_section.py
# python3.6 [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:777)
```
from sys import platform
if 'freebsd' in platform:
certs = '/etc/ssl/cert.pem'
def _find_certs():
certs = '/etc/pki/tls/cert.pem'
if not os.path.isfile(certs):
certs = '/etc/ssl/certs/ca-certificates.crt'
if not os.path.isfile(certs):
return None
return certs
```
Seems like there is missing a good validation on what platform it is running on and where the certs are stored.
</issue>
<code>
[start of sopel/config/core_section.py]
1 # coding=utf-8
2
3 from __future__ import unicode_literals, absolute_import, print_function, division
4
5 import os.path
6
7 from sopel.config.types import (
8 StaticSection, ValidatedAttribute, ListAttribute, ChoiceAttribute,
9 FilenameAttribute, NO_DEFAULT
10 )
11 from sopel.tools import Identifier
12
13
14 def _find_certs():
15 certs = '/etc/pki/tls/cert.pem'
16 if not os.path.isfile(certs):
17 certs = '/etc/ssl/certs/ca-certificates.crt'
18 if not os.path.isfile(certs):
19 return None
20 return certs
21
22
23 def configure(config):
24 config.core.configure_setting('nick', 'Enter the nickname for your bot.')
25 config.core.configure_setting('host', 'Enter the server to connect to.')
26 config.core.configure_setting('use_ssl', 'Should the bot connect with SSL?')
27 if config.core.use_ssl:
28 default_port = 6697
29 else:
30 default_port = 6667
31 config.core.configure_setting('port', 'Enter the port to connect on.',
32 default=default_port)
33 config.core.configure_setting(
34 'owner', "Enter your own IRC name (or that of the bot's owner)")
35 config.core.configure_setting(
36 'channels',
37 'Enter the channels to connect to at startup, separated by commas.'
38 )
39
40
41 class CoreSection(StaticSection):
42 """The config section used for configuring the bot itself."""
43 admins = ListAttribute('admins')
44 """The list of people (other than the owner) who can administer the bot"""
45
46 admin_accounts = ListAttribute('admin_accounts')
47 """The list of accounts (other than the owner's) who can administer the bot.
48
49 This should not be set for networks that do not support IRCv3 account
50 capabilities."""
51
52 auth_method = ChoiceAttribute('auth_method', choices=[
53 'nickserv', 'authserv', 'Q', 'sasl', 'server'])
54 """The method to use to authenticate with the server.
55
56 Can be ``nickserv``, ``authserv``, ``Q``, ``sasl``, or ``server``."""
57
58 auth_password = ValidatedAttribute('auth_password')
59 """The password to use to authenticate with the server."""
60
61 auth_target = ValidatedAttribute('auth_target')
62 """The user to use for nickserv authentication, or the SASL mechanism.
63
64 May not apply, depending on ``auth_method``. Defaults to NickServ for
65 nickserv auth, and PLAIN for SASL auth."""
66
67 auth_username = ValidatedAttribute('auth_username')
68 """The username/account to use to authenticate with the server.
69
70 May not apply, depending on ``auth_method``."""
71
72 bind_host = ValidatedAttribute('bind_host')
73 """Bind the connection to a specific IP"""
74
75 ca_certs = FilenameAttribute('ca_certs', default=_find_certs())
76 """The path of the CA certs pem file"""
77
78 channels = ListAttribute('channels')
79 """List of channels for the bot to join when it connects"""
80
81 db_filename = ValidatedAttribute('db_filename')
82 """The filename for Sopel's database."""
83
84 default_time_format = ValidatedAttribute('default_time_format',
85 default='%Y-%m-%d - %T%Z')
86 """The default format to use for time in messages."""
87
88 default_timezone = ValidatedAttribute('default_timezone')
89 """The default timezone to use for time in messages."""
90
91 enable = ListAttribute('enable')
92 """A whitelist of the only modules you want to enable."""
93
94 exclude = ListAttribute('exclude')
95 """A list of modules which should not be loaded."""
96
97 extra = ListAttribute('extra')
98 """A list of other directories you'd like to include modules from."""
99
100 help_prefix = ValidatedAttribute('help_prefix', default='.')
101 """The prefix to use in help"""
102
103 @property
104 def homedir(self):
105 """The directory in which various files are stored at runtime.
106
107 By default, this is the same directory as the config. It can not be
108 changed at runtime.
109 """
110 return self._parent.homedir
111
112 host = ValidatedAttribute('host', default='irc.dftba.net')
113 """The server to connect to."""
114
115 host_blocks = ListAttribute('host_blocks')
116 """A list of hostmasks which Sopel should ignore.
117
118 Regular expression syntax is used"""
119
120 log_raw = ValidatedAttribute('log_raw', bool, default=True)
121 """Whether a log of raw lines as sent and recieved should be kept."""
122
123 logdir = FilenameAttribute('logdir', directory=True, default='logs')
124 """Directory in which to place logs."""
125
126 logging_channel = ValidatedAttribute('logging_channel', Identifier)
127 """The channel to send logging messages to."""
128
129 logging_level = ChoiceAttribute('logging_level',
130 ['CRITICAL', 'ERROR', 'WARNING', 'INFO',
131 'DEBUG'],
132 'WARNING')
133 """The lowest severity of logs to display."""
134
135 modes = ValidatedAttribute('modes', default='B')
136 """User modes to be set on connection."""
137
138 name = ValidatedAttribute('name', default='Sopel: http://sopel.chat')
139 """The "real name" of your bot for WHOIS responses."""
140
141 nick = ValidatedAttribute('nick', Identifier, default=Identifier('Sopel'))
142 """The nickname for the bot"""
143
144 nick_blocks = ListAttribute('nick_blocks')
145 """A list of nicks which Sopel should ignore.
146
147 Regular expression syntax is used."""
148
149 not_configured = ValidatedAttribute('not_configured', bool, default=False)
150 """For package maintainers. Not used in normal configurations.
151
152 This allows software packages to install a default config file, with this
153 set to true, so that the bot will not run until it has been properly
154 configured."""
155
156 owner = ValidatedAttribute('owner', default=NO_DEFAULT)
157 """The IRC name of the owner of the bot."""
158
159 owner_account = ValidatedAttribute('owner_account')
160 """The services account name of the owner of the bot.
161
162 This should only be set on networks which support IRCv3 account
163 capabilities.
164 """
165
166 pid_dir = FilenameAttribute('pid_dir', directory=True, default='.')
167 """The directory in which to put the file Sopel uses to track its process ID.
168
169 You probably do not need to change this unless you're managing Sopel with
170 systemd or similar."""
171
172 port = ValidatedAttribute('port', int, default=6667)
173 """The port to connect on."""
174
175 prefix = ValidatedAttribute('prefix', default='\.')
176 """The prefix to add to the beginning of commands.
177
178 It is a regular expression (so the default, ``\.``, means commands start
179 with a period), though using capturing groups will create problems."""
180
181 reply_errors = ValidatedAttribute('reply_errors', bool, default=True)
182 """Whether to message the sender of a message that triggered an error with the exception."""
183
184 throttle_join = ValidatedAttribute('throttle_join', int)
185 """Slow down the initial join of channels to prevent getting kicked.
186
187 Sopel will only join this many channels at a time, sleeping for a second
188 between each batch. This is unnecessary on most networks."""
189
190 timeout = ValidatedAttribute('timeout', int, default=120)
191 """The amount of time acceptable between pings before timing out."""
192
193 use_ssl = ValidatedAttribute('use_ssl', bool, default=False)
194 """Whether to use a SSL secured connection."""
195
196 user = ValidatedAttribute('user', default='sopel')
197 """The "user" for your bot (the part before the @ in the hostname)."""
198
199 verify_ssl = ValidatedAttribute('verify_ssl', bool, default=True)
200 """Whether to require a trusted SSL certificate for SSL connections."""
201
[end of sopel/config/core_section.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/sopel/config/core_section.py b/sopel/config/core_section.py
--- a/sopel/config/core_section.py
+++ b/sopel/config/core_section.py
@@ -12,12 +12,26 @@
def _find_certs():
- certs = '/etc/pki/tls/cert.pem'
- if not os.path.isfile(certs):
- certs = '/etc/ssl/certs/ca-certificates.crt'
- if not os.path.isfile(certs):
- return None
- return certs
+ """
+ Find the TLS root CA store.
+
+ :returns: str (path to file)
+ """
+ # check if the root CA store is at a known location
+ locations = [
+ '/etc/pki/tls/cert.pem', # best first guess
+ '/etc/ssl/certs/ca-certificates.crt', # Debian
+ '/etc/ssl/cert.pem', # FreeBSD base OpenSSL
+ '/usr/local/openssl/cert.pem', # FreeBSD userland OpenSSL
+ '/etc/pki/tls/certs/ca-bundle.crt', # RHEL 6 / Fedora
+ '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem', # RHEL 7 / CentOS
+ '/etc/pki/tls/cacert.pem', # OpenELEC
+ '/etc/ssl/ca-bundle.pem', # OpenSUSE
+ ]
+ for certs in locations:
+ if os.path.isfile(certs):
+ return certs
+ return None
def configure(config):
| {"golden_diff": "diff --git a/sopel/config/core_section.py b/sopel/config/core_section.py\n--- a/sopel/config/core_section.py\n+++ b/sopel/config/core_section.py\n@@ -12,12 +12,26 @@\n \n \n def _find_certs():\n- certs = '/etc/pki/tls/cert.pem'\n- if not os.path.isfile(certs):\n- certs = '/etc/ssl/certs/ca-certificates.crt'\n- if not os.path.isfile(certs):\n- return None\n- return certs\n+ \"\"\"\n+ Find the TLS root CA store.\n+\n+ :returns: str (path to file)\n+ \"\"\"\n+ # check if the root CA store is at a known location\n+ locations = [\n+ '/etc/pki/tls/cert.pem', # best first guess\n+ '/etc/ssl/certs/ca-certificates.crt', # Debian\n+ '/etc/ssl/cert.pem', # FreeBSD base OpenSSL\n+ '/usr/local/openssl/cert.pem', # FreeBSD userland OpenSSL\n+ '/etc/pki/tls/certs/ca-bundle.crt', # RHEL 6 / Fedora\n+ '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem', # RHEL 7 / CentOS\n+ '/etc/pki/tls/cacert.pem', # OpenELEC\n+ '/etc/ssl/ca-bundle.pem', # OpenSUSE\n+ ]\n+ for certs in locations:\n+ if os.path.isfile(certs):\n+ return certs\n+ return None\n \n \n def configure(config):\n", "issue": "FreeBSD [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:777)\nsopel/config/core_section.py\r\n# python3.6 [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:777)\r\n```\r\nfrom sys import platform\r\n\r\nif 'freebsd' in platform:\r\n certs = '/etc/ssl/cert.pem'\r\n\r\ndef _find_certs():\r\n certs = '/etc/pki/tls/cert.pem'\r\n if not os.path.isfile(certs):\r\n certs = '/etc/ssl/certs/ca-certificates.crt'\r\n if not os.path.isfile(certs):\r\n return None\r\n return certs\r\n\r\n```\r\nSeems like there is missing a good validation on what platform it is running on and where the certs are stored.\r\n \n", "before_files": [{"content": "# coding=utf-8\n\nfrom __future__ import unicode_literals, absolute_import, print_function, division\n\nimport os.path\n\nfrom sopel.config.types import (\n StaticSection, ValidatedAttribute, ListAttribute, ChoiceAttribute,\n FilenameAttribute, NO_DEFAULT\n)\nfrom sopel.tools import Identifier\n\n\ndef _find_certs():\n certs = '/etc/pki/tls/cert.pem'\n if not os.path.isfile(certs):\n certs = '/etc/ssl/certs/ca-certificates.crt'\n if not os.path.isfile(certs):\n return None\n return certs\n\n\ndef configure(config):\n config.core.configure_setting('nick', 'Enter the nickname for your bot.')\n config.core.configure_setting('host', 'Enter the server to connect to.')\n config.core.configure_setting('use_ssl', 'Should the bot connect with SSL?')\n if config.core.use_ssl:\n default_port = 6697\n else:\n default_port = 6667\n config.core.configure_setting('port', 'Enter the port to connect on.',\n default=default_port)\n config.core.configure_setting(\n 'owner', \"Enter your own IRC name (or that of the bot's owner)\")\n config.core.configure_setting(\n 'channels',\n 'Enter the channels to connect to at startup, separated by commas.'\n )\n\n\nclass CoreSection(StaticSection):\n \"\"\"The config section used for configuring the bot itself.\"\"\"\n admins = ListAttribute('admins')\n \"\"\"The list of people (other than the owner) who can administer the bot\"\"\"\n\n admin_accounts = ListAttribute('admin_accounts')\n \"\"\"The list of accounts (other than the owner's) who can administer the bot.\n\n This should not be set for networks that do not support IRCv3 account\n capabilities.\"\"\"\n\n auth_method = ChoiceAttribute('auth_method', choices=[\n 'nickserv', 'authserv', 'Q', 'sasl', 'server'])\n \"\"\"The method to use to authenticate with the server.\n\n Can be ``nickserv``, ``authserv``, ``Q``, ``sasl``, or ``server``.\"\"\"\n\n auth_password = ValidatedAttribute('auth_password')\n \"\"\"The password to use to authenticate with the server.\"\"\"\n\n auth_target = ValidatedAttribute('auth_target')\n \"\"\"The user to use for nickserv authentication, or the SASL mechanism.\n\n May not apply, depending on ``auth_method``. Defaults to NickServ for\n nickserv auth, and PLAIN for SASL auth.\"\"\"\n\n auth_username = ValidatedAttribute('auth_username')\n \"\"\"The username/account to use to authenticate with the server.\n\n May not apply, depending on ``auth_method``.\"\"\"\n\n bind_host = ValidatedAttribute('bind_host')\n \"\"\"Bind the connection to a specific IP\"\"\"\n\n ca_certs = FilenameAttribute('ca_certs', default=_find_certs())\n \"\"\"The path of the CA certs pem file\"\"\"\n\n channels = ListAttribute('channels')\n \"\"\"List of channels for the bot to join when it connects\"\"\"\n\n db_filename = ValidatedAttribute('db_filename')\n \"\"\"The filename for Sopel's database.\"\"\"\n\n default_time_format = ValidatedAttribute('default_time_format',\n default='%Y-%m-%d - %T%Z')\n \"\"\"The default format to use for time in messages.\"\"\"\n\n default_timezone = ValidatedAttribute('default_timezone')\n \"\"\"The default timezone to use for time in messages.\"\"\"\n\n enable = ListAttribute('enable')\n \"\"\"A whitelist of the only modules you want to enable.\"\"\"\n\n exclude = ListAttribute('exclude')\n \"\"\"A list of modules which should not be loaded.\"\"\"\n\n extra = ListAttribute('extra')\n \"\"\"A list of other directories you'd like to include modules from.\"\"\"\n\n help_prefix = ValidatedAttribute('help_prefix', default='.')\n \"\"\"The prefix to use in help\"\"\"\n\n @property\n def homedir(self):\n \"\"\"The directory in which various files are stored at runtime.\n\n By default, this is the same directory as the config. It can not be\n changed at runtime.\n \"\"\"\n return self._parent.homedir\n\n host = ValidatedAttribute('host', default='irc.dftba.net')\n \"\"\"The server to connect to.\"\"\"\n\n host_blocks = ListAttribute('host_blocks')\n \"\"\"A list of hostmasks which Sopel should ignore.\n\n Regular expression syntax is used\"\"\"\n\n log_raw = ValidatedAttribute('log_raw', bool, default=True)\n \"\"\"Whether a log of raw lines as sent and recieved should be kept.\"\"\"\n\n logdir = FilenameAttribute('logdir', directory=True, default='logs')\n \"\"\"Directory in which to place logs.\"\"\"\n\n logging_channel = ValidatedAttribute('logging_channel', Identifier)\n \"\"\"The channel to send logging messages to.\"\"\"\n\n logging_level = ChoiceAttribute('logging_level',\n ['CRITICAL', 'ERROR', 'WARNING', 'INFO',\n 'DEBUG'],\n 'WARNING')\n \"\"\"The lowest severity of logs to display.\"\"\"\n\n modes = ValidatedAttribute('modes', default='B')\n \"\"\"User modes to be set on connection.\"\"\"\n\n name = ValidatedAttribute('name', default='Sopel: http://sopel.chat')\n \"\"\"The \"real name\" of your bot for WHOIS responses.\"\"\"\n\n nick = ValidatedAttribute('nick', Identifier, default=Identifier('Sopel'))\n \"\"\"The nickname for the bot\"\"\"\n\n nick_blocks = ListAttribute('nick_blocks')\n \"\"\"A list of nicks which Sopel should ignore.\n\n Regular expression syntax is used.\"\"\"\n\n not_configured = ValidatedAttribute('not_configured', bool, default=False)\n \"\"\"For package maintainers. Not used in normal configurations.\n\n This allows software packages to install a default config file, with this\n set to true, so that the bot will not run until it has been properly\n configured.\"\"\"\n\n owner = ValidatedAttribute('owner', default=NO_DEFAULT)\n \"\"\"The IRC name of the owner of the bot.\"\"\"\n\n owner_account = ValidatedAttribute('owner_account')\n \"\"\"The services account name of the owner of the bot.\n\n This should only be set on networks which support IRCv3 account\n capabilities.\n \"\"\"\n\n pid_dir = FilenameAttribute('pid_dir', directory=True, default='.')\n \"\"\"The directory in which to put the file Sopel uses to track its process ID.\n\n You probably do not need to change this unless you're managing Sopel with\n systemd or similar.\"\"\"\n\n port = ValidatedAttribute('port', int, default=6667)\n \"\"\"The port to connect on.\"\"\"\n\n prefix = ValidatedAttribute('prefix', default='\\.')\n \"\"\"The prefix to add to the beginning of commands.\n\n It is a regular expression (so the default, ``\\.``, means commands start\n with a period), though using capturing groups will create problems.\"\"\"\n\n reply_errors = ValidatedAttribute('reply_errors', bool, default=True)\n \"\"\"Whether to message the sender of a message that triggered an error with the exception.\"\"\"\n\n throttle_join = ValidatedAttribute('throttle_join', int)\n \"\"\"Slow down the initial join of channels to prevent getting kicked.\n\n Sopel will only join this many channels at a time, sleeping for a second\n between each batch. This is unnecessary on most networks.\"\"\"\n\n timeout = ValidatedAttribute('timeout', int, default=120)\n \"\"\"The amount of time acceptable between pings before timing out.\"\"\"\n\n use_ssl = ValidatedAttribute('use_ssl', bool, default=False)\n \"\"\"Whether to use a SSL secured connection.\"\"\"\n\n user = ValidatedAttribute('user', default='sopel')\n \"\"\"The \"user\" for your bot (the part before the @ in the hostname).\"\"\"\n\n verify_ssl = ValidatedAttribute('verify_ssl', bool, default=True)\n \"\"\"Whether to require a trusted SSL certificate for SSL connections.\"\"\"\n", "path": "sopel/config/core_section.py"}]} | 2,908 | 360 |
gh_patches_debug_18873 | rasdani/github-patches | git_diff | streamlink__streamlink-2911 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[bug] Tv1channel plugin no longer works
## Bug Report
<!-- Replace [ ] with [x] in order to check the box -->
- [x] This is a bug report and I have read the contribution guidelines.
### Reproduction steps / Explicit stream URLs to test
http://tv1channel.org/index.php/livetv fails to open. Stream seems to have moved away to a m3u8 link - either a quick fix or just remove the plugin as it is covered by one of the main plugins.
</issue>
<code>
[start of src/streamlink/plugins/tv1channel.py]
1 import re
2
3 from streamlink.plugin import Plugin
4 from streamlink.plugin.api import useragents
5 from streamlink.plugin.api.utils import itertags
6 from streamlink.stream import HLSStream
7
8
9 class TV1Channel(Plugin):
10 _url_re = re.compile(r'https?://(?:www\.)?tv1channel\.org/(?!play/)(?:index\.php/livetv)?')
11
12 @classmethod
13 def can_handle_url(cls, url):
14 return cls._url_re.match(url) is not None
15
16 def _get_streams(self):
17 self.session.http.headers.update({'User-Agent': useragents.FIREFOX})
18 res = self.session.http.get(self.url)
19 for iframe in itertags(res.text, 'iframe'):
20 if 'cdn.netbadgers.com' not in iframe.attributes.get('src'):
21 continue
22
23 res = self.session.http.get(iframe.attributes.get('src'))
24 for source in itertags(res.text, 'source'):
25 if source.attributes.get('src') and source.attributes.get('src').endswith('.m3u8'):
26 return HLSStream.parse_variant_playlist(self.session,
27 source.attributes.get('src'))
28
29 break
30
31
32 __plugin__ = TV1Channel
33
[end of src/streamlink/plugins/tv1channel.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/streamlink/plugins/tv1channel.py b/src/streamlink/plugins/tv1channel.py
deleted file mode 100644
--- a/src/streamlink/plugins/tv1channel.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import re
-
-from streamlink.plugin import Plugin
-from streamlink.plugin.api import useragents
-from streamlink.plugin.api.utils import itertags
-from streamlink.stream import HLSStream
-
-
-class TV1Channel(Plugin):
- _url_re = re.compile(r'https?://(?:www\.)?tv1channel\.org/(?!play/)(?:index\.php/livetv)?')
-
- @classmethod
- def can_handle_url(cls, url):
- return cls._url_re.match(url) is not None
-
- def _get_streams(self):
- self.session.http.headers.update({'User-Agent': useragents.FIREFOX})
- res = self.session.http.get(self.url)
- for iframe in itertags(res.text, 'iframe'):
- if 'cdn.netbadgers.com' not in iframe.attributes.get('src'):
- continue
-
- res = self.session.http.get(iframe.attributes.get('src'))
- for source in itertags(res.text, 'source'):
- if source.attributes.get('src') and source.attributes.get('src').endswith('.m3u8'):
- return HLSStream.parse_variant_playlist(self.session,
- source.attributes.get('src'))
-
- break
-
-
-__plugin__ = TV1Channel
| {"golden_diff": "diff --git a/src/streamlink/plugins/tv1channel.py b/src/streamlink/plugins/tv1channel.py\ndeleted file mode 100644\n--- a/src/streamlink/plugins/tv1channel.py\n+++ /dev/null\n@@ -1,32 +0,0 @@\n-import re\n-\n-from streamlink.plugin import Plugin\n-from streamlink.plugin.api import useragents\n-from streamlink.plugin.api.utils import itertags\n-from streamlink.stream import HLSStream\n-\n-\n-class TV1Channel(Plugin):\n- _url_re = re.compile(r'https?://(?:www\\.)?tv1channel\\.org/(?!play/)(?:index\\.php/livetv)?')\n-\n- @classmethod\n- def can_handle_url(cls, url):\n- return cls._url_re.match(url) is not None\n-\n- def _get_streams(self):\n- self.session.http.headers.update({'User-Agent': useragents.FIREFOX})\n- res = self.session.http.get(self.url)\n- for iframe in itertags(res.text, 'iframe'):\n- if 'cdn.netbadgers.com' not in iframe.attributes.get('src'):\n- continue\n-\n- res = self.session.http.get(iframe.attributes.get('src'))\n- for source in itertags(res.text, 'source'):\n- if source.attributes.get('src') and source.attributes.get('src').endswith('.m3u8'):\n- return HLSStream.parse_variant_playlist(self.session,\n- source.attributes.get('src'))\n-\n- break\n-\n-\n-__plugin__ = TV1Channel\n", "issue": "[bug] Tv1channel plugin no longer works\n## Bug Report\r\n<!-- Replace [ ] with [x] in order to check the box -->\r\n- [x] This is a bug report and I have read the contribution guidelines.\r\n\r\n### Reproduction steps / Explicit stream URLs to test\r\n\r\nhttp://tv1channel.org/index.php/livetv fails to open. Stream seems to have moved away to a m3u8 link - either a quick fix or just remove the plugin as it is covered by one of the main plugins.\n", "before_files": [{"content": "import re\n\nfrom streamlink.plugin import Plugin\nfrom streamlink.plugin.api import useragents\nfrom streamlink.plugin.api.utils import itertags\nfrom streamlink.stream import HLSStream\n\n\nclass TV1Channel(Plugin):\n _url_re = re.compile(r'https?://(?:www\\.)?tv1channel\\.org/(?!play/)(?:index\\.php/livetv)?')\n\n @classmethod\n def can_handle_url(cls, url):\n return cls._url_re.match(url) is not None\n\n def _get_streams(self):\n self.session.http.headers.update({'User-Agent': useragents.FIREFOX})\n res = self.session.http.get(self.url)\n for iframe in itertags(res.text, 'iframe'):\n if 'cdn.netbadgers.com' not in iframe.attributes.get('src'):\n continue\n\n res = self.session.http.get(iframe.attributes.get('src'))\n for source in itertags(res.text, 'source'):\n if source.attributes.get('src') and source.attributes.get('src').endswith('.m3u8'):\n return HLSStream.parse_variant_playlist(self.session,\n source.attributes.get('src'))\n\n break\n\n\n__plugin__ = TV1Channel\n", "path": "src/streamlink/plugins/tv1channel.py"}]} | 966 | 339 |
gh_patches_debug_479 | rasdani/github-patches | git_diff | cloud-custodian__cloud-custodian-4910 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
c7n-mailer - azure sendgrid pinned version not compatible with requirements.txt
The requirements.txt is installing sendgrid==6.1.0, but we are pinned to sendgrid==6.0.5.
We should look if it's possible to remove the pin in our setup.py
## Error:
`c7n-mailer 0.5.4 has requirement sendgrid==6.0.5, but you'll have sendgrid 6.1.0 which is incompatible.`
</issue>
<code>
[start of tools/c7n_mailer/setup.py]
1 # Copyright 2015-2017 Capital One Services, 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 from __future__ import absolute_import, division, print_function, unicode_literals
15
16 from io import open
17 from os import path
18 from setuptools import setup, find_packages
19
20 # *Any* updates here should also go into c7n_mailer/deploy.py for lambda packaging.
21 requires = [
22 "Jinja2",
23 "boto3",
24 "jsonschema",
25 "simplejson", # datadog packaging dep
26 "python-dateutil>=2.8",
27 "ruamel.yaml>=0.15.93",
28 "datadog",
29 "sendgrid==6.0.5",
30 "ldap3",
31 "c7n",
32 "redis"]
33
34
35 try:
36 from concurrent import futures # noqa F401
37 except ImportError:
38 # The backport has SyntaxErrors under py36, so avoid installing it.
39 # https://github.com/agronholm/pythonfutures/issues/41
40 requires += ['futures']
41
42 # read the contents of your README file
43 this_directory = path.abspath(path.dirname(__file__))
44 readme = path.join(this_directory, 'README.md')
45 long_description = ''
46 if path.exists(readme):
47 with open(readme, encoding='utf-8') as f:
48 long_description = f.read()
49
50 setup(
51 name="c7n_mailer",
52 version='0.5.4',
53 description="Cloud Custodian - Reference Mailer",
54 long_description=long_description,
55 long_description_content_type='text/markdown',
56 classifiers=[
57 "Topic :: System :: Systems Administration",
58 "Topic :: System :: Distributed Computing"
59 ],
60 url="https://github.com/cloud-custodian/cloud-custodian",
61 license="Apache-2.0",
62 packages=find_packages(),
63 entry_points={
64 'console_scripts': [
65 'c7n-mailer = c7n_mailer.cli:main',
66 'c7n-mailer-replay = c7n_mailer.replay:main'
67 ]
68 },
69 install_requires=requires,
70 package_data={str(''): [str('msg-templates/*.j2')]},
71 )
72
[end of tools/c7n_mailer/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/tools/c7n_mailer/setup.py b/tools/c7n_mailer/setup.py
--- a/tools/c7n_mailer/setup.py
+++ b/tools/c7n_mailer/setup.py
@@ -26,7 +26,7 @@
"python-dateutil>=2.8",
"ruamel.yaml>=0.15.93",
"datadog",
- "sendgrid==6.0.5",
+ "sendgrid>=6.0.5,<7.0",
"ldap3",
"c7n",
"redis"]
| {"golden_diff": "diff --git a/tools/c7n_mailer/setup.py b/tools/c7n_mailer/setup.py\n--- a/tools/c7n_mailer/setup.py\n+++ b/tools/c7n_mailer/setup.py\n@@ -26,7 +26,7 @@\n \"python-dateutil>=2.8\",\n \"ruamel.yaml>=0.15.93\",\n \"datadog\",\n- \"sendgrid==6.0.5\",\n+ \"sendgrid>=6.0.5,<7.0\",\n \"ldap3\",\n \"c7n\",\n \"redis\"]\n", "issue": "c7n-mailer - azure sendgrid pinned version not compatible with requirements.txt\nThe requirements.txt is installing sendgrid==6.1.0, but we are pinned to sendgrid==6.0.5.\r\n\r\nWe should look if it's possible to remove the pin in our setup.py\r\n\r\n## Error:\r\n`c7n-mailer 0.5.4 has requirement sendgrid==6.0.5, but you'll have sendgrid 6.1.0 which is incompatible.`\n", "before_files": [{"content": "# Copyright 2015-2017 Capital One Services, 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.\nfrom __future__ import absolute_import, division, print_function, unicode_literals\n\nfrom io import open\nfrom os import path\nfrom setuptools import setup, find_packages\n\n# *Any* updates here should also go into c7n_mailer/deploy.py for lambda packaging.\nrequires = [\n \"Jinja2\",\n \"boto3\",\n \"jsonschema\",\n \"simplejson\", # datadog packaging dep\n \"python-dateutil>=2.8\",\n \"ruamel.yaml>=0.15.93\",\n \"datadog\",\n \"sendgrid==6.0.5\",\n \"ldap3\",\n \"c7n\",\n \"redis\"]\n\n\ntry:\n from concurrent import futures # noqa F401\nexcept ImportError:\n # The backport has SyntaxErrors under py36, so avoid installing it.\n # https://github.com/agronholm/pythonfutures/issues/41\n requires += ['futures']\n\n# read the contents of your README file\nthis_directory = path.abspath(path.dirname(__file__))\nreadme = path.join(this_directory, 'README.md')\nlong_description = ''\nif path.exists(readme):\n with open(readme, encoding='utf-8') as f:\n long_description = f.read()\n\nsetup(\n name=\"c7n_mailer\",\n version='0.5.4',\n description=\"Cloud Custodian - Reference Mailer\",\n long_description=long_description,\n long_description_content_type='text/markdown',\n classifiers=[\n \"Topic :: System :: Systems Administration\",\n \"Topic :: System :: Distributed Computing\"\n ],\n url=\"https://github.com/cloud-custodian/cloud-custodian\",\n license=\"Apache-2.0\",\n packages=find_packages(),\n entry_points={\n 'console_scripts': [\n 'c7n-mailer = c7n_mailer.cli:main',\n 'c7n-mailer-replay = c7n_mailer.replay:main'\n ]\n },\n install_requires=requires,\n package_data={str(''): [str('msg-templates/*.j2')]},\n)\n", "path": "tools/c7n_mailer/setup.py"}]} | 1,367 | 129 |
gh_patches_debug_27984 | rasdani/github-patches | git_diff | translate__pootle-4112 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Add syntax highlighting editor to our static pages
Our static pages are HTML, and it would be nice to have HTML syntax highlight in there.
My personal strong preference is http://codemirror.net/ since it is very solid, has a great API, and allows to easily write custom highlighters, which we can make the use of in other places in the app.
</issue>
<code>
[start of pootle/apps/pootle_misc/context_processors.py]
1 #!/usr/bin/env python
2 # -*- coding: utf-8 -*-
3 #
4 # Copyright (C) Pootle contributors.
5 #
6 # This file is a part of the Pootle project. It is distributed under the GPL3
7 # or later license. See the LICENSE file for a copy of the license and the
8 # AUTHORS file for copyright and authorship information.
9
10 from django.conf import settings
11 from django.utils import translation
12
13 from pootle.core.utils.json import jsonify
14 from pootle_language.models import Language
15 from pootle_project.models import Project
16 from staticpages.models import LegalPage
17
18
19 def _agreement_context(request):
20 """Returns whether the agreement box should be displayed or not."""
21 request_path = request.META['PATH_INFO']
22 nocheck = filter(lambda x: request_path.startswith(x),
23 settings.POOTLE_LEGALPAGE_NOCHECK_PREFIXES)
24
25 if (request.user.is_authenticated() and not nocheck and
26 LegalPage.objects.has_pending_agreement(request.user)):
27 return True
28
29 return False
30
31
32 def _get_social_auth_providers(request):
33 if 'allauth.socialaccount' not in settings.INSTALLED_APPS:
34 return []
35
36 from allauth.socialaccount import providers
37 return [{'name': provider.name, 'url': provider.get_login_url(request)}
38 for provider in providers.registry.get_list()]
39
40
41 def pootle_context(request):
42 """Exposes settings to templates."""
43 #FIXME: maybe we should expose relevant settings only?
44 return {
45 'settings': {
46 'POOTLE_TITLE': settings.POOTLE_TITLE,
47 'POOTLE_INSTANCE_ID': settings.POOTLE_INSTANCE_ID,
48 'POOTLE_CONTACT_ENABLED': (settings.POOTLE_CONTACT_ENABLED and
49 settings.POOTLE_CONTACT_EMAIL),
50 'POOTLE_SIGNUP_ENABLED': settings.POOTLE_SIGNUP_ENABLED,
51 'SCRIPT_NAME': settings.SCRIPT_NAME,
52 'POOTLE_CACHE_TIMEOUT': settings.POOTLE_CACHE_TIMEOUT,
53 'DEBUG': settings.DEBUG,
54 },
55 'custom': settings.POOTLE_CUSTOM_TEMPLATE_CONTEXT,
56 'ALL_LANGUAGES': Language.live.cached_dict(translation.get_language()),
57 'ALL_PROJECTS': Project.objects.cached_dict(request.user),
58 'SOCIAL_AUTH_PROVIDERS': jsonify(_get_social_auth_providers(request)),
59 'display_agreement': _agreement_context(request),
60 }
61
[end of pootle/apps/pootle_misc/context_processors.py]
[start of pootle/apps/staticpages/views.py]
1 #!/usr/bin/env python
2 # -*- coding: utf-8 -*-
3 #
4 # Copyright (C) Pootle contributors.
5 #
6 # This file is a part of the Pootle project. It is distributed under the GPL3
7 # or later license. See the LICENSE file for a copy of the license and the
8 # AUTHORS file for copyright and authorship information.
9
10 from django.core.exceptions import ObjectDoesNotExist
11 from django.core.urlresolvers import reverse_lazy
12 from django.http import Http404
13 from django.shortcuts import redirect, render
14 from django.template import loader, RequestContext
15 from django.utils.translation import ugettext_lazy as _
16 from django.views.generic import (CreateView, DeleteView, TemplateView,
17 UpdateView)
18
19 from pootle.core.http import JsonResponse, JsonResponseBadRequest
20 from pootle.core.views import SuperuserRequiredMixin
21 from pootle_misc.util import ajax_required
22
23 from .forms import agreement_form_factory
24 from .models import AbstractPage, LegalPage, StaticPage
25
26
27 ANN_TYPE = u'announcements'
28 ANN_VPATH = ANN_TYPE + u'/'
29
30
31 class PageModelMixin(object):
32 """Mixin used to set the view's page model according to the
33 `page_type` argument caught in a url pattern.
34 """
35
36 def dispatch(self, request, *args, **kwargs):
37 self.page_type = kwargs.get('page_type', None)
38 self.model = {
39 'legal': LegalPage,
40 'static': StaticPage,
41 ANN_TYPE: StaticPage,
42 }.get(self.page_type)
43
44 if self.model is None:
45 raise Http404
46
47 return super(PageModelMixin, self).dispatch(request, *args, **kwargs)
48
49 def get_context_data(self, **kwargs):
50 ctx = super(PageModelMixin, self).get_context_data(**kwargs)
51 ctx.update({
52 'has_page_model': True,
53 'page_display_name': self.model.display_name,
54 })
55 return ctx
56
57 def get_form_kwargs(self):
58 kwargs = super(PageModelMixin, self).get_form_kwargs()
59 kwargs.update({'label_suffix': ''})
60 return kwargs
61
62 def get_form(self, form_class):
63 form = super(PageModelMixin, self).get_form(form_class)
64
65 if self.page_type == ANN_TYPE:
66 form.fields['virtual_path'].help_text = u'/pages/' + ANN_VPATH
67
68 return form
69
70 def form_valid(self, form):
71 if (self.page_type == ANN_TYPE and not
72 form.cleaned_data['virtual_path'].startswith(ANN_VPATH)):
73 orig_vpath = form.cleaned_data['virtual_path']
74 form.instance.virtual_path = ANN_VPATH + orig_vpath
75
76 return super(PageModelMixin, self).form_valid(form)
77
78
79 class AdminCtxMixin(object):
80
81 def get_context_data(self, **kwargs):
82 ctx = super(AdminCtxMixin, self).get_context_data(**kwargs)
83 ctx.update({
84 'page': 'admin-pages',
85 })
86 return ctx
87
88
89 class AdminTemplateView(SuperuserRequiredMixin, AdminCtxMixin, TemplateView):
90
91 template_name = 'admin/staticpages/page_list.html'
92
93 def get_context_data(self, **kwargs):
94 legal_pages = LegalPage.objects.all()
95 static_pages = StaticPage.objects.exclude(
96 virtual_path__startswith=ANN_VPATH,
97 )
98 announcements = StaticPage.objects.filter(
99 virtual_path__startswith=ANN_VPATH,
100 )
101
102 ctx = super(AdminTemplateView, self).get_context_data(**kwargs)
103 ctx.update({
104 'legalpages': legal_pages,
105 'staticpages': static_pages,
106 ANN_TYPE: announcements,
107 })
108 return ctx
109
110
111 class PageCreateView(SuperuserRequiredMixin, AdminCtxMixin, PageModelMixin, CreateView):
112 fields = ('title', 'virtual_path', 'active', 'url', 'body')
113
114 success_url = reverse_lazy('pootle-staticpages')
115 template_name = 'admin/staticpages/page_create.html'
116
117 def get_initial(self):
118 initial = super(PageModelMixin, self).get_initial()
119
120 initial_args = {
121 'title': _('Page Title'),
122 }
123
124 if self.page_type != ANN_TYPE:
125 next_page_number = AbstractPage.max_pk() + 1
126 initial_args['virtual_path'] = 'page-%d' % next_page_number
127
128 initial.update(initial_args)
129
130 return initial
131
132 def get_form(self, form_class):
133 form = super(PageCreateView, self).get_form(form_class)
134
135 if self.page_type == ANN_TYPE:
136 del form.fields['url']
137 # Translators: 'projects' must not be translated.
138 msg = _(u'projects/<project_code> or <language_code> or '
139 u'<language_code>/<project_code>')
140 form.fields['virtual_path'].widget.attrs['placeholder'] = msg
141 form.fields['virtual_path'].widget.attrs['size'] = 60
142
143 return form
144
145
146 class PageUpdateView(SuperuserRequiredMixin, AdminCtxMixin, PageModelMixin, UpdateView):
147 fields = ('title', 'virtual_path', 'active', 'url', 'body')
148
149 success_url = reverse_lazy('pootle-staticpages')
150 template_name = 'admin/staticpages/page_update.html'
151
152 def get_context_data(self, **kwargs):
153 ctx = super(PageUpdateView, self).get_context_data(**kwargs)
154 ctx.update({
155 'show_delete': True,
156 'page_type': self.page_type,
157 })
158 return ctx
159
160 def get_form_kwargs(self):
161 kwargs = super(PageUpdateView, self).get_form_kwargs()
162
163 if self.page_type == ANN_TYPE:
164 orig_vpath = self.object.virtual_path
165 self.object.virtual_path = orig_vpath.replace(ANN_VPATH, '')
166 kwargs.update({'instance': self.object})
167
168 return kwargs
169
170
171 class PageDeleteView(SuperuserRequiredMixin, PageModelMixin, DeleteView):
172
173 success_url = reverse_lazy('pootle-staticpages')
174
175
176 def display_page(request, virtual_path):
177 """Displays an active page defined in `virtual_path`."""
178 page = None
179 for page_model in AbstractPage.__subclasses__():
180 try:
181 page = page_model.objects.live(request.user).get(
182 virtual_path=virtual_path,
183 )
184 except ObjectDoesNotExist:
185 pass
186
187 if page is None:
188 raise Http404
189
190 if page.url:
191 return redirect(page.url)
192
193 template_name = 'staticpages/page_display.html'
194 if request.is_ajax():
195 template_name = 'staticpages/_body.html'
196
197 ctx = {
198 'page': page,
199 }
200 return render(request, template_name, ctx)
201
202
203 def _get_rendered_agreement(request, form):
204 template = loader.get_template('staticpages/agreement.html')
205 return template.render(RequestContext(request, {'form': form}))
206
207
208 @ajax_required
209 def legal_agreement(request):
210 """Displays the pending documents to be agreed by the current user."""
211 pending_pages = LegalPage.objects.pending_user_agreement(request.user)
212 form_class = agreement_form_factory(pending_pages, request.user)
213
214 if request.method == 'POST':
215 form = form_class(request.POST)
216
217 if form.is_valid():
218 form.save()
219 return JsonResponse({})
220
221 rendered_form = _get_rendered_agreement(request, form)
222 return JsonResponseBadRequest({'form': rendered_form})
223
224 rendered_form = _get_rendered_agreement(request, form_class())
225 return JsonResponse({'form': rendered_form})
226
[end of pootle/apps/staticpages/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/pootle/apps/pootle_misc/context_processors.py b/pootle/apps/pootle_misc/context_processors.py
--- a/pootle/apps/pootle_misc/context_processors.py
+++ b/pootle/apps/pootle_misc/context_processors.py
@@ -10,6 +10,7 @@
from django.conf import settings
from django.utils import translation
+from pootle.core.markup import get_markup_filter_name
from pootle.core.utils.json import jsonify
from pootle_language.models import Language
from pootle_project.models import Project
@@ -47,6 +48,7 @@
'POOTLE_INSTANCE_ID': settings.POOTLE_INSTANCE_ID,
'POOTLE_CONTACT_ENABLED': (settings.POOTLE_CONTACT_ENABLED and
settings.POOTLE_CONTACT_EMAIL),
+ 'POOTLE_MARKUP_FILTER': get_markup_filter_name(),
'POOTLE_SIGNUP_ENABLED': settings.POOTLE_SIGNUP_ENABLED,
'SCRIPT_NAME': settings.SCRIPT_NAME,
'POOTLE_CACHE_TIMEOUT': settings.POOTLE_CACHE_TIMEOUT,
diff --git a/pootle/apps/staticpages/views.py b/pootle/apps/staticpages/views.py
--- a/pootle/apps/staticpages/views.py
+++ b/pootle/apps/staticpages/views.py
@@ -65,6 +65,8 @@
if self.page_type == ANN_TYPE:
form.fields['virtual_path'].help_text = u'/pages/' + ANN_VPATH
+ form.fields['body'].widget.attrs['class'] = 'js-staticpage-editor'
+
return form
def form_valid(self, form):
| {"golden_diff": "diff --git a/pootle/apps/pootle_misc/context_processors.py b/pootle/apps/pootle_misc/context_processors.py\n--- a/pootle/apps/pootle_misc/context_processors.py\n+++ b/pootle/apps/pootle_misc/context_processors.py\n@@ -10,6 +10,7 @@\n from django.conf import settings\n from django.utils import translation\n \n+from pootle.core.markup import get_markup_filter_name\n from pootle.core.utils.json import jsonify\n from pootle_language.models import Language\n from pootle_project.models import Project\n@@ -47,6 +48,7 @@\n 'POOTLE_INSTANCE_ID': settings.POOTLE_INSTANCE_ID,\n 'POOTLE_CONTACT_ENABLED': (settings.POOTLE_CONTACT_ENABLED and\n settings.POOTLE_CONTACT_EMAIL),\n+ 'POOTLE_MARKUP_FILTER': get_markup_filter_name(),\n 'POOTLE_SIGNUP_ENABLED': settings.POOTLE_SIGNUP_ENABLED,\n 'SCRIPT_NAME': settings.SCRIPT_NAME,\n 'POOTLE_CACHE_TIMEOUT': settings.POOTLE_CACHE_TIMEOUT,\ndiff --git a/pootle/apps/staticpages/views.py b/pootle/apps/staticpages/views.py\n--- a/pootle/apps/staticpages/views.py\n+++ b/pootle/apps/staticpages/views.py\n@@ -65,6 +65,8 @@\n if self.page_type == ANN_TYPE:\n form.fields['virtual_path'].help_text = u'/pages/' + ANN_VPATH\n \n+ form.fields['body'].widget.attrs['class'] = 'js-staticpage-editor'\n+\n return form\n \n def form_valid(self, form):\n", "issue": "Add syntax highlighting editor to our static pages\nOur static pages are HTML, and it would be nice to have HTML syntax highlight in there.\n\nMy personal strong preference is http://codemirror.net/ since it is very solid, has a great API, and allows to easily write custom highlighters, which we can make the use of in other places in the app.\n\n", "before_files": [{"content": "#!/usr/bin/env python\n# -*- 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\nfrom django.conf import settings\nfrom django.utils import translation\n\nfrom pootle.core.utils.json import jsonify\nfrom pootle_language.models import Language\nfrom pootle_project.models import Project\nfrom staticpages.models import LegalPage\n\n\ndef _agreement_context(request):\n \"\"\"Returns whether the agreement box should be displayed or not.\"\"\"\n request_path = request.META['PATH_INFO']\n nocheck = filter(lambda x: request_path.startswith(x),\n settings.POOTLE_LEGALPAGE_NOCHECK_PREFIXES)\n\n if (request.user.is_authenticated() and not nocheck and\n LegalPage.objects.has_pending_agreement(request.user)):\n return True\n\n return False\n\n\ndef _get_social_auth_providers(request):\n if 'allauth.socialaccount' not in settings.INSTALLED_APPS:\n return []\n\n from allauth.socialaccount import providers\n return [{'name': provider.name, 'url': provider.get_login_url(request)}\n for provider in providers.registry.get_list()]\n\n\ndef pootle_context(request):\n \"\"\"Exposes settings to templates.\"\"\"\n #FIXME: maybe we should expose relevant settings only?\n return {\n 'settings': {\n 'POOTLE_TITLE': settings.POOTLE_TITLE,\n 'POOTLE_INSTANCE_ID': settings.POOTLE_INSTANCE_ID,\n 'POOTLE_CONTACT_ENABLED': (settings.POOTLE_CONTACT_ENABLED and\n settings.POOTLE_CONTACT_EMAIL),\n 'POOTLE_SIGNUP_ENABLED': settings.POOTLE_SIGNUP_ENABLED,\n 'SCRIPT_NAME': settings.SCRIPT_NAME,\n 'POOTLE_CACHE_TIMEOUT': settings.POOTLE_CACHE_TIMEOUT,\n 'DEBUG': settings.DEBUG,\n },\n 'custom': settings.POOTLE_CUSTOM_TEMPLATE_CONTEXT,\n 'ALL_LANGUAGES': Language.live.cached_dict(translation.get_language()),\n 'ALL_PROJECTS': Project.objects.cached_dict(request.user),\n 'SOCIAL_AUTH_PROVIDERS': jsonify(_get_social_auth_providers(request)),\n 'display_agreement': _agreement_context(request),\n }\n", "path": "pootle/apps/pootle_misc/context_processors.py"}, {"content": "#!/usr/bin/env python\n# -*- 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\nfrom django.core.exceptions import ObjectDoesNotExist\nfrom django.core.urlresolvers import reverse_lazy\nfrom django.http import Http404\nfrom django.shortcuts import redirect, render\nfrom django.template import loader, RequestContext\nfrom django.utils.translation import ugettext_lazy as _\nfrom django.views.generic import (CreateView, DeleteView, TemplateView,\n UpdateView)\n\nfrom pootle.core.http import JsonResponse, JsonResponseBadRequest\nfrom pootle.core.views import SuperuserRequiredMixin\nfrom pootle_misc.util import ajax_required\n\nfrom .forms import agreement_form_factory\nfrom .models import AbstractPage, LegalPage, StaticPage\n\n\nANN_TYPE = u'announcements'\nANN_VPATH = ANN_TYPE + u'/'\n\n\nclass PageModelMixin(object):\n \"\"\"Mixin used to set the view's page model according to the\n `page_type` argument caught in a url pattern.\n \"\"\"\n\n def dispatch(self, request, *args, **kwargs):\n self.page_type = kwargs.get('page_type', None)\n self.model = {\n 'legal': LegalPage,\n 'static': StaticPage,\n ANN_TYPE: StaticPage,\n }.get(self.page_type)\n\n if self.model is None:\n raise Http404\n\n return super(PageModelMixin, self).dispatch(request, *args, **kwargs)\n\n def get_context_data(self, **kwargs):\n ctx = super(PageModelMixin, self).get_context_data(**kwargs)\n ctx.update({\n 'has_page_model': True,\n 'page_display_name': self.model.display_name,\n })\n return ctx\n\n def get_form_kwargs(self):\n kwargs = super(PageModelMixin, self).get_form_kwargs()\n kwargs.update({'label_suffix': ''})\n return kwargs\n\n def get_form(self, form_class):\n form = super(PageModelMixin, self).get_form(form_class)\n\n if self.page_type == ANN_TYPE:\n form.fields['virtual_path'].help_text = u'/pages/' + ANN_VPATH\n\n return form\n\n def form_valid(self, form):\n if (self.page_type == ANN_TYPE and not\n form.cleaned_data['virtual_path'].startswith(ANN_VPATH)):\n orig_vpath = form.cleaned_data['virtual_path']\n form.instance.virtual_path = ANN_VPATH + orig_vpath\n\n return super(PageModelMixin, self).form_valid(form)\n\n\nclass AdminCtxMixin(object):\n\n def get_context_data(self, **kwargs):\n ctx = super(AdminCtxMixin, self).get_context_data(**kwargs)\n ctx.update({\n 'page': 'admin-pages',\n })\n return ctx\n\n\nclass AdminTemplateView(SuperuserRequiredMixin, AdminCtxMixin, TemplateView):\n\n template_name = 'admin/staticpages/page_list.html'\n\n def get_context_data(self, **kwargs):\n legal_pages = LegalPage.objects.all()\n static_pages = StaticPage.objects.exclude(\n virtual_path__startswith=ANN_VPATH,\n )\n announcements = StaticPage.objects.filter(\n virtual_path__startswith=ANN_VPATH,\n )\n\n ctx = super(AdminTemplateView, self).get_context_data(**kwargs)\n ctx.update({\n 'legalpages': legal_pages,\n 'staticpages': static_pages,\n ANN_TYPE: announcements,\n })\n return ctx\n\n\nclass PageCreateView(SuperuserRequiredMixin, AdminCtxMixin, PageModelMixin, CreateView):\n fields = ('title', 'virtual_path', 'active', 'url', 'body')\n\n success_url = reverse_lazy('pootle-staticpages')\n template_name = 'admin/staticpages/page_create.html'\n\n def get_initial(self):\n initial = super(PageModelMixin, self).get_initial()\n\n initial_args = {\n 'title': _('Page Title'),\n }\n\n if self.page_type != ANN_TYPE:\n next_page_number = AbstractPage.max_pk() + 1\n initial_args['virtual_path'] = 'page-%d' % next_page_number\n\n initial.update(initial_args)\n\n return initial\n\n def get_form(self, form_class):\n form = super(PageCreateView, self).get_form(form_class)\n\n if self.page_type == ANN_TYPE:\n del form.fields['url']\n # Translators: 'projects' must not be translated.\n msg = _(u'projects/<project_code> or <language_code> or '\n u'<language_code>/<project_code>')\n form.fields['virtual_path'].widget.attrs['placeholder'] = msg\n form.fields['virtual_path'].widget.attrs['size'] = 60\n\n return form\n\n\nclass PageUpdateView(SuperuserRequiredMixin, AdminCtxMixin, PageModelMixin, UpdateView):\n fields = ('title', 'virtual_path', 'active', 'url', 'body')\n\n success_url = reverse_lazy('pootle-staticpages')\n template_name = 'admin/staticpages/page_update.html'\n\n def get_context_data(self, **kwargs):\n ctx = super(PageUpdateView, self).get_context_data(**kwargs)\n ctx.update({\n 'show_delete': True,\n 'page_type': self.page_type,\n })\n return ctx\n\n def get_form_kwargs(self):\n kwargs = super(PageUpdateView, self).get_form_kwargs()\n\n if self.page_type == ANN_TYPE:\n orig_vpath = self.object.virtual_path\n self.object.virtual_path = orig_vpath.replace(ANN_VPATH, '')\n kwargs.update({'instance': self.object})\n\n return kwargs\n\n\nclass PageDeleteView(SuperuserRequiredMixin, PageModelMixin, DeleteView):\n\n success_url = reverse_lazy('pootle-staticpages')\n\n\ndef display_page(request, virtual_path):\n \"\"\"Displays an active page defined in `virtual_path`.\"\"\"\n page = None\n for page_model in AbstractPage.__subclasses__():\n try:\n page = page_model.objects.live(request.user).get(\n virtual_path=virtual_path,\n )\n except ObjectDoesNotExist:\n pass\n\n if page is None:\n raise Http404\n\n if page.url:\n return redirect(page.url)\n\n template_name = 'staticpages/page_display.html'\n if request.is_ajax():\n template_name = 'staticpages/_body.html'\n\n ctx = {\n 'page': page,\n }\n return render(request, template_name, ctx)\n\n\ndef _get_rendered_agreement(request, form):\n template = loader.get_template('staticpages/agreement.html')\n return template.render(RequestContext(request, {'form': form}))\n\n\n@ajax_required\ndef legal_agreement(request):\n \"\"\"Displays the pending documents to be agreed by the current user.\"\"\"\n pending_pages = LegalPage.objects.pending_user_agreement(request.user)\n form_class = agreement_form_factory(pending_pages, request.user)\n\n if request.method == 'POST':\n form = form_class(request.POST)\n\n if form.is_valid():\n form.save()\n return JsonResponse({})\n\n rendered_form = _get_rendered_agreement(request, form)\n return JsonResponseBadRequest({'form': rendered_form})\n\n rendered_form = _get_rendered_agreement(request, form_class())\n return JsonResponse({'form': rendered_form})\n", "path": "pootle/apps/staticpages/views.py"}]} | 3,434 | 347 |
gh_patches_debug_23494 | rasdani/github-patches | git_diff | translate__translate-4223 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
sub2po - Can't find headers file
On a fresh install of python 3.8 in a new virtualenv, I get the following error:
```
(ttk) C:\dev\translate-toolkit>sub2po -P "C:\dev\translate-toolkit\DA Launch Trailer.ass" "C:\dev\translate-toolkit\trailer.pot"
processing 1 files...
Failed to read file 'C:\Users\Sim\Envs\ttk\lib\site-packages\data\headers\ass': No such file or directory
sub2po: WARNING: Error processing: input C:\dev\translate-toolkit\DA Launch Trailer.ass, output C:\dev\translate-toolkit\trailer.pot, template None: FileNotFoundError(2, 'No such file or directory')
[###########################################] 100%
```
I suspect there is a package required that I have not installed and did not see in the install docs, but maybe it is something else?
I have installed aeidon; here is my package list:
```
(ttk) C:\dev\translate-toolkit>pip list
Package Version
----------------- ---------
aeidon 1.7.0
ass 0.5.1
certifi 2020.6.20
chardet 3.0.4
idna 2.10
iniparse 0.5
inotify 0.2.10
lxml 4.6.1
nose 1.3.7
pip 20.2.4
requests 2.24.0
setuptools 50.3.2
six 1.15.0
srt 3.4.1
subtitle 2.1
translate-toolkit 3.1.1
urllib3 1.25.11
wheel 0.35.1
```
FYI, [I had the same error](https://github.com/WeblateOrg/weblate/issues/4732) in a linux environment when trying to do this via Weblate.
</issue>
<code>
[start of translate/storage/subtitles.py]
1 #
2 # Copyright 2008-2009 Zuza Software Foundation
3 #
4 # This file is part of translate.
5 #
6 # translate is free software; you can redistribute it and/or modify
7 # it under the terms of the GNU General Public License as published by
8 # the Free Software Foundation; either version 2 of the License, or
9 # (at your option) any later version.
10 #
11 # translate is distributed in the hope that it will be useful,
12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 # GNU General Public License for more details.
15 #
16 # You should have received a copy of the GNU General Public License
17 # along with this program; if not, see <http://www.gnu.org/licenses/>.
18
19 """Class that manages subtitle files for translation.
20
21 This class makes use of the subtitle functionality of ``gaupol``.
22
23 .. seealso:: gaupol/agents/open.py::open_main
24
25 A patch to gaupol is required to open utf-8 files successfully.
26 """
27
28 import os
29 from io import StringIO
30 from tempfile import NamedTemporaryFile
31
32 from translate.storage import base
33
34
35 try:
36 from aeidon import Subtitle, documents, newlines
37 from aeidon.encodings import detect
38 from aeidon.files import AdvSubStationAlpha, MicroDVD, SubRip, SubStationAlpha, new
39 from aeidon.util import detect_format as determine
40 except ImportError:
41 try:
42 from gaupol import FormatDeterminer, documents
43 from gaupol.encodings import detect
44 from gaupol.files import (
45 AdvSubStationAlpha,
46 MicroDVD,
47 SubRip,
48 SubStationAlpha,
49 new,
50 )
51 from gaupol.newlines import newlines
52 from gaupol.subtitle import Subtitle
53
54 _determiner = FormatDeterminer()
55 determine = _determiner.determine
56 except ImportError:
57 raise ImportError("\naeidon or gaupol package required for Subtitle support")
58
59
60 class SubtitleUnit(base.TranslationUnit):
61 """A subtitle entry that is translatable"""
62
63 def __init__(self, source=None, **kwargs):
64 self._start = "00:00:00.000"
65 self._end = "00:00:00.000"
66 self._duration = 0.0
67 if source:
68 self.source = source
69 self.target = source
70 super().__init__(source)
71
72 def getnotes(self, origin=None):
73 if origin in ["programmer", "developer", "source code", None]:
74 return "visible for %d seconds" % self._duration
75 else:
76 return ""
77
78 def getlocations(self):
79 return [f"{self._start}-->{self._end}"]
80
81 def getid(self):
82 return self.getlocations()[0]
83
84
85 class SubtitleFile(base.TranslationStore):
86 """A subtitle file"""
87
88 UnitClass = SubtitleUnit
89
90 def __init__(self, inputfile=None, **kwargs):
91 """construct an Subtitle file, optionally reading in from inputfile."""
92 super().__init__(**kwargs)
93 self.filename = None
94 self._subtitlefile = None
95 if inputfile is not None:
96 self._parsefile(inputfile)
97
98 def serialize(self, out):
99 subtitles = []
100 for unit in self.units:
101 subtitle = Subtitle()
102 subtitle.main_text = unit.target or unit.source
103 subtitle.start = unit._start
104 subtitle.end = unit._end
105 subtitles.append(subtitle)
106 # Using transient output might be dropped if/when we have more control
107 # over the open mode of out files.
108 output = StringIO()
109 self._subtitlefile.write_to_file(subtitles, documents.MAIN, output)
110 out.write(output.getvalue().encode(self._subtitlefile.encoding))
111
112 def _parse(self):
113 try:
114 self.encoding = detect(self.filename)
115 self._format = determine(self.filename, self.encoding)
116 self._subtitlefile = new(self._format, self.filename, self.encoding)
117 for subtitle in self._subtitlefile.read():
118 newunit = self.addsourceunit(subtitle.main_text)
119 newunit._start = subtitle.start
120 newunit._end = subtitle.end
121 newunit._duration = subtitle.duration_seconds
122 except Exception as e:
123 raise base.ParseError(e)
124
125 def _parsefile(self, storefile):
126 if hasattr(storefile, "name"):
127 self.filename = storefile.name
128 storefile.close()
129 elif hasattr(storefile, "filename"):
130 self.filename = storefile.filename
131 storefile.close()
132 elif isinstance(storefile, str):
133 self.filename = storefile
134
135 if self.filename and os.path.exists(self.filename):
136 self._parse()
137 else:
138 self.parse(storefile.read())
139
140 @classmethod
141 def parsefile(cls, storefile):
142 """parse the given file"""
143 newstore = cls()
144 newstore._parsefile(storefile)
145 return newstore
146
147 def parse(self, input):
148 if isinstance(input, bytes):
149 # Gaupol does not allow parsing from strings
150 kwargs = {"delete": False}
151 if self.filename:
152 kwargs["suffix"] = self.filename
153
154 temp_file = NamedTemporaryFile(**kwargs)
155 temp_file.close()
156
157 try:
158 with open(temp_file.name, "wb") as fh:
159 fh.write(input)
160 self._parsefile(temp_file.name)
161 finally:
162 os.unlink(temp_file.name)
163 else:
164 self._parsefile(input)
165
166
167 ############# format specific classes ###################
168
169 # the generic SubtitleFile can adapt to any format, but only the
170 # specilized classes can be used to construct a new file
171
172
173 class SubRipFile(SubtitleFile):
174 """specialized class for SubRipFile's only"""
175
176 Name = "SubRip subtitles file"
177 Extensions = ["srt"]
178
179 def __init__(self, *args, **kwargs):
180 super().__init__(*args, **kwargs)
181 if self._subtitlefile is None:
182 self._subtitlefile = SubRip(self.filename or "", self.encoding)
183 if self._subtitlefile.newline is None:
184 self._subtitlefile.newline = newlines.UNIX
185
186
187 class MicroDVDFile(SubtitleFile):
188 """specialized class for SubRipFile's only"""
189
190 Name = "MicroDVD subtitles file"
191 Extensions = ["sub"]
192
193 def __init__(self, *args, **kwargs):
194 super().__init__(*args, **kwargs)
195 if self._subtitlefile is None:
196 self._subtitlefile = MicroDVD(self.filename or "", self.encoding)
197 if self._subtitlefile.newline is None:
198 self._subtitlefile.newline = newlines.UNIX
199
200
201 class AdvSubStationAlphaFile(SubtitleFile):
202 """specialized class for SubRipFile's only"""
203
204 Name = "Advanced Substation Alpha subtitles file"
205 Extensions = ["ass"]
206
207 def __init__(self, *args, **kwargs):
208 super().__init__(*args, **kwargs)
209 if self._subtitlefile is None:
210 self._subtitlefile = AdvSubStationAlpha(self.filename or "", self.encoding)
211 if self._subtitlefile.newline is None:
212 self._subtitlefile.newline = newlines.UNIX
213
214
215 class SubStationAlphaFile(SubtitleFile):
216 """specialized class for SubRipFile's only"""
217
218 Name = "Substation Alpha subtitles file"
219 Extensions = ["ssa"]
220
221 def __init__(self, *args, **kwargs):
222 super().__init__(*args, **kwargs)
223 if self._subtitlefile is None:
224 self._subtitlefile = SubStationAlpha(self.filename or "", self.encoding)
225 if self._subtitlefile.newline is None:
226 self._subtitlefile.newline = newlines.UNIX
227
[end of translate/storage/subtitles.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/storage/subtitles.py b/translate/storage/subtitles.py
--- a/translate/storage/subtitles.py
+++ b/translate/storage/subtitles.py
@@ -60,9 +60,11 @@
class SubtitleUnit(base.TranslationUnit):
"""A subtitle entry that is translatable"""
+ init_time = "00:00:00.000"
+
def __init__(self, source=None, **kwargs):
- self._start = "00:00:00.000"
- self._end = "00:00:00.000"
+ self._start = self.init_time
+ self._end = self.init_time
self._duration = 0.0
if source:
self.source = source
@@ -82,6 +84,12 @@
return self.getlocations()[0]
+class MicroDVDUnit(SubtitleUnit):
+ """MicroDVD unit, it uses frames instead of time as start/end."""
+
+ init_time = 0
+
+
class SubtitleFile(base.TranslationStore):
"""A subtitle file"""
@@ -189,6 +197,7 @@
Name = "MicroDVD subtitles file"
Extensions = ["sub"]
+ UnitClass = MicroDVDUnit
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
| {"golden_diff": "diff --git a/translate/storage/subtitles.py b/translate/storage/subtitles.py\n--- a/translate/storage/subtitles.py\n+++ b/translate/storage/subtitles.py\n@@ -60,9 +60,11 @@\n class SubtitleUnit(base.TranslationUnit):\n \"\"\"A subtitle entry that is translatable\"\"\"\n \n+ init_time = \"00:00:00.000\"\n+\n def __init__(self, source=None, **kwargs):\n- self._start = \"00:00:00.000\"\n- self._end = \"00:00:00.000\"\n+ self._start = self.init_time\n+ self._end = self.init_time\n self._duration = 0.0\n if source:\n self.source = source\n@@ -82,6 +84,12 @@\n return self.getlocations()[0]\n \n \n+class MicroDVDUnit(SubtitleUnit):\n+ \"\"\"MicroDVD unit, it uses frames instead of time as start/end.\"\"\"\n+\n+ init_time = 0\n+\n+\n class SubtitleFile(base.TranslationStore):\n \"\"\"A subtitle file\"\"\"\n \n@@ -189,6 +197,7 @@\n \n Name = \"MicroDVD subtitles file\"\n Extensions = [\"sub\"]\n+ UnitClass = MicroDVDUnit\n \n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n", "issue": "sub2po - Can't find headers file\nOn a fresh install of python 3.8 in a new virtualenv, I get the following error:\r\n\r\n```\r\n(ttk) C:\\dev\\translate-toolkit>sub2po -P \"C:\\dev\\translate-toolkit\\DA Launch Trailer.ass\" \"C:\\dev\\translate-toolkit\\trailer.pot\"\r\nprocessing 1 files...\r\nFailed to read file 'C:\\Users\\Sim\\Envs\\ttk\\lib\\site-packages\\data\\headers\\ass': No such file or directory\r\nsub2po: WARNING: Error processing: input C:\\dev\\translate-toolkit\\DA Launch Trailer.ass, output C:\\dev\\translate-toolkit\\trailer.pot, template None: FileNotFoundError(2, 'No such file or directory')\r\n[###########################################] 100%\r\n```\r\n\r\nI suspect there is a package required that I have not installed and did not see in the install docs, but maybe it is something else?\r\n\r\nI have installed aeidon; here is my package list:\r\n\r\n```\r\n(ttk) C:\\dev\\translate-toolkit>pip list\r\nPackage Version\r\n----------------- ---------\r\naeidon 1.7.0\r\nass 0.5.1\r\ncertifi 2020.6.20\r\nchardet 3.0.4\r\nidna 2.10\r\niniparse 0.5\r\ninotify 0.2.10\r\nlxml 4.6.1\r\nnose 1.3.7\r\npip 20.2.4\r\nrequests 2.24.0\r\nsetuptools 50.3.2\r\nsix 1.15.0\r\nsrt 3.4.1\r\nsubtitle 2.1\r\ntranslate-toolkit 3.1.1\r\nurllib3 1.25.11\r\nwheel 0.35.1\r\n```\r\n\r\nFYI, [I had the same error](https://github.com/WeblateOrg/weblate/issues/4732) in a linux environment when trying to do this via Weblate.\n", "before_files": [{"content": "#\n# Copyright 2008-2009 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\"\"\"Class that manages subtitle files for translation.\n\nThis class makes use of the subtitle functionality of ``gaupol``.\n\n.. seealso:: gaupol/agents/open.py::open_main\n\nA patch to gaupol is required to open utf-8 files successfully.\n\"\"\"\n\nimport os\nfrom io import StringIO\nfrom tempfile import NamedTemporaryFile\n\nfrom translate.storage import base\n\n\ntry:\n from aeidon import Subtitle, documents, newlines\n from aeidon.encodings import detect\n from aeidon.files import AdvSubStationAlpha, MicroDVD, SubRip, SubStationAlpha, new\n from aeidon.util import detect_format as determine\nexcept ImportError:\n try:\n from gaupol import FormatDeterminer, documents\n from gaupol.encodings import detect\n from gaupol.files import (\n AdvSubStationAlpha,\n MicroDVD,\n SubRip,\n SubStationAlpha,\n new,\n )\n from gaupol.newlines import newlines\n from gaupol.subtitle import Subtitle\n\n _determiner = FormatDeterminer()\n determine = _determiner.determine\n except ImportError:\n raise ImportError(\"\\naeidon or gaupol package required for Subtitle support\")\n\n\nclass SubtitleUnit(base.TranslationUnit):\n \"\"\"A subtitle entry that is translatable\"\"\"\n\n def __init__(self, source=None, **kwargs):\n self._start = \"00:00:00.000\"\n self._end = \"00:00:00.000\"\n self._duration = 0.0\n if source:\n self.source = source\n self.target = source\n super().__init__(source)\n\n def getnotes(self, origin=None):\n if origin in [\"programmer\", \"developer\", \"source code\", None]:\n return \"visible for %d seconds\" % self._duration\n else:\n return \"\"\n\n def getlocations(self):\n return [f\"{self._start}-->{self._end}\"]\n\n def getid(self):\n return self.getlocations()[0]\n\n\nclass SubtitleFile(base.TranslationStore):\n \"\"\"A subtitle file\"\"\"\n\n UnitClass = SubtitleUnit\n\n def __init__(self, inputfile=None, **kwargs):\n \"\"\"construct an Subtitle file, optionally reading in from inputfile.\"\"\"\n super().__init__(**kwargs)\n self.filename = None\n self._subtitlefile = None\n if inputfile is not None:\n self._parsefile(inputfile)\n\n def serialize(self, out):\n subtitles = []\n for unit in self.units:\n subtitle = Subtitle()\n subtitle.main_text = unit.target or unit.source\n subtitle.start = unit._start\n subtitle.end = unit._end\n subtitles.append(subtitle)\n # Using transient output might be dropped if/when we have more control\n # over the open mode of out files.\n output = StringIO()\n self._subtitlefile.write_to_file(subtitles, documents.MAIN, output)\n out.write(output.getvalue().encode(self._subtitlefile.encoding))\n\n def _parse(self):\n try:\n self.encoding = detect(self.filename)\n self._format = determine(self.filename, self.encoding)\n self._subtitlefile = new(self._format, self.filename, self.encoding)\n for subtitle in self._subtitlefile.read():\n newunit = self.addsourceunit(subtitle.main_text)\n newunit._start = subtitle.start\n newunit._end = subtitle.end\n newunit._duration = subtitle.duration_seconds\n except Exception as e:\n raise base.ParseError(e)\n\n def _parsefile(self, storefile):\n if hasattr(storefile, \"name\"):\n self.filename = storefile.name\n storefile.close()\n elif hasattr(storefile, \"filename\"):\n self.filename = storefile.filename\n storefile.close()\n elif isinstance(storefile, str):\n self.filename = storefile\n\n if self.filename and os.path.exists(self.filename):\n self._parse()\n else:\n self.parse(storefile.read())\n\n @classmethod\n def parsefile(cls, storefile):\n \"\"\"parse the given file\"\"\"\n newstore = cls()\n newstore._parsefile(storefile)\n return newstore\n\n def parse(self, input):\n if isinstance(input, bytes):\n # Gaupol does not allow parsing from strings\n kwargs = {\"delete\": False}\n if self.filename:\n kwargs[\"suffix\"] = self.filename\n\n temp_file = NamedTemporaryFile(**kwargs)\n temp_file.close()\n\n try:\n with open(temp_file.name, \"wb\") as fh:\n fh.write(input)\n self._parsefile(temp_file.name)\n finally:\n os.unlink(temp_file.name)\n else:\n self._parsefile(input)\n\n\n############# format specific classes ###################\n\n# the generic SubtitleFile can adapt to any format, but only the\n# specilized classes can be used to construct a new file\n\n\nclass SubRipFile(SubtitleFile):\n \"\"\"specialized class for SubRipFile's only\"\"\"\n\n Name = \"SubRip subtitles file\"\n Extensions = [\"srt\"]\n\n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n if self._subtitlefile is None:\n self._subtitlefile = SubRip(self.filename or \"\", self.encoding)\n if self._subtitlefile.newline is None:\n self._subtitlefile.newline = newlines.UNIX\n\n\nclass MicroDVDFile(SubtitleFile):\n \"\"\"specialized class for SubRipFile's only\"\"\"\n\n Name = \"MicroDVD subtitles file\"\n Extensions = [\"sub\"]\n\n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n if self._subtitlefile is None:\n self._subtitlefile = MicroDVD(self.filename or \"\", self.encoding)\n if self._subtitlefile.newline is None:\n self._subtitlefile.newline = newlines.UNIX\n\n\nclass AdvSubStationAlphaFile(SubtitleFile):\n \"\"\"specialized class for SubRipFile's only\"\"\"\n\n Name = \"Advanced Substation Alpha subtitles file\"\n Extensions = [\"ass\"]\n\n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n if self._subtitlefile is None:\n self._subtitlefile = AdvSubStationAlpha(self.filename or \"\", self.encoding)\n if self._subtitlefile.newline is None:\n self._subtitlefile.newline = newlines.UNIX\n\n\nclass SubStationAlphaFile(SubtitleFile):\n \"\"\"specialized class for SubRipFile's only\"\"\"\n\n Name = \"Substation Alpha subtitles file\"\n Extensions = [\"ssa\"]\n\n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n if self._subtitlefile is None:\n self._subtitlefile = SubStationAlpha(self.filename or \"\", self.encoding)\n if self._subtitlefile.newline is None:\n self._subtitlefile.newline = newlines.UNIX\n", "path": "translate/storage/subtitles.py"}]} | 3,280 | 319 |
gh_patches_debug_3753 | rasdani/github-patches | git_diff | pretalx__pretalx-509 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
cannot create organiser
## Expected Behavior
As an admin, I'd like to create new organizers.
## Current Behavior
## Steps to Reproduce
1. go to `/orga/organiser/new`
2. enter data into all non-disabled fields
3. press save
4. receive "This field is required." for the short form, which is disabled
## Your Environment
<!--- Include as many relevant details about the environment you experienced the bug in -->
* Version used: v0.8.0
* Environment name and version (e.g. Chrome 39, python 3.5): N/A
* Operating System and version (desktop or mobile): N/A
* Link to your instance, if in production: conference.c3w.at
cannot create organiser
## Expected Behavior
As an admin, I'd like to create new organizers.
## Current Behavior
## Steps to Reproduce
1. go to `/orga/organiser/new`
2. enter data into all non-disabled fields
3. press save
4. receive "This field is required." for the short form, which is disabled
## Your Environment
<!--- Include as many relevant details about the environment you experienced the bug in -->
* Version used: v0.8.0
* Environment name and version (e.g. Chrome 39, python 3.5): N/A
* Operating System and version (desktop or mobile): N/A
* Link to your instance, if in production: conference.c3w.at
</issue>
<code>
[start of src/pretalx/event/forms.py]
1 from django import forms
2 from django.conf import settings
3 from django.db.models import Q
4 from django.utils.translation import ugettext_lazy as _
5 from i18nfield.forms import I18nModelForm
6
7 from pretalx.common.mixins.forms import ReadOnlyFlag
8 from pretalx.event.models import Event, Organiser, Team, TeamInvite
9 from pretalx.orga.forms.widgets import HeaderSelect, MultipleLanguagesWidget
10
11
12 class TeamForm(ReadOnlyFlag, I18nModelForm):
13 def __init__(self, *args, organiser=None, instance=None, **kwargs):
14 super().__init__(*args, instance=instance, **kwargs)
15 if instance and getattr(instance, 'pk', None):
16 self.fields.pop('organiser')
17 self.fields['limit_events'].queryset = instance.organiser.events.all()
18 else:
19 self.fields['organiser'].queryset = organiser
20
21 class Meta:
22 model = Team
23 fields = [
24 'name',
25 'organiser',
26 'all_events',
27 'limit_events',
28 'can_create_events',
29 'can_change_teams',
30 'can_change_organiser_settings',
31 'can_change_event_settings',
32 'can_change_submissions',
33 'is_reviewer',
34 'review_override_votes',
35 ]
36
37
38 class TeamInviteForm(ReadOnlyFlag, forms.ModelForm):
39 class Meta:
40 model = TeamInvite
41 fields = ('email',)
42
43
44 class OrganiserForm(ReadOnlyFlag, I18nModelForm):
45 def __init__(self, *args, **kwargs):
46 super().__init__(*args, **kwargs)
47 self.fields['slug'].disabled = True
48
49 class Meta:
50 model = Organiser
51 fields = ('name', 'slug')
52
53
54 class EventWizardInitialForm(forms.Form):
55 locales = forms.MultipleChoiceField(
56 choices=settings.LANGUAGES,
57 label=_('Use languages'),
58 help_text=_('Choose all languages that your event should be available in.'),
59 widget=MultipleLanguagesWidget,
60 )
61
62 def __init__(self, *args, user=None, **kwargs):
63 super().__init__(*args, **kwargs)
64 self.fields['organiser'] = forms.ModelChoiceField(
65 label=_('Organiser'),
66 queryset=Organiser.objects.filter(
67 id__in=user.teams.filter(can_create_events=True).values_list(
68 'organiser', flat=True
69 )
70 )
71 if not user.is_administrator
72 else Organiser.objects.all(),
73 widget=forms.RadioSelect,
74 empty_label=None,
75 required=True,
76 help_text=_(
77 'The organiser running the event can copy settings from previous events and share team permissions across all or multiple events.'
78 ),
79 )
80 if len(self.fields['organiser'].choices) == 1:
81 self.fields['organiser'].initial = self.fields['organiser'].queryset.first()
82
83
84 class EventWizardBasicsForm(I18nModelForm):
85 def __init__(self, *args, user=None, locales=None, organiser=None, **kwargs):
86 self.locales = locales
87 super().__init__(*args, **kwargs, locales=locales)
88 self.fields['locale'].choices = [
89 (a, b) for a, b in settings.LANGUAGES if a in locales
90 ]
91 self.fields['slug'].help_text = _(
92 'This is the address your event will be available at. Should be short, only contain lowercase letters and numbers, and must be unique. We recommend some kind of abbreviation with less than 10 characters that can be easily remembered.'
93 )
94
95 def clean_slug(self):
96 slug = self.cleaned_data['slug']
97 qs = Event.objects.all()
98 if qs.filter(slug__iexact=slug).exists():
99 raise forms.ValidationError(
100 _(
101 'This short name is already taken, please choose another one (or ask the owner of that event to add you to their team).'
102 )
103 )
104
105 return slug.lower()
106
107 class Meta:
108 model = Event
109 fields = ('name', 'slug', 'timezone', 'email', 'locale')
110
111
112 class EventWizardTimelineForm(forms.ModelForm):
113 deadline = forms.DateTimeField(
114 required=False, help_text=_('The default deadline for your Call for Papers.')
115 )
116
117 def __init__(self, *args, user=None, locales=None, organiser=None, **kwargs):
118 super().__init__(*args, **kwargs)
119 self.fields['date_from'].widget.attrs['class'] = 'datepickerfield'
120 self.fields['date_to'].widget.attrs['class'] = 'datepickerfield'
121 self.fields['date_to'].widget.attrs['data-date-after'] = '#id_date_from'
122 self.fields['deadline'].widget.attrs['class'] = 'datetimepickerfield'
123
124 class Meta:
125 model = Event
126 fields = ('date_from', 'date_to')
127
128
129 class EventWizardDisplayForm(forms.Form):
130 show_on_dashboard = forms.BooleanField(
131 initial=True,
132 required=False,
133 label=_('Show on dashboard'),
134 help_text=_('Show this event on this website\'s dashboard, once it is public?'),
135 )
136 primary_color = forms.CharField(required=False)
137 logo = forms.ImageField(
138 required=False,
139 help_text=_(
140 'If you provide a logo image, we will by default not show your events name and date in the page header. We will show your logo with a maximal height of 120 pixels.'
141 ),
142 )
143 display_header_pattern = forms.ChoiceField(
144 label=_('Frontpage header pattern'),
145 help_text=_(
146 'Choose how the frontpage header banner will be styled. Pattern source: <a href="http://www.heropatterns.com/">heropatterns.com</a>, CC BY 4.0.'
147 ),
148 choices=(
149 ('', _('Plain')),
150 ('pcb', _('Circuits')),
151 ('bubbles', _('Circles')),
152 ('signal', _('Signal')),
153 ('topo', _('Topography')),
154 ('graph', _('Graph Paper')),
155 ),
156 required=False,
157 widget=HeaderSelect,
158 )
159
160 def __init__(self, *args, user=None, locales=None, organiser=None, **kwargs):
161 super().__init__(*args, **kwargs)
162
163
164 class EventWizardCopyForm(forms.Form):
165 @staticmethod
166 def copy_from_queryset(user):
167 return Event.objects.filter(
168 Q(
169 organiser_id__in=user.teams.filter(
170 all_events=True, can_change_event_settings=True
171 ).values_list('organiser', flat=True)
172 )
173 | Q(
174 id__in=user.teams.filter(can_change_event_settings=True).values_list(
175 'limit_events__id', flat=True
176 )
177 )
178 )
179
180 def __init__(self, *args, user=None, locales=None, organiser=None, **kwargs):
181 super().__init__(*args, **kwargs)
182 self.fields['copy_from_event'] = forms.ModelChoiceField(
183 label=_('Copy configuration from'),
184 queryset=EventWizardCopyForm.copy_from_queryset(user),
185 widget=forms.RadioSelect,
186 empty_label=_('Do not copy'),
187 required=False,
188 )
189
[end of src/pretalx/event/forms.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/pretalx/event/forms.py b/src/pretalx/event/forms.py
--- a/src/pretalx/event/forms.py
+++ b/src/pretalx/event/forms.py
@@ -44,7 +44,9 @@
class OrganiserForm(ReadOnlyFlag, I18nModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- self.fields['slug'].disabled = True
+
+ if kwargs.get('instance'):
+ self.fields['slug'].disabled = True
class Meta:
model = Organiser
| {"golden_diff": "diff --git a/src/pretalx/event/forms.py b/src/pretalx/event/forms.py\n--- a/src/pretalx/event/forms.py\n+++ b/src/pretalx/event/forms.py\n@@ -44,7 +44,9 @@\n class OrganiserForm(ReadOnlyFlag, I18nModelForm):\n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n- self.fields['slug'].disabled = True\n+\n+ if kwargs.get('instance'):\n+ self.fields['slug'].disabled = True\n \n class Meta:\n model = Organiser\n", "issue": "cannot create organiser\n## Expected Behavior\r\n\r\nAs an admin, I'd like to create new organizers.\r\n\r\n## Current Behavior\r\n\r\n\r\n\r\n## Steps to Reproduce\r\n\r\n1. go to `/orga/organiser/new`\r\n2. enter data into all non-disabled fields\r\n3. press save\r\n4. receive \"This field is required.\" for the short form, which is disabled\r\n\r\n## Your Environment\r\n\r\n<!--- Include as many relevant details about the environment you experienced the bug in -->\r\n* Version used: v0.8.0\r\n* Environment name and version (e.g. Chrome 39, python 3.5): N/A\r\n* Operating System and version (desktop or mobile): N/A\r\n* Link to your instance, if in production: conference.c3w.at\ncannot create organiser\n## Expected Behavior\r\n\r\nAs an admin, I'd like to create new organizers.\r\n\r\n## Current Behavior\r\n\r\n\r\n\r\n## Steps to Reproduce\r\n\r\n1. go to `/orga/organiser/new`\r\n2. enter data into all non-disabled fields\r\n3. press save\r\n4. receive \"This field is required.\" for the short form, which is disabled\r\n\r\n## Your Environment\r\n\r\n<!--- Include as many relevant details about the environment you experienced the bug in -->\r\n* Version used: v0.8.0\r\n* Environment name and version (e.g. Chrome 39, python 3.5): N/A\r\n* Operating System and version (desktop or mobile): N/A\r\n* Link to your instance, if in production: conference.c3w.at\n", "before_files": [{"content": "from django import forms\nfrom django.conf import settings\nfrom django.db.models import Q\nfrom django.utils.translation import ugettext_lazy as _\nfrom i18nfield.forms import I18nModelForm\n\nfrom pretalx.common.mixins.forms import ReadOnlyFlag\nfrom pretalx.event.models import Event, Organiser, Team, TeamInvite\nfrom pretalx.orga.forms.widgets import HeaderSelect, MultipleLanguagesWidget\n\n\nclass TeamForm(ReadOnlyFlag, I18nModelForm):\n def __init__(self, *args, organiser=None, instance=None, **kwargs):\n super().__init__(*args, instance=instance, **kwargs)\n if instance and getattr(instance, 'pk', None):\n self.fields.pop('organiser')\n self.fields['limit_events'].queryset = instance.organiser.events.all()\n else:\n self.fields['organiser'].queryset = organiser\n\n class Meta:\n model = Team\n fields = [\n 'name',\n 'organiser',\n 'all_events',\n 'limit_events',\n 'can_create_events',\n 'can_change_teams',\n 'can_change_organiser_settings',\n 'can_change_event_settings',\n 'can_change_submissions',\n 'is_reviewer',\n 'review_override_votes',\n ]\n\n\nclass TeamInviteForm(ReadOnlyFlag, forms.ModelForm):\n class Meta:\n model = TeamInvite\n fields = ('email',)\n\n\nclass OrganiserForm(ReadOnlyFlag, I18nModelForm):\n def __init__(self, *args, **kwargs):\n super().__init__(*args, **kwargs)\n self.fields['slug'].disabled = True\n\n class Meta:\n model = Organiser\n fields = ('name', 'slug')\n\n\nclass EventWizardInitialForm(forms.Form):\n locales = forms.MultipleChoiceField(\n choices=settings.LANGUAGES,\n label=_('Use languages'),\n help_text=_('Choose all languages that your event should be available in.'),\n widget=MultipleLanguagesWidget,\n )\n\n def __init__(self, *args, user=None, **kwargs):\n super().__init__(*args, **kwargs)\n self.fields['organiser'] = forms.ModelChoiceField(\n label=_('Organiser'),\n queryset=Organiser.objects.filter(\n id__in=user.teams.filter(can_create_events=True).values_list(\n 'organiser', flat=True\n )\n )\n if not user.is_administrator\n else Organiser.objects.all(),\n widget=forms.RadioSelect,\n empty_label=None,\n required=True,\n help_text=_(\n 'The organiser running the event can copy settings from previous events and share team permissions across all or multiple events.'\n ),\n )\n if len(self.fields['organiser'].choices) == 1:\n self.fields['organiser'].initial = self.fields['organiser'].queryset.first()\n\n\nclass EventWizardBasicsForm(I18nModelForm):\n def __init__(self, *args, user=None, locales=None, organiser=None, **kwargs):\n self.locales = locales\n super().__init__(*args, **kwargs, locales=locales)\n self.fields['locale'].choices = [\n (a, b) for a, b in settings.LANGUAGES if a in locales\n ]\n self.fields['slug'].help_text = _(\n 'This is the address your event will be available at. Should be short, only contain lowercase letters and numbers, and must be unique. We recommend some kind of abbreviation with less than 10 characters that can be easily remembered.'\n )\n\n def clean_slug(self):\n slug = self.cleaned_data['slug']\n qs = Event.objects.all()\n if qs.filter(slug__iexact=slug).exists():\n raise forms.ValidationError(\n _(\n 'This short name is already taken, please choose another one (or ask the owner of that event to add you to their team).'\n )\n )\n\n return slug.lower()\n\n class Meta:\n model = Event\n fields = ('name', 'slug', 'timezone', 'email', 'locale')\n\n\nclass EventWizardTimelineForm(forms.ModelForm):\n deadline = forms.DateTimeField(\n required=False, help_text=_('The default deadline for your Call for Papers.')\n )\n\n def __init__(self, *args, user=None, locales=None, organiser=None, **kwargs):\n super().__init__(*args, **kwargs)\n self.fields['date_from'].widget.attrs['class'] = 'datepickerfield'\n self.fields['date_to'].widget.attrs['class'] = 'datepickerfield'\n self.fields['date_to'].widget.attrs['data-date-after'] = '#id_date_from'\n self.fields['deadline'].widget.attrs['class'] = 'datetimepickerfield'\n\n class Meta:\n model = Event\n fields = ('date_from', 'date_to')\n\n\nclass EventWizardDisplayForm(forms.Form):\n show_on_dashboard = forms.BooleanField(\n initial=True,\n required=False,\n label=_('Show on dashboard'),\n help_text=_('Show this event on this website\\'s dashboard, once it is public?'),\n )\n primary_color = forms.CharField(required=False)\n logo = forms.ImageField(\n required=False,\n help_text=_(\n 'If you provide a logo image, we will by default not show your events name and date in the page header. We will show your logo with a maximal height of 120 pixels.'\n ),\n )\n display_header_pattern = forms.ChoiceField(\n label=_('Frontpage header pattern'),\n help_text=_(\n 'Choose how the frontpage header banner will be styled. Pattern source: <a href=\"http://www.heropatterns.com/\">heropatterns.com</a>, CC BY 4.0.'\n ),\n choices=(\n ('', _('Plain')),\n ('pcb', _('Circuits')),\n ('bubbles', _('Circles')),\n ('signal', _('Signal')),\n ('topo', _('Topography')),\n ('graph', _('Graph Paper')),\n ),\n required=False,\n widget=HeaderSelect,\n )\n\n def __init__(self, *args, user=None, locales=None, organiser=None, **kwargs):\n super().__init__(*args, **kwargs)\n\n\nclass EventWizardCopyForm(forms.Form):\n @staticmethod\n def copy_from_queryset(user):\n return Event.objects.filter(\n Q(\n organiser_id__in=user.teams.filter(\n all_events=True, can_change_event_settings=True\n ).values_list('organiser', flat=True)\n )\n | Q(\n id__in=user.teams.filter(can_change_event_settings=True).values_list(\n 'limit_events__id', flat=True\n )\n )\n )\n\n def __init__(self, *args, user=None, locales=None, organiser=None, **kwargs):\n super().__init__(*args, **kwargs)\n self.fields['copy_from_event'] = forms.ModelChoiceField(\n label=_('Copy configuration from'),\n queryset=EventWizardCopyForm.copy_from_queryset(user),\n widget=forms.RadioSelect,\n empty_label=_('Do not copy'),\n required=False,\n )\n", "path": "src/pretalx/event/forms.py"}]} | 2,950 | 135 |
gh_patches_debug_18036 | rasdani/github-patches | git_diff | gratipay__gratipay.com-2620 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Failed ACH transfers aren't reflected in user balance
When payday initiates an ACH transfer for a user's balance, that user's balance is immediately reduced by the amount of the transfer. The problem come on the rare occasions where the ACH fails. The only notification we get (that I know about) is an email from Balanced about ACH failures. We need to restore funds to the user's account when the transfer did not, in fact, occur.
Failed ACH transfers aren't reflected in user balance
When payday initiates an ACH transfer for a user's balance, that user's balance is immediately reduced by the amount of the transfer. The problem come on the rare occasions where the ACH fails. The only notification we get (that I know about) is an email from Balanced about ACH failures. We need to restore funds to the user's account when the transfer did not, in fact, occur.
</issue>
<code>
[start of gittip/security/csrf.py]
1 """Cross Site Request Forgery middleware, borrowed from Django.
2
3 See also:
4
5 https://github.com/django/django/blob/master/django/middleware/csrf.py
6 https://docs.djangoproject.com/en/dev/ref/contrib/csrf/
7 https://github.com/gittip/www.gittip.com/issues/88
8
9 """
10
11 from datetime import timedelta
12 import re
13 import urlparse
14 from aspen import log_dammit
15
16
17 #from django.utils.cache import patch_vary_headers
18 cc_delim_re = re.compile(r'\s*,\s*')
19 def patch_vary_headers(response, newheaders):
20 """
21 Adds (or updates) the "Vary" header in the given HttpResponse object.
22 newheaders is a list of header names that should be in "Vary". Existing
23 headers in "Vary" aren't removed.
24 """
25 # Note that we need to keep the original order intact, because cache
26 # implementations may rely on the order of the Vary contents in, say,
27 # computing an MD5 hash.
28 if 'Vary' in response.headers:
29 vary_headers = cc_delim_re.split(response.headers['Vary'])
30 else:
31 vary_headers = []
32 # Use .lower() here so we treat headers as case-insensitive.
33 existing_headers = set([header.lower() for header in vary_headers])
34 additional_headers = [newheader for newheader in newheaders
35 if newheader.lower() not in existing_headers]
36 response.headers['Vary'] = ', '.join(vary_headers + additional_headers)
37
38
39 #from django.utils.http import same_origin
40 def same_origin(url1, url2):
41 """
42 Checks if two URLs are 'same-origin'
43 """
44 p1, p2 = urlparse.urlparse(url1), urlparse.urlparse(url2)
45 return (p1.scheme, p1.hostname, p1.port) == (p2.scheme, p2.hostname, p2.port)
46
47
48 from aspen import Response
49 from crypto import constant_time_compare, get_random_string
50
51 REASON_NO_REFERER = "Referer checking failed - no Referer."
52 REASON_BAD_REFERER = "Referer checking failed - %s does not match %s."
53 REASON_NO_CSRF_COOKIE = "CSRF cookie not set."
54 REASON_BAD_TOKEN = "CSRF token missing or incorrect."
55
56 TOKEN_LENGTH = 32
57 CSRF_TIMEOUT = timedelta(days=7)
58
59
60 def _get_new_csrf_key():
61 return get_random_string(TOKEN_LENGTH)
62
63
64 def _sanitize_token(token):
65 # Allow only alphanum, and ensure we return a 'str' for the sake
66 # of the post processing middleware.
67 if len(token) > TOKEN_LENGTH:
68 return _get_new_csrf_key()
69 token = re.sub('[^a-zA-Z0-9]+', '', str(token.decode('ascii', 'ignore')))
70 if token == "":
71 # In case the cookie has been truncated to nothing at some point.
72 return _get_new_csrf_key()
73 return token
74
75 def _is_secure(request):
76 import gittip
77 return gittip.canonical_scheme == 'https'
78
79 def _get_host(request):
80 """Returns the HTTP host using the request headers.
81 """
82 return request.headers.get('X-Forwarded-Host', request.headers['Host'])
83
84
85
86 def inbound(request):
87 """Given a Request object, reject it if it's a forgery.
88 """
89 if request.line.uri.startswith('/assets/'): return
90
91 try:
92 csrf_token = request.headers.cookie.get('csrf_token')
93 csrf_token = '' if csrf_token is None else csrf_token.value
94 csrf_token = _sanitize_token(csrf_token)
95 except KeyError:
96 csrf_token = _get_new_csrf_key()
97
98 request.context['csrf_token'] = csrf_token
99
100 # Assume that anything not defined as 'safe' by RC2616 needs protection
101 if request.line.method not in ('GET', 'HEAD', 'OPTIONS', 'TRACE'):
102
103 if _is_secure(request):
104 # Suppose user visits http://example.com/
105 # An active network attacker (man-in-the-middle, MITM) sends a
106 # POST form that targets https://example.com/detonate-bomb/ and
107 # submits it via JavaScript.
108 #
109 # The attacker will need to provide a CSRF cookie and token, but
110 # that's no problem for a MITM and the session-independent
111 # nonce we're using. So the MITM can circumvent the CSRF
112 # protection. This is true for any HTTP connection, but anyone
113 # using HTTPS expects better! For this reason, for
114 # https://example.com/ we need additional protection that treats
115 # http://example.com/ as completely untrusted. Under HTTPS,
116 # Barth et al. found that the Referer header is missing for
117 # same-domain requests in only about 0.2% of cases or less, so
118 # we can use strict Referer checking.
119 referer = request.headers.get('Referer')
120 if referer is None:
121 raise Response(403, REASON_NO_REFERER)
122
123 good_referer = 'https://%s/' % _get_host(request)
124 if not same_origin(referer, good_referer):
125 reason = REASON_BAD_REFERER % (referer, good_referer)
126 log_dammit(reason)
127 raise Response(403, reason)
128
129 if csrf_token is None:
130 raise Response(403, REASON_NO_CSRF_COOKIE)
131
132 # Check non-cookie token for match.
133 request_csrf_token = ""
134 if request.line.method == "POST":
135 request_csrf_token = request.body.get('csrf_token', '')
136
137 if request_csrf_token == "":
138 # Fall back to X-CSRF-TOKEN, to make things easier for AJAX,
139 # and possible for PUT/DELETE.
140 request_csrf_token = request.headers.get('X-CSRF-TOKEN', '')
141
142 if not constant_time_compare(request_csrf_token, csrf_token):
143 raise Response(403, REASON_BAD_TOKEN)
144
145
146 def outbound(request, response):
147 """Store the latest CSRF token as a cookie.
148 """
149 csrf_token = request.context.get('csrf_token')
150 if csrf_token:
151 response.set_cookie('csrf_token', csrf_token, expires=CSRF_TIMEOUT, httponly=False)
152
153 # Content varies with the CSRF cookie, so set the Vary header.
154 patch_vary_headers(response, ('Cookie',))
155
[end of gittip/security/csrf.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/gittip/security/csrf.py b/gittip/security/csrf.py
--- a/gittip/security/csrf.py
+++ b/gittip/security/csrf.py
@@ -87,15 +87,14 @@
"""Given a Request object, reject it if it's a forgery.
"""
if request.line.uri.startswith('/assets/'): return
+ if request.line.uri.startswith('/callbacks/'): return
try:
- csrf_token = request.headers.cookie.get('csrf_token')
- csrf_token = '' if csrf_token is None else csrf_token.value
- csrf_token = _sanitize_token(csrf_token)
+ csrf_token = _sanitize_token(request.headers.cookie['csrf_token'].value)
except KeyError:
- csrf_token = _get_new_csrf_key()
+ csrf_token = None
- request.context['csrf_token'] = csrf_token
+ request.context['csrf_token'] = csrf_token or _get_new_csrf_key()
# Assume that anything not defined as 'safe' by RC2616 needs protection
if request.line.method not in ('GET', 'HEAD', 'OPTIONS', 'TRACE'):
| {"golden_diff": "diff --git a/gittip/security/csrf.py b/gittip/security/csrf.py\n--- a/gittip/security/csrf.py\n+++ b/gittip/security/csrf.py\n@@ -87,15 +87,14 @@\n \"\"\"Given a Request object, reject it if it's a forgery.\n \"\"\"\n if request.line.uri.startswith('/assets/'): return\n+ if request.line.uri.startswith('/callbacks/'): return\n \n try:\n- csrf_token = request.headers.cookie.get('csrf_token')\n- csrf_token = '' if csrf_token is None else csrf_token.value\n- csrf_token = _sanitize_token(csrf_token)\n+ csrf_token = _sanitize_token(request.headers.cookie['csrf_token'].value)\n except KeyError:\n- csrf_token = _get_new_csrf_key()\n+ csrf_token = None\n \n- request.context['csrf_token'] = csrf_token\n+ request.context['csrf_token'] = csrf_token or _get_new_csrf_key()\n \n # Assume that anything not defined as 'safe' by RC2616 needs protection\n if request.line.method not in ('GET', 'HEAD', 'OPTIONS', 'TRACE'):\n", "issue": "Failed ACH transfers aren't reflected in user balance\nWhen payday initiates an ACH transfer for a user's balance, that user's balance is immediately reduced by the amount of the transfer. The problem come on the rare occasions where the ACH fails. The only notification we get (that I know about) is an email from Balanced about ACH failures. We need to restore funds to the user's account when the transfer did not, in fact, occur.\n\nFailed ACH transfers aren't reflected in user balance\nWhen payday initiates an ACH transfer for a user's balance, that user's balance is immediately reduced by the amount of the transfer. The problem come on the rare occasions where the ACH fails. The only notification we get (that I know about) is an email from Balanced about ACH failures. We need to restore funds to the user's account when the transfer did not, in fact, occur.\n\n", "before_files": [{"content": "\"\"\"Cross Site Request Forgery middleware, borrowed from Django.\n\nSee also:\n\n https://github.com/django/django/blob/master/django/middleware/csrf.py\n https://docs.djangoproject.com/en/dev/ref/contrib/csrf/\n https://github.com/gittip/www.gittip.com/issues/88\n\n\"\"\"\n\nfrom datetime import timedelta\nimport re\nimport urlparse\nfrom aspen import log_dammit\n\n\n#from django.utils.cache import patch_vary_headers\ncc_delim_re = re.compile(r'\\s*,\\s*')\ndef patch_vary_headers(response, newheaders):\n \"\"\"\n Adds (or updates) the \"Vary\" header in the given HttpResponse object.\n newheaders is a list of header names that should be in \"Vary\". Existing\n headers in \"Vary\" aren't removed.\n \"\"\"\n # Note that we need to keep the original order intact, because cache\n # implementations may rely on the order of the Vary contents in, say,\n # computing an MD5 hash.\n if 'Vary' in response.headers:\n vary_headers = cc_delim_re.split(response.headers['Vary'])\n else:\n vary_headers = []\n # Use .lower() here so we treat headers as case-insensitive.\n existing_headers = set([header.lower() for header in vary_headers])\n additional_headers = [newheader for newheader in newheaders\n if newheader.lower() not in existing_headers]\n response.headers['Vary'] = ', '.join(vary_headers + additional_headers)\n\n\n#from django.utils.http import same_origin\ndef same_origin(url1, url2):\n \"\"\"\n Checks if two URLs are 'same-origin'\n \"\"\"\n p1, p2 = urlparse.urlparse(url1), urlparse.urlparse(url2)\n return (p1.scheme, p1.hostname, p1.port) == (p2.scheme, p2.hostname, p2.port)\n\n\nfrom aspen import Response\nfrom crypto import constant_time_compare, get_random_string\n\nREASON_NO_REFERER = \"Referer checking failed - no Referer.\"\nREASON_BAD_REFERER = \"Referer checking failed - %s does not match %s.\"\nREASON_NO_CSRF_COOKIE = \"CSRF cookie not set.\"\nREASON_BAD_TOKEN = \"CSRF token missing or incorrect.\"\n\nTOKEN_LENGTH = 32\nCSRF_TIMEOUT = timedelta(days=7)\n\n\ndef _get_new_csrf_key():\n return get_random_string(TOKEN_LENGTH)\n\n\ndef _sanitize_token(token):\n # Allow only alphanum, and ensure we return a 'str' for the sake\n # of the post processing middleware.\n if len(token) > TOKEN_LENGTH:\n return _get_new_csrf_key()\n token = re.sub('[^a-zA-Z0-9]+', '', str(token.decode('ascii', 'ignore')))\n if token == \"\":\n # In case the cookie has been truncated to nothing at some point.\n return _get_new_csrf_key()\n return token\n\ndef _is_secure(request):\n import gittip\n return gittip.canonical_scheme == 'https'\n\ndef _get_host(request):\n \"\"\"Returns the HTTP host using the request headers.\n \"\"\"\n return request.headers.get('X-Forwarded-Host', request.headers['Host'])\n\n\n\ndef inbound(request):\n \"\"\"Given a Request object, reject it if it's a forgery.\n \"\"\"\n if request.line.uri.startswith('/assets/'): return\n\n try:\n csrf_token = request.headers.cookie.get('csrf_token')\n csrf_token = '' if csrf_token is None else csrf_token.value\n csrf_token = _sanitize_token(csrf_token)\n except KeyError:\n csrf_token = _get_new_csrf_key()\n\n request.context['csrf_token'] = csrf_token\n\n # Assume that anything not defined as 'safe' by RC2616 needs protection\n if request.line.method not in ('GET', 'HEAD', 'OPTIONS', 'TRACE'):\n\n if _is_secure(request):\n # Suppose user visits http://example.com/\n # An active network attacker (man-in-the-middle, MITM) sends a\n # POST form that targets https://example.com/detonate-bomb/ and\n # submits it via JavaScript.\n #\n # The attacker will need to provide a CSRF cookie and token, but\n # that's no problem for a MITM and the session-independent\n # nonce we're using. So the MITM can circumvent the CSRF\n # protection. This is true for any HTTP connection, but anyone\n # using HTTPS expects better! For this reason, for\n # https://example.com/ we need additional protection that treats\n # http://example.com/ as completely untrusted. Under HTTPS,\n # Barth et al. found that the Referer header is missing for\n # same-domain requests in only about 0.2% of cases or less, so\n # we can use strict Referer checking.\n referer = request.headers.get('Referer')\n if referer is None:\n raise Response(403, REASON_NO_REFERER)\n\n good_referer = 'https://%s/' % _get_host(request)\n if not same_origin(referer, good_referer):\n reason = REASON_BAD_REFERER % (referer, good_referer)\n log_dammit(reason)\n raise Response(403, reason)\n\n if csrf_token is None:\n raise Response(403, REASON_NO_CSRF_COOKIE)\n\n # Check non-cookie token for match.\n request_csrf_token = \"\"\n if request.line.method == \"POST\":\n request_csrf_token = request.body.get('csrf_token', '')\n\n if request_csrf_token == \"\":\n # Fall back to X-CSRF-TOKEN, to make things easier for AJAX,\n # and possible for PUT/DELETE.\n request_csrf_token = request.headers.get('X-CSRF-TOKEN', '')\n\n if not constant_time_compare(request_csrf_token, csrf_token):\n raise Response(403, REASON_BAD_TOKEN)\n\n\ndef outbound(request, response):\n \"\"\"Store the latest CSRF token as a cookie.\n \"\"\"\n csrf_token = request.context.get('csrf_token')\n if csrf_token:\n response.set_cookie('csrf_token', csrf_token, expires=CSRF_TIMEOUT, httponly=False)\n\n # Content varies with the CSRF cookie, so set the Vary header.\n patch_vary_headers(response, ('Cookie',))\n", "path": "gittip/security/csrf.py"}]} | 2,470 | 252 |
gh_patches_debug_26417 | rasdani/github-patches | git_diff | urllib3__urllib3-187 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Support `io` framework for HTTPResponse
This suggestion is motivated by the following issue that pops up in `requests` (see kennethreitz/requests#1364 - they redirected me here):
```
>>> import io, requests
>>> r = requests.get('http://www.google.com',stream=True)
>>> io.BufferedReader(r.raw).read()
AttributeError: 'HTTPResponse' object has no attribute 'readable'
```
The base problem here is that `requests.packages.urllib3.response.HTTPResponse` object (that's what `r.raw` is) does not respect the `io` API. The following _does_ work, however:
```
>>> r = requests.get('http://www.google.com',stream=True)
>>> r.raw.readable=lambda:True
>>> r.raw.closed=False
>>> io.BufferedReader(r.raw).read()
```
Suggesting that the main thing that is neeeded is adding a `readable` method and a `closed` attribute to `HTTPResponse`. (I think `flush` and `close` are probably also necessary, and maybe also `writable` and `seekable`).
Is there a reason this is not possible, or would it be fine to just add the relevant methods to `HTTPResponse`?
</issue>
<code>
[start of urllib3/response.py]
1 # urllib3/response.py
2 # Copyright 2008-2013 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
3 #
4 # This module is part of urllib3 and is released under
5 # the MIT License: http://www.opensource.org/licenses/mit-license.php
6
7
8 import logging
9 import zlib
10
11 from .exceptions import DecodeError
12 from .packages.six import string_types as basestring, binary_type
13
14
15 log = logging.getLogger(__name__)
16
17
18 class DeflateDecoder(object):
19
20 def __init__(self):
21 self._first_try = True
22 self._data = binary_type()
23 self._obj = zlib.decompressobj()
24
25 def __getattr__(self, name):
26 return getattr(self._obj, name)
27
28 def decompress(self, data):
29 if not self._first_try:
30 return self._obj.decompress(data)
31
32 self._data += data
33 try:
34 return self._obj.decompress(data)
35 except zlib.error:
36 self._first_try = False
37 self._obj = zlib.decompressobj(-zlib.MAX_WBITS)
38 try:
39 return self.decompress(self._data)
40 finally:
41 self._data = None
42
43
44 def _get_decoder(mode):
45 if mode == 'gzip':
46 return zlib.decompressobj(16 + zlib.MAX_WBITS)
47
48 return DeflateDecoder()
49
50
51 class HTTPResponse(object):
52 """
53 HTTP Response container.
54
55 Backwards-compatible to httplib's HTTPResponse but the response ``body`` is
56 loaded and decoded on-demand when the ``data`` property is accessed.
57
58 Extra parameters for behaviour not present in httplib.HTTPResponse:
59
60 :param preload_content:
61 If True, the response's body will be preloaded during construction.
62
63 :param decode_content:
64 If True, attempts to decode specific content-encoding's based on headers
65 (like 'gzip' and 'deflate') will be skipped and raw data will be used
66 instead.
67
68 :param original_response:
69 When this HTTPResponse wrapper is generated from an httplib.HTTPResponse
70 object, it's convenient to include the original for debug purposes. It's
71 otherwise unused.
72 """
73
74 CONTENT_DECODERS = ['gzip', 'deflate']
75
76 def __init__(self, body='', headers=None, status=0, version=0, reason=None,
77 strict=0, preload_content=True, decode_content=True,
78 original_response=None, pool=None, connection=None):
79 self.headers = headers or {}
80 self.status = status
81 self.version = version
82 self.reason = reason
83 self.strict = strict
84 self.decode_content = decode_content
85
86 self._decoder = None
87 self._body = body if body and isinstance(body, basestring) else None
88 self._fp = None
89 self._original_response = original_response
90
91 self._pool = pool
92 self._connection = connection
93
94 if hasattr(body, 'read'):
95 self._fp = body
96
97 if preload_content and not self._body:
98 self._body = self.read(decode_content=decode_content)
99
100 def get_redirect_location(self):
101 """
102 Should we redirect and where to?
103
104 :returns: Truthy redirect location string if we got a redirect status
105 code and valid location. ``None`` if redirect status and no
106 location. ``False`` if not a redirect status code.
107 """
108 if self.status in [301, 302, 303, 307]:
109 return self.headers.get('location')
110
111 return False
112
113 def release_conn(self):
114 if not self._pool or not self._connection:
115 return
116
117 self._pool._put_conn(self._connection)
118 self._connection = None
119
120 @property
121 def data(self):
122 # For backwords-compat with earlier urllib3 0.4 and earlier.
123 if self._body:
124 return self._body
125
126 if self._fp:
127 return self.read(cache_content=True)
128
129 def read(self, amt=None, decode_content=None, cache_content=False):
130 """
131 Similar to :meth:`httplib.HTTPResponse.read`, but with two additional
132 parameters: ``decode_content`` and ``cache_content``.
133
134 :param amt:
135 How much of the content to read. If specified, caching is skipped
136 because it doesn't make sense to cache partial content as the full
137 response.
138
139 :param decode_content:
140 If True, will attempt to decode the body based on the
141 'content-encoding' header.
142
143 :param cache_content:
144 If True, will save the returned data such that the same result is
145 returned despite of the state of the underlying file object. This
146 is useful if you want the ``.data`` property to continue working
147 after having ``.read()`` the file object. (Overridden if ``amt`` is
148 set.)
149 """
150 # Note: content-encoding value should be case-insensitive, per RFC 2616
151 # Section 3.5
152 content_encoding = self.headers.get('content-encoding', '').lower()
153 if self._decoder is None:
154 if content_encoding in self.CONTENT_DECODERS:
155 self._decoder = _get_decoder(content_encoding)
156 if decode_content is None:
157 decode_content = self.decode_content
158
159 if self._fp is None:
160 return
161
162 flush_decoder = False
163
164 try:
165 if amt is None:
166 # cStringIO doesn't like amt=None
167 data = self._fp.read()
168 flush_decoder = True
169 else:
170 cache_content = False
171 data = self._fp.read(amt)
172 if amt != 0 and not data: # Platform-specific: Buggy versions of Python.
173 # Close the connection when no data is returned
174 #
175 # This is redundant to what httplib/http.client _should_
176 # already do. However, versions of python released before
177 # December 15, 2012 (http://bugs.python.org/issue16298) do not
178 # properly close the connection in all cases. There is no harm
179 # in redundantly calling close.
180 self._fp.close()
181 flush_decoder = True
182
183 try:
184 if decode_content and self._decoder:
185 data = self._decoder.decompress(data)
186 except (IOError, zlib.error):
187 raise DecodeError("Received response with content-encoding: %s, but "
188 "failed to decode it." % content_encoding)
189
190 if flush_decoder and self._decoder:
191 buf = self._decoder.decompress(binary_type())
192 data += buf + self._decoder.flush()
193
194 if cache_content:
195 self._body = data
196
197 return data
198
199 finally:
200 if self._original_response and self._original_response.isclosed():
201 self.release_conn()
202
203 @classmethod
204 def from_httplib(ResponseCls, r, **response_kw):
205 """
206 Given an :class:`httplib.HTTPResponse` instance ``r``, return a
207 corresponding :class:`urllib3.response.HTTPResponse` object.
208
209 Remaining parameters are passed to the HTTPResponse constructor, along
210 with ``original_response=r``.
211 """
212
213 # Normalize headers between different versions of Python
214 headers = {}
215 for k, v in r.getheaders():
216 # Python 3: Header keys are returned capitalised
217 k = k.lower()
218
219 has_value = headers.get(k)
220 if has_value: # Python 3: Repeating header keys are unmerged.
221 v = ', '.join([has_value, v])
222
223 headers[k] = v
224
225 # HTTPResponse objects in Python 3 don't have a .strict attribute
226 strict = getattr(r, 'strict', 0)
227 return ResponseCls(body=r,
228 headers=headers,
229 status=r.status,
230 version=r.version,
231 reason=r.reason,
232 strict=strict,
233 original_response=r,
234 **response_kw)
235
236 # Backwards-compatibility methods for httplib.HTTPResponse
237 def getheaders(self):
238 return self.headers
239
240 def getheader(self, name, default=None):
241 return self.headers.get(name, default)
242
[end of urllib3/response.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/urllib3/response.py b/urllib3/response.py
--- a/urllib3/response.py
+++ b/urllib3/response.py
@@ -7,6 +7,7 @@
import logging
import zlib
+import io
from .exceptions import DecodeError
from .packages.six import string_types as basestring, binary_type
@@ -48,7 +49,7 @@
return DeflateDecoder()
-class HTTPResponse(object):
+class HTTPResponse(io.IOBase):
"""
HTTP Response container.
@@ -239,3 +240,35 @@
def getheader(self, name, default=None):
return self.headers.get(name, default)
+
+ # Overrides from io.IOBase
+ def close(self):
+ if not self.closed:
+ self._fp.close()
+
+ @property
+ def closed(self):
+ if self._fp is None:
+ return True
+ elif hasattr(self._fp, 'closed'):
+ return self._fp.closed
+ elif hasattr(self._fp, 'isclosed'): # Python 2
+ return self._fp.isclosed()
+ else:
+ return True
+
+ def fileno(self):
+ if self._fp is None:
+ raise IOError("HTTPResponse has no file to get a fileno from")
+ elif hasattr(self._fp, "fileno"):
+ return self._fp.fileno()
+ else:
+ raise IOError("The file-like object this HTTPResponse is wrapped "
+ "around has no file descriptor")
+
+ def flush(self):
+ if self._fp is not None and hasattr(self._fp, 'flush'):
+ return self._fp.flush()
+
+ def readable(self):
+ return True
| {"golden_diff": "diff --git a/urllib3/response.py b/urllib3/response.py\n--- a/urllib3/response.py\n+++ b/urllib3/response.py\n@@ -7,6 +7,7 @@\n \n import logging\n import zlib\n+import io\n \n from .exceptions import DecodeError\n from .packages.six import string_types as basestring, binary_type\n@@ -48,7 +49,7 @@\n return DeflateDecoder()\n \n \n-class HTTPResponse(object):\n+class HTTPResponse(io.IOBase):\n \"\"\"\n HTTP Response container.\n \n@@ -239,3 +240,35 @@\n \n def getheader(self, name, default=None):\n return self.headers.get(name, default)\n+\n+ # Overrides from io.IOBase\n+ def close(self):\n+ if not self.closed:\n+ self._fp.close()\n+\n+ @property\n+ def closed(self):\n+ if self._fp is None:\n+ return True\n+ elif hasattr(self._fp, 'closed'):\n+ return self._fp.closed\n+ elif hasattr(self._fp, 'isclosed'): # Python 2\n+ return self._fp.isclosed()\n+ else:\n+ return True\n+\n+ def fileno(self):\n+ if self._fp is None:\n+ raise IOError(\"HTTPResponse has no file to get a fileno from\")\n+ elif hasattr(self._fp, \"fileno\"):\n+ return self._fp.fileno()\n+ else:\n+ raise IOError(\"The file-like object this HTTPResponse is wrapped \"\n+ \"around has no file descriptor\")\n+\n+ def flush(self):\n+ if self._fp is not None and hasattr(self._fp, 'flush'):\n+ return self._fp.flush()\n+\n+ def readable(self):\n+ return True\n", "issue": "Support `io` framework for HTTPResponse\nThis suggestion is motivated by the following issue that pops up in `requests` (see kennethreitz/requests#1364 - they redirected me here):\n\n```\n>>> import io, requests\n>>> r = requests.get('http://www.google.com',stream=True)\n>>> io.BufferedReader(r.raw).read()\nAttributeError: 'HTTPResponse' object has no attribute 'readable'\n```\n\nThe base problem here is that `requests.packages.urllib3.response.HTTPResponse` object (that's what `r.raw` is) does not respect the `io` API. The following _does_ work, however:\n\n```\n>>> r = requests.get('http://www.google.com',stream=True)\n>>> r.raw.readable=lambda:True\n>>> r.raw.closed=False\n>>> io.BufferedReader(r.raw).read()\n```\n\nSuggesting that the main thing that is neeeded is adding a `readable` method and a `closed` attribute to `HTTPResponse`. (I think `flush` and `close` are probably also necessary, and maybe also `writable` and `seekable`).\n\nIs there a reason this is not possible, or would it be fine to just add the relevant methods to `HTTPResponse`?\n\n", "before_files": [{"content": "# urllib3/response.py\n# Copyright 2008-2013 Andrey Petrov and contributors (see CONTRIBUTORS.txt)\n#\n# This module is part of urllib3 and is released under\n# the MIT License: http://www.opensource.org/licenses/mit-license.php\n\n\nimport logging\nimport zlib\n\nfrom .exceptions import DecodeError\nfrom .packages.six import string_types as basestring, binary_type\n\n\nlog = logging.getLogger(__name__)\n\n\nclass DeflateDecoder(object):\n\n def __init__(self):\n self._first_try = True\n self._data = binary_type()\n self._obj = zlib.decompressobj()\n\n def __getattr__(self, name):\n return getattr(self._obj, name)\n\n def decompress(self, data):\n if not self._first_try:\n return self._obj.decompress(data)\n\n self._data += data\n try:\n return self._obj.decompress(data)\n except zlib.error:\n self._first_try = False\n self._obj = zlib.decompressobj(-zlib.MAX_WBITS)\n try:\n return self.decompress(self._data)\n finally:\n self._data = None\n\n\ndef _get_decoder(mode):\n if mode == 'gzip':\n return zlib.decompressobj(16 + zlib.MAX_WBITS)\n\n return DeflateDecoder()\n\n\nclass HTTPResponse(object):\n \"\"\"\n HTTP Response container.\n\n Backwards-compatible to httplib's HTTPResponse but the response ``body`` is\n loaded and decoded on-demand when the ``data`` property is accessed.\n\n Extra parameters for behaviour not present in httplib.HTTPResponse:\n\n :param preload_content:\n If True, the response's body will be preloaded during construction.\n\n :param decode_content:\n If True, attempts to decode specific content-encoding's based on headers\n (like 'gzip' and 'deflate') will be skipped and raw data will be used\n instead.\n\n :param original_response:\n When this HTTPResponse wrapper is generated from an httplib.HTTPResponse\n object, it's convenient to include the original for debug purposes. It's\n otherwise unused.\n \"\"\"\n\n CONTENT_DECODERS = ['gzip', 'deflate']\n\n def __init__(self, body='', headers=None, status=0, version=0, reason=None,\n strict=0, preload_content=True, decode_content=True,\n original_response=None, pool=None, connection=None):\n self.headers = headers or {}\n self.status = status\n self.version = version\n self.reason = reason\n self.strict = strict\n self.decode_content = decode_content\n\n self._decoder = None\n self._body = body if body and isinstance(body, basestring) else None\n self._fp = None\n self._original_response = original_response\n\n self._pool = pool\n self._connection = connection\n\n if hasattr(body, 'read'):\n self._fp = body\n\n if preload_content and not self._body:\n self._body = self.read(decode_content=decode_content)\n\n def get_redirect_location(self):\n \"\"\"\n Should we redirect and where to?\n\n :returns: Truthy redirect location string if we got a redirect status\n code and valid location. ``None`` if redirect status and no\n location. ``False`` if not a redirect status code.\n \"\"\"\n if self.status in [301, 302, 303, 307]:\n return self.headers.get('location')\n\n return False\n\n def release_conn(self):\n if not self._pool or not self._connection:\n return\n\n self._pool._put_conn(self._connection)\n self._connection = None\n\n @property\n def data(self):\n # For backwords-compat with earlier urllib3 0.4 and earlier.\n if self._body:\n return self._body\n\n if self._fp:\n return self.read(cache_content=True)\n\n def read(self, amt=None, decode_content=None, cache_content=False):\n \"\"\"\n Similar to :meth:`httplib.HTTPResponse.read`, but with two additional\n parameters: ``decode_content`` and ``cache_content``.\n\n :param amt:\n How much of the content to read. If specified, caching is skipped\n because it doesn't make sense to cache partial content as the full\n response.\n\n :param decode_content:\n If True, will attempt to decode the body based on the\n 'content-encoding' header.\n\n :param cache_content:\n If True, will save the returned data such that the same result is\n returned despite of the state of the underlying file object. This\n is useful if you want the ``.data`` property to continue working\n after having ``.read()`` the file object. (Overridden if ``amt`` is\n set.)\n \"\"\"\n # Note: content-encoding value should be case-insensitive, per RFC 2616\n # Section 3.5\n content_encoding = self.headers.get('content-encoding', '').lower()\n if self._decoder is None:\n if content_encoding in self.CONTENT_DECODERS:\n self._decoder = _get_decoder(content_encoding)\n if decode_content is None:\n decode_content = self.decode_content\n\n if self._fp is None:\n return\n\n flush_decoder = False\n\n try:\n if amt is None:\n # cStringIO doesn't like amt=None\n data = self._fp.read()\n flush_decoder = True\n else:\n cache_content = False\n data = self._fp.read(amt)\n if amt != 0 and not data: # Platform-specific: Buggy versions of Python.\n # Close the connection when no data is returned\n #\n # This is redundant to what httplib/http.client _should_\n # already do. However, versions of python released before\n # December 15, 2012 (http://bugs.python.org/issue16298) do not\n # properly close the connection in all cases. There is no harm\n # in redundantly calling close.\n self._fp.close()\n flush_decoder = True\n\n try:\n if decode_content and self._decoder:\n data = self._decoder.decompress(data)\n except (IOError, zlib.error):\n raise DecodeError(\"Received response with content-encoding: %s, but \"\n \"failed to decode it.\" % content_encoding)\n\n if flush_decoder and self._decoder:\n buf = self._decoder.decompress(binary_type())\n data += buf + self._decoder.flush()\n\n if cache_content:\n self._body = data\n\n return data\n\n finally:\n if self._original_response and self._original_response.isclosed():\n self.release_conn()\n\n @classmethod\n def from_httplib(ResponseCls, r, **response_kw):\n \"\"\"\n Given an :class:`httplib.HTTPResponse` instance ``r``, return a\n corresponding :class:`urllib3.response.HTTPResponse` object.\n\n Remaining parameters are passed to the HTTPResponse constructor, along\n with ``original_response=r``.\n \"\"\"\n\n # Normalize headers between different versions of Python\n headers = {}\n for k, v in r.getheaders():\n # Python 3: Header keys are returned capitalised\n k = k.lower()\n\n has_value = headers.get(k)\n if has_value: # Python 3: Repeating header keys are unmerged.\n v = ', '.join([has_value, v])\n\n headers[k] = v\n\n # HTTPResponse objects in Python 3 don't have a .strict attribute\n strict = getattr(r, 'strict', 0)\n return ResponseCls(body=r,\n headers=headers,\n status=r.status,\n version=r.version,\n reason=r.reason,\n strict=strict,\n original_response=r,\n **response_kw)\n\n # Backwards-compatibility methods for httplib.HTTPResponse\n def getheaders(self):\n return self.headers\n\n def getheader(self, name, default=None):\n return self.headers.get(name, default)\n", "path": "urllib3/response.py"}]} | 3,188 | 394 |
gh_patches_debug_32596 | rasdani/github-patches | git_diff | plone__Products.CMFPlone-2840 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
AttributeError: 'PersistentAdapterRegistry' object has no attribute 'lookupAll'
The following error is raised in Plone 5.1 when you try to install a new Plone site with an add-on where the Dexterity content-class could not be imported properly e.g. for some NameError in my case.
In particular this error message shadows the primary problem. It seems to me that some errors in the bootstrapping phase of Plone or inside of GS are just swallowed.
```
2017-11-30 11:29:03 ERROR txn.140599418205952 Failed to abort resource manager: <Products.CMFCore.indexing.QueueTM object at 0x7fdfddecbd50>
Traceback (most recent call last):
File "/home/ajung/.buildout/eggs/transaction-2.1.2-py2.7.egg/transaction/_transaction.py", line 514, in abort
rm.abort(self)
File "/home/ajung/.buildout/eggs/Products.CMFCore-2.2.12-py2.7.egg/Products/CMFCore/indexing.py", line 321, in tpc_abort
self.queue.abort()
File "/home/ajung/.buildout/eggs/Products.CMFCore-2.2.12-py2.7.egg/Products/CMFCore/indexing.py", line 237, in abort
for name, util in sm.getUtilitiesFor(IIndexQueueProcessor):
File "/home/ajung/.buildout/eggs/zope.interface-4.4.2-py2.7-linux-x86_64.egg/zope/interface/registry.py", line 290, in getUtilitiesFor
for name, utility in self.utilities.lookupAll((), interface):
AttributeError: 'PersistentAdapterRegistry' object has no attribute 'lookupAll'
```
</issue>
<code>
[start of Products/CMFPlone/factory.py]
1 # -*- coding: utf-8 -*-
2 from Products.CMFPlone.Portal import PloneSite
3 from Products.CMFPlone.events import SiteManagerCreatedEvent
4 from Products.CMFPlone.interfaces import INonInstallable
5 from Products.GenericSetup.tool import SetupTool
6 from plone.registry.interfaces import IRegistry
7 from zope.component import queryUtility
8 from zope.event import notify
9 from zope.interface import implementer
10 from zope.site.hooks import setSite
11
12 _TOOL_ID = 'portal_setup'
13 _DEFAULT_PROFILE = 'Products.CMFPlone:plone'
14 _CONTENT_PROFILE = 'plone.app.contenttypes:plone-content'
15
16 # A little hint for PloneTestCase
17 _IMREALLYPLONE5 = True
18
19
20 @implementer(INonInstallable)
21 class NonInstallable(object):
22
23 def getNonInstallableProducts(self):
24 return [
25 'Archetypes', 'Products.Archetypes',
26 'CMFDefault', 'Products.CMFDefault',
27 'CMFPlone', 'Products.CMFPlone', 'Products.CMFPlone.migrations',
28 'CMFTopic', 'Products.CMFTopic',
29 'CMFUid', 'Products.CMFUid',
30 'DCWorkflow', 'Products.DCWorkflow',
31 'PasswordResetTool', 'Products.PasswordResetTool',
32 'PlonePAS', 'Products.PlonePAS',
33 'wicked.at',
34 'PloneLanguageTool', 'Products.PloneLanguageTool',
35 'CMFFormController', 'Products.CMFFormController',
36 'MimetypesRegistry', 'Products.MimetypesRegistry',
37 'PortalTransforms', 'Products.PortalTransforms',
38 'CMFDiffTool', 'Products.CMFDiffTool',
39 'CMFEditions', 'Products.CMFEditions',
40 'Products.NuPlone',
41 'borg.localrole',
42 'plone.app.blob',
43 'plone.app.caching',
44 'plone.app.collection',
45 'plone.app.dexterity',
46 'plone.app.discussion',
47 'plone.app.event',
48 'plone.app.imaging',
49 'plone.app.intid',
50 'plone.app.linkintegrity',
51 'plone.app.querystring',
52 'plone.app.registry',
53 'plone.app.referenceablebehavior',
54 'plone.app.relationfield',
55 'plone.app.theming',
56 'plone.app.users',
57 'plone.app.widgets',
58 'plone.app.z3cform',
59 'plone.formwidget.recurrence',
60 'plone.keyring',
61 'plone.outputfilters',
62 'plone.portlet.static',
63 'plone.portlet.collection',
64 'plone.protect',
65 'plone.resource',
66 'plonetheme.barceloneta',
67 ]
68
69 def getNonInstallableProfiles(self):
70 return [_DEFAULT_PROFILE,
71 _CONTENT_PROFILE,
72 u'Products.Archetypes:Archetypes',
73 u'Products.ATContentTypes:default',
74 u'Products.CMFDiffTool:CMFDiffTool',
75 u'Products.CMFEditions:CMFEditions',
76 u'Products.CMFFormController:CMFFormController',
77 u'Products.CMFPlone:dependencies',
78 u'Products.CMFPlone:testfixture',
79 u'Products.CMFQuickInstallerTool:CMFQuickInstallerTool',
80 u'Products.NuPlone:uninstall',
81 u'Products.MimetypesRegistry:MimetypesRegistry',
82 u'Products.PasswordResetTool:PasswordResetTool',
83 u'Products.PortalTransforms:PortalTransforms',
84 u'Products.PloneLanguageTool:PloneLanguageTool',
85 u'Products.PlonePAS:PlonePAS',
86 u'borg.localrole:default',
87 u'plone.browserlayer:default',
88 u'plone.keyring:default',
89 u'plone.outputfilters:default',
90 u'plone.portlet.static:default',
91 u'plone.portlet.collection:default',
92 u'plone.protect:default',
93 u'plone.app.blob:default',
94 u'plone.app.blob:file-replacement',
95 u'plone.app.blob:image-replacement',
96 u'plone.app.blob:sample-type',
97 u'plone.app.collection:default',
98 u'plone.app.contenttypes:default',
99 u'plone.app.dexterity:default',
100 u'plone.app.discussion:default',
101 u'plone.app.event:default',
102 u'plone.app.imaging:default',
103 u'plone.app.linkintegrity:default',
104 u'plone.app.registry:default',
105 u'plone.app.relationfield:default',
106 u'plone.app.theming:default',
107 u'plone.app.users:default',
108 u'plone.app.versioningbehavior:default',
109 u'plone.app.z3cform:default',
110 u'plone.formwidget.recurrence:default',
111 u'plone.resource:default',
112 ]
113
114
115 def zmi_constructor(context):
116 """This is a dummy constructor for the ZMI."""
117 url = context.DestinationURL()
118 request = context.REQUEST
119 return request.response.redirect(url + '/@@plone-addsite?site_id=Plone')
120
121
122 def addPloneSite(context, site_id, title='Plone site', description='',
123 profile_id=_DEFAULT_PROFILE,
124 content_profile_id=_CONTENT_PROFILE, snapshot=False,
125 extension_ids=(), setup_content=True,
126 default_language='en', portal_timezone='UTC'):
127 """Add a PloneSite to the context."""
128 context._setObject(site_id, PloneSite(site_id))
129 site = context._getOb(site_id)
130 site.setLanguage(default_language)
131 # Set the accepted language for the rest of the request. This makes sure
132 # the front-page text gets the correct translation also when your browser
133 # prefers non-English and you choose English as language for the Plone
134 # Site.
135 request = context.REQUEST
136 request['HTTP_ACCEPT_LANGUAGE'] = default_language
137
138 site[_TOOL_ID] = SetupTool(_TOOL_ID)
139 setup_tool = site[_TOOL_ID]
140
141 notify(SiteManagerCreatedEvent(site))
142 setSite(site)
143
144 setup_tool.setBaselineContext('profile-%s' % profile_id)
145 setup_tool.runAllImportStepsFromProfile('profile-%s' % profile_id)
146
147 reg = queryUtility(IRegistry, context=site)
148 reg['plone.portal_timezone'] = portal_timezone
149 reg['plone.available_timezones'] = [portal_timezone]
150 reg['plone.default_language'] = default_language
151 reg['plone.available_languages'] = [default_language]
152
153 if setup_content:
154 setup_tool.runAllImportStepsFromProfile(
155 'profile-%s' % content_profile_id)
156
157 props = dict(
158 title=title,
159 description=description,
160 )
161 # Do this before applying extension profiles, so the settings from a
162 # properties.xml file are applied and not overwritten by this
163 site.manage_changeProperties(**props)
164
165 for extension_id in extension_ids:
166 setup_tool.runAllImportStepsFromProfile(
167 'profile-%s' % extension_id)
168
169 if snapshot is True:
170 setup_tool.createSnapshot('initial_configuration')
171
172 return site
173
[end of Products/CMFPlone/factory.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/Products/CMFPlone/factory.py b/Products/CMFPlone/factory.py
--- a/Products/CMFPlone/factory.py
+++ b/Products/CMFPlone/factory.py
@@ -1,8 +1,11 @@
# -*- coding: utf-8 -*-
+from Products.CMFPlone import PloneMessageFactory as _
from Products.CMFPlone.Portal import PloneSite
from Products.CMFPlone.events import SiteManagerCreatedEvent
from Products.CMFPlone.interfaces import INonInstallable
from Products.GenericSetup.tool import SetupTool
+from Products.statusmessages.interfaces import IStatusMessage
+from logging import getLogger
from plone.registry.interfaces import IRegistry
from zope.component import queryUtility
from zope.event import notify
@@ -16,6 +19,8 @@
# A little hint for PloneTestCase
_IMREALLYPLONE5 = True
+logger = getLogger('Plone')
+
@implementer(INonInstallable)
class NonInstallable(object):
@@ -163,8 +168,23 @@
site.manage_changeProperties(**props)
for extension_id in extension_ids:
- setup_tool.runAllImportStepsFromProfile(
- 'profile-%s' % extension_id)
+ try:
+ setup_tool.runAllImportStepsFromProfile(
+ 'profile-%s' % extension_id)
+ except Exception as msg:
+ IStatusMessage(request).add(_(
+ 'Could not install ${profile_id}: ${error_msg}! '
+ 'Please try to install it manually using the "Addons" '
+ 'controlpanel and report any issues to the '
+ 'addon maintainers.',
+ mapping={
+ 'profile_id': extension_id,
+ 'error_msg': msg.args,
+ }),
+ type='error')
+ logger.exception(
+ 'Error while installing addon {}. '
+ 'See traceback below for details.'.format(extension_id))
if snapshot is True:
setup_tool.createSnapshot('initial_configuration')
| {"golden_diff": "diff --git a/Products/CMFPlone/factory.py b/Products/CMFPlone/factory.py\n--- a/Products/CMFPlone/factory.py\n+++ b/Products/CMFPlone/factory.py\n@@ -1,8 +1,11 @@\n # -*- coding: utf-8 -*-\n+from Products.CMFPlone import PloneMessageFactory as _\n from Products.CMFPlone.Portal import PloneSite\n from Products.CMFPlone.events import SiteManagerCreatedEvent\n from Products.CMFPlone.interfaces import INonInstallable\n from Products.GenericSetup.tool import SetupTool\n+from Products.statusmessages.interfaces import IStatusMessage\n+from logging import getLogger\n from plone.registry.interfaces import IRegistry\n from zope.component import queryUtility\n from zope.event import notify\n@@ -16,6 +19,8 @@\n # A little hint for PloneTestCase\n _IMREALLYPLONE5 = True\n \n+logger = getLogger('Plone')\n+\n \n @implementer(INonInstallable)\n class NonInstallable(object):\n@@ -163,8 +168,23 @@\n site.manage_changeProperties(**props)\n \n for extension_id in extension_ids:\n- setup_tool.runAllImportStepsFromProfile(\n- 'profile-%s' % extension_id)\n+ try:\n+ setup_tool.runAllImportStepsFromProfile(\n+ 'profile-%s' % extension_id)\n+ except Exception as msg:\n+ IStatusMessage(request).add(_(\n+ 'Could not install ${profile_id}: ${error_msg}! '\n+ 'Please try to install it manually using the \"Addons\" '\n+ 'controlpanel and report any issues to the '\n+ 'addon maintainers.',\n+ mapping={\n+ 'profile_id': extension_id,\n+ 'error_msg': msg.args,\n+ }),\n+ type='error')\n+ logger.exception(\n+ 'Error while installing addon {}. '\n+ 'See traceback below for details.'.format(extension_id))\n \n if snapshot is True:\n setup_tool.createSnapshot('initial_configuration')\n", "issue": "AttributeError: 'PersistentAdapterRegistry' object has no attribute 'lookupAll'\nThe following error is raised in Plone 5.1 when you try to install a new Plone site with an add-on where the Dexterity content-class could not be imported properly e.g. for some NameError in my case.\r\n\r\nIn particular this error message shadows the primary problem. It seems to me that some errors in the bootstrapping phase of Plone or inside of GS are just swallowed.\r\n\r\n```\r\n2017-11-30 11:29:03 ERROR txn.140599418205952 Failed to abort resource manager: <Products.CMFCore.indexing.QueueTM object at 0x7fdfddecbd50>\r\nTraceback (most recent call last):\r\n File \"/home/ajung/.buildout/eggs/transaction-2.1.2-py2.7.egg/transaction/_transaction.py\", line 514, in abort\r\n rm.abort(self)\r\n File \"/home/ajung/.buildout/eggs/Products.CMFCore-2.2.12-py2.7.egg/Products/CMFCore/indexing.py\", line 321, in tpc_abort\r\n self.queue.abort()\r\n File \"/home/ajung/.buildout/eggs/Products.CMFCore-2.2.12-py2.7.egg/Products/CMFCore/indexing.py\", line 237, in abort\r\n for name, util in sm.getUtilitiesFor(IIndexQueueProcessor):\r\n File \"/home/ajung/.buildout/eggs/zope.interface-4.4.2-py2.7-linux-x86_64.egg/zope/interface/registry.py\", line 290, in getUtilitiesFor\r\n for name, utility in self.utilities.lookupAll((), interface):\r\nAttributeError: 'PersistentAdapterRegistry' object has no attribute 'lookupAll'\r\n```\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\nfrom Products.CMFPlone.Portal import PloneSite\nfrom Products.CMFPlone.events import SiteManagerCreatedEvent\nfrom Products.CMFPlone.interfaces import INonInstallable\nfrom Products.GenericSetup.tool import SetupTool\nfrom plone.registry.interfaces import IRegistry\nfrom zope.component import queryUtility\nfrom zope.event import notify\nfrom zope.interface import implementer\nfrom zope.site.hooks import setSite\n\n_TOOL_ID = 'portal_setup'\n_DEFAULT_PROFILE = 'Products.CMFPlone:plone'\n_CONTENT_PROFILE = 'plone.app.contenttypes:plone-content'\n\n# A little hint for PloneTestCase\n_IMREALLYPLONE5 = True\n\n\n@implementer(INonInstallable)\nclass NonInstallable(object):\n\n def getNonInstallableProducts(self):\n return [\n 'Archetypes', 'Products.Archetypes',\n 'CMFDefault', 'Products.CMFDefault',\n 'CMFPlone', 'Products.CMFPlone', 'Products.CMFPlone.migrations',\n 'CMFTopic', 'Products.CMFTopic',\n 'CMFUid', 'Products.CMFUid',\n 'DCWorkflow', 'Products.DCWorkflow',\n 'PasswordResetTool', 'Products.PasswordResetTool',\n 'PlonePAS', 'Products.PlonePAS',\n 'wicked.at',\n 'PloneLanguageTool', 'Products.PloneLanguageTool',\n 'CMFFormController', 'Products.CMFFormController',\n 'MimetypesRegistry', 'Products.MimetypesRegistry',\n 'PortalTransforms', 'Products.PortalTransforms',\n 'CMFDiffTool', 'Products.CMFDiffTool',\n 'CMFEditions', 'Products.CMFEditions',\n 'Products.NuPlone',\n 'borg.localrole',\n 'plone.app.blob',\n 'plone.app.caching',\n 'plone.app.collection',\n 'plone.app.dexterity',\n 'plone.app.discussion',\n 'plone.app.event',\n 'plone.app.imaging',\n 'plone.app.intid',\n 'plone.app.linkintegrity',\n 'plone.app.querystring',\n 'plone.app.registry',\n 'plone.app.referenceablebehavior',\n 'plone.app.relationfield',\n 'plone.app.theming',\n 'plone.app.users',\n 'plone.app.widgets',\n 'plone.app.z3cform',\n 'plone.formwidget.recurrence',\n 'plone.keyring',\n 'plone.outputfilters',\n 'plone.portlet.static',\n 'plone.portlet.collection',\n 'plone.protect',\n 'plone.resource',\n 'plonetheme.barceloneta',\n ]\n\n def getNonInstallableProfiles(self):\n return [_DEFAULT_PROFILE,\n _CONTENT_PROFILE,\n u'Products.Archetypes:Archetypes',\n u'Products.ATContentTypes:default',\n u'Products.CMFDiffTool:CMFDiffTool',\n u'Products.CMFEditions:CMFEditions',\n u'Products.CMFFormController:CMFFormController',\n u'Products.CMFPlone:dependencies',\n u'Products.CMFPlone:testfixture',\n u'Products.CMFQuickInstallerTool:CMFQuickInstallerTool',\n u'Products.NuPlone:uninstall',\n u'Products.MimetypesRegistry:MimetypesRegistry',\n u'Products.PasswordResetTool:PasswordResetTool',\n u'Products.PortalTransforms:PortalTransforms',\n u'Products.PloneLanguageTool:PloneLanguageTool',\n u'Products.PlonePAS:PlonePAS',\n u'borg.localrole:default',\n u'plone.browserlayer:default',\n u'plone.keyring:default',\n u'plone.outputfilters:default',\n u'plone.portlet.static:default',\n u'plone.portlet.collection:default',\n u'plone.protect:default',\n u'plone.app.blob:default',\n u'plone.app.blob:file-replacement',\n u'plone.app.blob:image-replacement',\n u'plone.app.blob:sample-type',\n u'plone.app.collection:default',\n u'plone.app.contenttypes:default',\n u'plone.app.dexterity:default',\n u'plone.app.discussion:default',\n u'plone.app.event:default',\n u'plone.app.imaging:default',\n u'plone.app.linkintegrity:default',\n u'plone.app.registry:default',\n u'plone.app.relationfield:default',\n u'plone.app.theming:default',\n u'plone.app.users:default',\n u'plone.app.versioningbehavior:default',\n u'plone.app.z3cform:default',\n u'plone.formwidget.recurrence:default',\n u'plone.resource:default',\n ]\n\n\ndef zmi_constructor(context):\n \"\"\"This is a dummy constructor for the ZMI.\"\"\"\n url = context.DestinationURL()\n request = context.REQUEST\n return request.response.redirect(url + '/@@plone-addsite?site_id=Plone')\n\n\ndef addPloneSite(context, site_id, title='Plone site', description='',\n profile_id=_DEFAULT_PROFILE,\n content_profile_id=_CONTENT_PROFILE, snapshot=False,\n extension_ids=(), setup_content=True,\n default_language='en', portal_timezone='UTC'):\n \"\"\"Add a PloneSite to the context.\"\"\"\n context._setObject(site_id, PloneSite(site_id))\n site = context._getOb(site_id)\n site.setLanguage(default_language)\n # Set the accepted language for the rest of the request. This makes sure\n # the front-page text gets the correct translation also when your browser\n # prefers non-English and you choose English as language for the Plone\n # Site.\n request = context.REQUEST\n request['HTTP_ACCEPT_LANGUAGE'] = default_language\n\n site[_TOOL_ID] = SetupTool(_TOOL_ID)\n setup_tool = site[_TOOL_ID]\n\n notify(SiteManagerCreatedEvent(site))\n setSite(site)\n\n setup_tool.setBaselineContext('profile-%s' % profile_id)\n setup_tool.runAllImportStepsFromProfile('profile-%s' % profile_id)\n\n reg = queryUtility(IRegistry, context=site)\n reg['plone.portal_timezone'] = portal_timezone\n reg['plone.available_timezones'] = [portal_timezone]\n reg['plone.default_language'] = default_language\n reg['plone.available_languages'] = [default_language]\n\n if setup_content:\n setup_tool.runAllImportStepsFromProfile(\n 'profile-%s' % content_profile_id)\n\n props = dict(\n title=title,\n description=description,\n )\n # Do this before applying extension profiles, so the settings from a\n # properties.xml file are applied and not overwritten by this\n site.manage_changeProperties(**props)\n\n for extension_id in extension_ids:\n setup_tool.runAllImportStepsFromProfile(\n 'profile-%s' % extension_id)\n\n if snapshot is True:\n setup_tool.createSnapshot('initial_configuration')\n\n return site\n", "path": "Products/CMFPlone/factory.py"}]} | 2,964 | 451 |
gh_patches_debug_36065 | rasdani/github-patches | git_diff | encode__starlette-150 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Form field names do not escape perfect encoding
I switched one microservice from Flask to Starlette and got unexpected form parsing problem.
This code will return %20 in places where spaces were supposed to be:
```
from starlette.applications import Starlette
from starlette.responses import PlainTextResponse
from starlette.requests import Request as StarletteRequest
SERVER = Starlette()
@SERVER.route("/send", methods=["POST"])
async def send_endpoint(request: StarletteRequest) -> PlainTextResponse:
form = await request.form()
if "number" in form and "name" in form:
number = form["number"]
name = form["name"]
return PlainTextResponse("Number: " + number + " ; Name: " + name)
```
Maybe there are other issues with form parsing (x-www-form-urlencoded).
</issue>
<code>
[start of starlette/formparsers.py]
1 from enum import Enum
2 from starlette.datastructures import Headers
3 import asyncio
4 import io
5 import tempfile
6 import typing
7
8 try:
9 from multipart.multipart import parse_options_header
10 import multipart
11 except ImportError: # pragma: nocover
12 parse_options_header = None # type: ignore
13 multipart = None # type: ignore
14
15
16 class FormMessage(Enum):
17 FIELD_START = 1
18 FIELD_NAME = 2
19 FIELD_DATA = 3
20 FIELD_END = 4
21 END = 5
22
23
24 class MultiPartMessage(Enum):
25 PART_BEGIN = 1
26 PART_DATA = 2
27 PART_END = 3
28 HEADER_FIELD = 4
29 HEADER_VALUE = 5
30 HEADER_END = 6
31 HEADERS_FINISHED = 7
32 END = 8
33
34
35 class UploadFile:
36 def __init__(self, filename: str) -> None:
37 self.filename = filename
38 self._file = io.BytesIO() # type: typing.IO[typing.Any]
39 self._loop = asyncio.get_event_loop()
40
41 def create_tempfile(self) -> None:
42 self._file = tempfile.SpooledTemporaryFile()
43
44 async def setup(self) -> None:
45 await self._loop.run_in_executor(None, self.create_tempfile)
46
47 async def write(self, data: bytes) -> None:
48 await self._loop.run_in_executor(None, self._file.write, data)
49
50 async def read(self, size: int = None) -> bytes:
51 return await self._loop.run_in_executor(None, self._file.read, size)
52
53 async def seek(self, offset: int) -> None:
54 await self._loop.run_in_executor(None, self._file.seek, offset)
55
56 async def close(self) -> None:
57 await self._loop.run_in_executor(None, self._file.close)
58
59
60 class FormParser:
61 def __init__(
62 self, headers: Headers, stream: typing.AsyncGenerator[bytes, None]
63 ) -> None:
64 assert (
65 multipart is not None
66 ), "The `python-multipart` library must be installed to use form parsing."
67 self.headers = headers
68 self.stream = stream
69 self.messages = [] # type: typing.List[typing.Tuple[FormMessage, bytes]]
70
71 def on_field_start(self) -> None:
72 print("on_field_start")
73 message = (FormMessage.FIELD_START, b"")
74 self.messages.append(message)
75
76 def on_field_name(self, data: bytes, start: int, end: int) -> None:
77 print("on_field_name")
78 message = (FormMessage.FIELD_NAME, data[start:end])
79 self.messages.append(message)
80
81 def on_field_data(self, data: bytes, start: int, end: int) -> None:
82 print("on_field_data")
83 message = (FormMessage.FIELD_DATA, data[start:end])
84 self.messages.append(message)
85
86 def on_field_end(self) -> None:
87 print("on_field_end")
88 message = (FormMessage.FIELD_END, b"")
89 self.messages.append(message)
90
91 def on_end(self) -> None:
92 print("on_end")
93 message = (FormMessage.END, b"")
94 self.messages.append(message)
95
96 async def parse(self) -> typing.Dict[str, typing.Union[str, UploadFile]]:
97 # Callbacks dictionary.
98 callbacks = {
99 "on_field_start": self.on_field_start,
100 "on_field_name": self.on_field_name,
101 "on_field_data": self.on_field_data,
102 "on_field_end": self.on_field_end,
103 "on_end": self.on_end,
104 }
105
106 # Create the parser.
107 parser = multipart.QuerystringParser(callbacks)
108 field_name = b""
109 field_value = b""
110
111 result = {} # type: typing.Dict[str, typing.Union[str, UploadFile]]
112
113 # Feed the parser with data from the request.
114 async for chunk in self.stream:
115 if chunk:
116 parser.write(chunk)
117 else:
118 parser.finalize()
119 messages = list(self.messages)
120 self.messages.clear()
121 for message_type, message_bytes in messages:
122 if message_type == FormMessage.FIELD_START:
123 field_name = b""
124 field_value = b""
125 elif message_type == FormMessage.FIELD_NAME:
126 field_name += message_bytes
127 elif message_type == FormMessage.FIELD_DATA:
128 field_value += message_bytes
129 elif message_type == FormMessage.FIELD_END:
130 result[field_name.decode("latin-1")] = field_value.decode("latin-1")
131 elif message_type == FormMessage.END:
132 pass
133
134 return result
135
136
137 class MultiPartParser:
138 def __init__(
139 self, headers: Headers, stream: typing.AsyncGenerator[bytes, None]
140 ) -> None:
141 assert (
142 multipart is not None
143 ), "The `python-multipart` library must be installed to use form parsing."
144 self.headers = headers
145 self.stream = stream
146 self.messages = [] # type: typing.List[typing.Tuple[MultiPartMessage, bytes]]
147
148 def on_part_begin(self) -> None:
149 message = (MultiPartMessage.PART_BEGIN, b"")
150 self.messages.append(message)
151
152 def on_part_data(self, data: bytes, start: int, end: int) -> None:
153 message = (MultiPartMessage.PART_DATA, data[start:end])
154 self.messages.append(message)
155
156 def on_part_end(self) -> None:
157 message = (MultiPartMessage.PART_END, b"")
158 self.messages.append(message)
159
160 def on_header_field(self, data: bytes, start: int, end: int) -> None:
161 message = (MultiPartMessage.HEADER_FIELD, data[start:end])
162 self.messages.append(message)
163
164 def on_header_value(self, data: bytes, start: int, end: int) -> None:
165 message = (MultiPartMessage.HEADER_VALUE, data[start:end])
166 self.messages.append(message)
167
168 def on_header_end(self) -> None:
169 message = (MultiPartMessage.HEADER_END, b"")
170 self.messages.append(message)
171
172 def on_headers_finished(self) -> None:
173 message = (MultiPartMessage.HEADERS_FINISHED, b"")
174 self.messages.append(message)
175
176 def on_end(self) -> None:
177 message = (MultiPartMessage.END, b"")
178 self.messages.append(message)
179
180 async def parse(self) -> typing.Dict[str, typing.Union[str, UploadFile]]:
181 # Parse the Content-Type header to get the multipart boundary.
182 content_type, params = parse_options_header(self.headers["Content-Type"])
183 boundary = params.get(b"boundary")
184
185 # Callbacks dictionary.
186 callbacks = {
187 "on_part_begin": self.on_part_begin,
188 "on_part_data": self.on_part_data,
189 "on_part_end": self.on_part_end,
190 "on_header_field": self.on_header_field,
191 "on_header_value": self.on_header_value,
192 "on_header_end": self.on_header_end,
193 "on_headers_finished": self.on_headers_finished,
194 "on_end": self.on_end,
195 }
196
197 # Create the parser.
198 parser = multipart.MultipartParser(boundary, callbacks)
199 header_field = b""
200 header_value = b""
201 raw_headers = [] # type: typing.List[typing.Tuple[bytes, bytes]]
202 field_name = ""
203 data = b""
204 file = None # type: typing.Optional[UploadFile]
205
206 result = {} # type: typing.Dict[str, typing.Union[str, UploadFile]]
207
208 # Feed the parser with data from the request.
209 async for chunk in self.stream:
210 parser.write(chunk)
211 messages = list(self.messages)
212 self.messages.clear()
213 for message_type, message_bytes in messages:
214 if message_type == MultiPartMessage.PART_BEGIN:
215 raw_headers = []
216 data = b""
217 elif message_type == MultiPartMessage.HEADER_FIELD:
218 header_field += message_bytes
219 elif message_type == MultiPartMessage.HEADER_VALUE:
220 header_value += message_bytes
221 elif message_type == MultiPartMessage.HEADER_END:
222 raw_headers.append((header_field.lower(), header_value))
223 header_field = b""
224 header_value = b""
225 elif message_type == MultiPartMessage.HEADERS_FINISHED:
226 headers = Headers(raw=raw_headers)
227 content_disposition = headers.get("Content-Disposition")
228 disposition, options = parse_options_header(content_disposition)
229 field_name = options[b"name"].decode("latin-1")
230 if b"filename" in options:
231 filename = options[b"filename"].decode("latin-1")
232 file = UploadFile(filename=filename)
233 await file.setup()
234 elif message_type == MultiPartMessage.PART_DATA:
235 if file is None:
236 data += message_bytes
237 else:
238 await file.write(message_bytes)
239 elif message_type == MultiPartMessage.PART_END:
240 if file is None:
241 result[field_name] = data.decode("latin-1")
242 else:
243 await file.seek(0)
244 result[field_name] = file
245 elif message_type == MultiPartMessage.END:
246 pass
247
248 parser.finalize()
249 return result
250
[end of starlette/formparsers.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/starlette/formparsers.py b/starlette/formparsers.py
--- a/starlette/formparsers.py
+++ b/starlette/formparsers.py
@@ -1,9 +1,11 @@
-from enum import Enum
-from starlette.datastructures import Headers
-import asyncio
import io
-import tempfile
import typing
+import asyncio
+import tempfile
+from enum import Enum
+from urllib.parse import unquote
+
+from starlette.datastructures import Headers
try:
from multipart.multipart import parse_options_header
@@ -69,27 +71,22 @@
self.messages = [] # type: typing.List[typing.Tuple[FormMessage, bytes]]
def on_field_start(self) -> None:
- print("on_field_start")
message = (FormMessage.FIELD_START, b"")
self.messages.append(message)
def on_field_name(self, data: bytes, start: int, end: int) -> None:
- print("on_field_name")
message = (FormMessage.FIELD_NAME, data[start:end])
self.messages.append(message)
def on_field_data(self, data: bytes, start: int, end: int) -> None:
- print("on_field_data")
message = (FormMessage.FIELD_DATA, data[start:end])
self.messages.append(message)
def on_field_end(self) -> None:
- print("on_field_end")
message = (FormMessage.FIELD_END, b"")
self.messages.append(message)
def on_end(self) -> None:
- print("on_end")
message = (FormMessage.END, b"")
self.messages.append(message)
@@ -127,7 +124,9 @@
elif message_type == FormMessage.FIELD_DATA:
field_value += message_bytes
elif message_type == FormMessage.FIELD_END:
- result[field_name.decode("latin-1")] = field_value.decode("latin-1")
+ result[field_name.decode("latin-1")] = unquote(
+ field_value.decode("latin-1")
+ )
elif message_type == FormMessage.END:
pass
| {"golden_diff": "diff --git a/starlette/formparsers.py b/starlette/formparsers.py\n--- a/starlette/formparsers.py\n+++ b/starlette/formparsers.py\n@@ -1,9 +1,11 @@\n-from enum import Enum\n-from starlette.datastructures import Headers\n-import asyncio\n import io\n-import tempfile\n import typing\n+import asyncio\n+import tempfile\n+from enum import Enum\n+from urllib.parse import unquote\n+\n+from starlette.datastructures import Headers\n \n try:\n from multipart.multipart import parse_options_header\n@@ -69,27 +71,22 @@\n self.messages = [] # type: typing.List[typing.Tuple[FormMessage, bytes]]\n \n def on_field_start(self) -> None:\n- print(\"on_field_start\")\n message = (FormMessage.FIELD_START, b\"\")\n self.messages.append(message)\n \n def on_field_name(self, data: bytes, start: int, end: int) -> None:\n- print(\"on_field_name\")\n message = (FormMessage.FIELD_NAME, data[start:end])\n self.messages.append(message)\n \n def on_field_data(self, data: bytes, start: int, end: int) -> None:\n- print(\"on_field_data\")\n message = (FormMessage.FIELD_DATA, data[start:end])\n self.messages.append(message)\n \n def on_field_end(self) -> None:\n- print(\"on_field_end\")\n message = (FormMessage.FIELD_END, b\"\")\n self.messages.append(message)\n \n def on_end(self) -> None:\n- print(\"on_end\")\n message = (FormMessage.END, b\"\")\n self.messages.append(message)\n \n@@ -127,7 +124,9 @@\n elif message_type == FormMessage.FIELD_DATA:\n field_value += message_bytes\n elif message_type == FormMessage.FIELD_END:\n- result[field_name.decode(\"latin-1\")] = field_value.decode(\"latin-1\")\n+ result[field_name.decode(\"latin-1\")] = unquote(\n+ field_value.decode(\"latin-1\")\n+ )\n elif message_type == FormMessage.END:\n pass\n", "issue": "Form field names do not escape perfect encoding\nI switched one microservice from Flask to Starlette and got unexpected form parsing problem.\r\nThis code will return %20 in places where spaces were supposed to be:\r\n```\r\nfrom starlette.applications import Starlette\r\nfrom starlette.responses import PlainTextResponse\r\nfrom starlette.requests import Request as StarletteRequest\r\n\r\nSERVER = Starlette()\r\n\r\[email protected](\"/send\", methods=[\"POST\"])\r\nasync def send_endpoint(request: StarletteRequest) -> PlainTextResponse:\r\n form = await request.form()\r\n if \"number\" in form and \"name\" in form:\r\n number = form[\"number\"]\r\n name = form[\"name\"]\r\n return PlainTextResponse(\"Number: \" + number + \" ; Name: \" + name)\r\n```\r\n\r\nMaybe there are other issues with form parsing (x-www-form-urlencoded).\n", "before_files": [{"content": "from enum import Enum\nfrom starlette.datastructures import Headers\nimport asyncio\nimport io\nimport tempfile\nimport typing\n\ntry:\n from multipart.multipart import parse_options_header\n import multipart\nexcept ImportError: # pragma: nocover\n parse_options_header = None # type: ignore\n multipart = None # type: ignore\n\n\nclass FormMessage(Enum):\n FIELD_START = 1\n FIELD_NAME = 2\n FIELD_DATA = 3\n FIELD_END = 4\n END = 5\n\n\nclass MultiPartMessage(Enum):\n PART_BEGIN = 1\n PART_DATA = 2\n PART_END = 3\n HEADER_FIELD = 4\n HEADER_VALUE = 5\n HEADER_END = 6\n HEADERS_FINISHED = 7\n END = 8\n\n\nclass UploadFile:\n def __init__(self, filename: str) -> None:\n self.filename = filename\n self._file = io.BytesIO() # type: typing.IO[typing.Any]\n self._loop = asyncio.get_event_loop()\n\n def create_tempfile(self) -> None:\n self._file = tempfile.SpooledTemporaryFile()\n\n async def setup(self) -> None:\n await self._loop.run_in_executor(None, self.create_tempfile)\n\n async def write(self, data: bytes) -> None:\n await self._loop.run_in_executor(None, self._file.write, data)\n\n async def read(self, size: int = None) -> bytes:\n return await self._loop.run_in_executor(None, self._file.read, size)\n\n async def seek(self, offset: int) -> None:\n await self._loop.run_in_executor(None, self._file.seek, offset)\n\n async def close(self) -> None:\n await self._loop.run_in_executor(None, self._file.close)\n\n\nclass FormParser:\n def __init__(\n self, headers: Headers, stream: typing.AsyncGenerator[bytes, None]\n ) -> None:\n assert (\n multipart is not None\n ), \"The `python-multipart` library must be installed to use form parsing.\"\n self.headers = headers\n self.stream = stream\n self.messages = [] # type: typing.List[typing.Tuple[FormMessage, bytes]]\n\n def on_field_start(self) -> None:\n print(\"on_field_start\")\n message = (FormMessage.FIELD_START, b\"\")\n self.messages.append(message)\n\n def on_field_name(self, data: bytes, start: int, end: int) -> None:\n print(\"on_field_name\")\n message = (FormMessage.FIELD_NAME, data[start:end])\n self.messages.append(message)\n\n def on_field_data(self, data: bytes, start: int, end: int) -> None:\n print(\"on_field_data\")\n message = (FormMessage.FIELD_DATA, data[start:end])\n self.messages.append(message)\n\n def on_field_end(self) -> None:\n print(\"on_field_end\")\n message = (FormMessage.FIELD_END, b\"\")\n self.messages.append(message)\n\n def on_end(self) -> None:\n print(\"on_end\")\n message = (FormMessage.END, b\"\")\n self.messages.append(message)\n\n async def parse(self) -> typing.Dict[str, typing.Union[str, UploadFile]]:\n # Callbacks dictionary.\n callbacks = {\n \"on_field_start\": self.on_field_start,\n \"on_field_name\": self.on_field_name,\n \"on_field_data\": self.on_field_data,\n \"on_field_end\": self.on_field_end,\n \"on_end\": self.on_end,\n }\n\n # Create the parser.\n parser = multipart.QuerystringParser(callbacks)\n field_name = b\"\"\n field_value = b\"\"\n\n result = {} # type: typing.Dict[str, typing.Union[str, UploadFile]]\n\n # Feed the parser with data from the request.\n async for chunk in self.stream:\n if chunk:\n parser.write(chunk)\n else:\n parser.finalize()\n messages = list(self.messages)\n self.messages.clear()\n for message_type, message_bytes in messages:\n if message_type == FormMessage.FIELD_START:\n field_name = b\"\"\n field_value = b\"\"\n elif message_type == FormMessage.FIELD_NAME:\n field_name += message_bytes\n elif message_type == FormMessage.FIELD_DATA:\n field_value += message_bytes\n elif message_type == FormMessage.FIELD_END:\n result[field_name.decode(\"latin-1\")] = field_value.decode(\"latin-1\")\n elif message_type == FormMessage.END:\n pass\n\n return result\n\n\nclass MultiPartParser:\n def __init__(\n self, headers: Headers, stream: typing.AsyncGenerator[bytes, None]\n ) -> None:\n assert (\n multipart is not None\n ), \"The `python-multipart` library must be installed to use form parsing.\"\n self.headers = headers\n self.stream = stream\n self.messages = [] # type: typing.List[typing.Tuple[MultiPartMessage, bytes]]\n\n def on_part_begin(self) -> None:\n message = (MultiPartMessage.PART_BEGIN, b\"\")\n self.messages.append(message)\n\n def on_part_data(self, data: bytes, start: int, end: int) -> None:\n message = (MultiPartMessage.PART_DATA, data[start:end])\n self.messages.append(message)\n\n def on_part_end(self) -> None:\n message = (MultiPartMessage.PART_END, b\"\")\n self.messages.append(message)\n\n def on_header_field(self, data: bytes, start: int, end: int) -> None:\n message = (MultiPartMessage.HEADER_FIELD, data[start:end])\n self.messages.append(message)\n\n def on_header_value(self, data: bytes, start: int, end: int) -> None:\n message = (MultiPartMessage.HEADER_VALUE, data[start:end])\n self.messages.append(message)\n\n def on_header_end(self) -> None:\n message = (MultiPartMessage.HEADER_END, b\"\")\n self.messages.append(message)\n\n def on_headers_finished(self) -> None:\n message = (MultiPartMessage.HEADERS_FINISHED, b\"\")\n self.messages.append(message)\n\n def on_end(self) -> None:\n message = (MultiPartMessage.END, b\"\")\n self.messages.append(message)\n\n async def parse(self) -> typing.Dict[str, typing.Union[str, UploadFile]]:\n # Parse the Content-Type header to get the multipart boundary.\n content_type, params = parse_options_header(self.headers[\"Content-Type\"])\n boundary = params.get(b\"boundary\")\n\n # Callbacks dictionary.\n callbacks = {\n \"on_part_begin\": self.on_part_begin,\n \"on_part_data\": self.on_part_data,\n \"on_part_end\": self.on_part_end,\n \"on_header_field\": self.on_header_field,\n \"on_header_value\": self.on_header_value,\n \"on_header_end\": self.on_header_end,\n \"on_headers_finished\": self.on_headers_finished,\n \"on_end\": self.on_end,\n }\n\n # Create the parser.\n parser = multipart.MultipartParser(boundary, callbacks)\n header_field = b\"\"\n header_value = b\"\"\n raw_headers = [] # type: typing.List[typing.Tuple[bytes, bytes]]\n field_name = \"\"\n data = b\"\"\n file = None # type: typing.Optional[UploadFile]\n\n result = {} # type: typing.Dict[str, typing.Union[str, UploadFile]]\n\n # Feed the parser with data from the request.\n async for chunk in self.stream:\n parser.write(chunk)\n messages = list(self.messages)\n self.messages.clear()\n for message_type, message_bytes in messages:\n if message_type == MultiPartMessage.PART_BEGIN:\n raw_headers = []\n data = b\"\"\n elif message_type == MultiPartMessage.HEADER_FIELD:\n header_field += message_bytes\n elif message_type == MultiPartMessage.HEADER_VALUE:\n header_value += message_bytes\n elif message_type == MultiPartMessage.HEADER_END:\n raw_headers.append((header_field.lower(), header_value))\n header_field = b\"\"\n header_value = b\"\"\n elif message_type == MultiPartMessage.HEADERS_FINISHED:\n headers = Headers(raw=raw_headers)\n content_disposition = headers.get(\"Content-Disposition\")\n disposition, options = parse_options_header(content_disposition)\n field_name = options[b\"name\"].decode(\"latin-1\")\n if b\"filename\" in options:\n filename = options[b\"filename\"].decode(\"latin-1\")\n file = UploadFile(filename=filename)\n await file.setup()\n elif message_type == MultiPartMessage.PART_DATA:\n if file is None:\n data += message_bytes\n else:\n await file.write(message_bytes)\n elif message_type == MultiPartMessage.PART_END:\n if file is None:\n result[field_name] = data.decode(\"latin-1\")\n else:\n await file.seek(0)\n result[field_name] = file\n elif message_type == MultiPartMessage.END:\n pass\n\n parser.finalize()\n return result\n", "path": "starlette/formparsers.py"}]} | 3,324 | 456 |
gh_patches_debug_17888 | rasdani/github-patches | git_diff | ManimCommunity__manim-203 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Document and test the '-' file name command line argument
The `get_module` function in `extract_scene.py` allows the user to input the code for a Scene from stdin, but only when the argument passed as file name is `-`. This should be documented somewhere. At the very least, the `-h` flag should mention this possibility.
</issue>
<code>
[start of manim/__main__.py]
1 import inspect
2 import os
3 import platform
4 import subprocess as sp
5 import sys
6 import re
7 import traceback
8 import importlib.util
9
10 from .config import file_writer_config
11 from .scene.scene import Scene
12 from .utils.sounds import play_error_sound
13 from .utils.sounds import play_finish_sound
14 from . import constants
15 from .logger import logger
16
17
18 def open_file_if_needed(file_writer):
19 if file_writer_config["quiet"]:
20 curr_stdout = sys.stdout
21 sys.stdout = open(os.devnull, "w")
22
23 open_file = any([
24 file_writer_config["preview"],
25 file_writer_config["show_file_in_finder"]
26 ])
27 if open_file:
28 current_os = platform.system()
29 file_paths = []
30
31 if file_writer_config["save_last_frame"]:
32 file_paths.append(file_writer.get_image_file_path())
33 if file_writer_config["write_to_movie"]:
34 file_paths.append(file_writer.get_movie_file_path())
35
36 for file_path in file_paths:
37 if current_os == "Windows":
38 os.startfile(file_path)
39 else:
40 commands = []
41 if current_os == "Linux":
42 commands.append("xdg-open")
43 elif current_os.startswith("CYGWIN"):
44 commands.append("cygstart")
45 else: # Assume macOS
46 commands.append("open")
47
48 if file_writer_config["show_file_in_finder"]:
49 commands.append("-R")
50
51 commands.append(file_path)
52
53 # commands.append("-g")
54 FNULL = open(os.devnull, 'w')
55 sp.call(commands, stdout=FNULL, stderr=sp.STDOUT)
56 FNULL.close()
57
58 if file_writer_config["quiet"]:
59 sys.stdout.close()
60 sys.stdout = curr_stdout
61
62
63 def is_child_scene(obj, module):
64 return (inspect.isclass(obj)
65 and issubclass(obj, Scene)
66 and obj != Scene
67 and obj.__module__.startswith(module.__name__))
68
69
70 def prompt_user_for_choice(scene_classes):
71 num_to_class = {}
72 for count, scene_class in enumerate(scene_classes):
73 count += 1 # start with 1 instead of 0
74 name = scene_class.__name__
75 print("%d: %s" % (count, name))
76 num_to_class[count] = scene_class
77 try:
78 user_input = input(constants.CHOOSE_NUMBER_MESSAGE)
79 return [num_to_class[int(num_str)]
80 for num_str in re.split(r"\s*,\s*", user_input.strip())]
81 except KeyError:
82 logger.error(constants.INVALID_NUMBER_MESSAGE)
83 sys.exit(2)
84 except EOFError:
85 sys.exit(1)
86
87
88 def get_scenes_to_render(scene_classes):
89 if not scene_classes:
90 logger.error(constants.NO_SCENE_MESSAGE)
91 return []
92 if file_writer_config["write_all"]:
93 return scene_classes
94 result = []
95 for scene_name in file_writer_config["scene_names"]:
96 found = False
97 for scene_class in scene_classes:
98 if scene_class.__name__ == scene_name:
99 result.append(scene_class)
100 found = True
101 break
102 if not found and (scene_name != ""):
103 logger.error(
104 constants.SCENE_NOT_FOUND_MESSAGE.format(
105 scene_name
106 )
107 )
108 if result:
109 return result
110 return [scene_classes[0]] if len(scene_classes) == 1 else prompt_user_for_choice(scene_classes)
111
112
113 def get_scene_classes_from_module(module):
114 return [
115 member[1]
116 for member in inspect.getmembers(
117 module,
118 lambda x: is_child_scene(x, module)
119 )
120 ]
121
122
123 def get_module(file_name):
124 if file_name == "-":
125 module = types.ModuleType("input_scenes")
126 code = sys.stdin.read()
127 try:
128 exec(code, module.__dict__)
129 return module
130 except Exception as e:
131 logger.error(f"Failed to render scene: {str(e)}")
132 sys.exit(2)
133 else:
134 if os.path.exists(file_name):
135 if file_name[-3:] != ".py":
136 raise Exception(f"{file_name} is not a valid Manim python script.")
137 module_name = file_name[:-3].replace(os.sep, '.').split('.')[-1]
138 spec = importlib.util.spec_from_file_location(module_name, file_name)
139 module = importlib.util.module_from_spec(spec)
140 spec.loader.exec_module(module)
141 return module
142 else:
143 raise FileNotFoundError(f'{file_name} not found')
144
145
146 def main():
147 module = get_module(file_writer_config["input_file"])
148 all_scene_classes = get_scene_classes_from_module(module)
149 scene_classes_to_render = get_scenes_to_render(all_scene_classes)
150 sound_on = file_writer_config["sound"]
151 for SceneClass in scene_classes_to_render:
152 try:
153 # By invoking, this renders the full scene
154 scene = SceneClass()
155 open_file_if_needed(scene.file_writer)
156 if sound_on:
157 play_finish_sound()
158 except Exception:
159 print("\n\n")
160 traceback.print_exc()
161 print("\n\n")
162 if sound_on:
163 play_error_sound()
164
165
166 if __name__ == "__main__":
167 main()
168
[end of manim/__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/manim/__main__.py b/manim/__main__.py
--- a/manim/__main__.py
+++ b/manim/__main__.py
@@ -6,6 +6,7 @@
import re
import traceback
import importlib.util
+import types
from .config import file_writer_config
from .scene.scene import Scene
@@ -123,7 +124,12 @@
def get_module(file_name):
if file_name == "-":
module = types.ModuleType("input_scenes")
+ logger.info("Enter the animation's code & end with an EOF (CTRL+D on Linux/Unix, CTRL+Z on Windows):")
code = sys.stdin.read()
+ if not code.startswith("from manim import"):
+ logger.warn("Didn't find an import statement for Manim. Importing automatically...")
+ code="from manim import *\n"+code
+ logger.info("Rendering animation from typed code...")
try:
exec(code, module.__dict__)
return module
| {"golden_diff": "diff --git a/manim/__main__.py b/manim/__main__.py\n--- a/manim/__main__.py\n+++ b/manim/__main__.py\n@@ -6,6 +6,7 @@\n import re\n import traceback\n import importlib.util\n+import types\n \n from .config import file_writer_config\n from .scene.scene import Scene\n@@ -123,7 +124,12 @@\n def get_module(file_name):\n if file_name == \"-\":\n module = types.ModuleType(\"input_scenes\")\n+ logger.info(\"Enter the animation's code & end with an EOF (CTRL+D on Linux/Unix, CTRL+Z on Windows):\")\n code = sys.stdin.read()\n+ if not code.startswith(\"from manim import\"):\n+ logger.warn(\"Didn't find an import statement for Manim. Importing automatically...\")\n+ code=\"from manim import *\\n\"+code\n+ logger.info(\"Rendering animation from typed code...\")\n try:\n exec(code, module.__dict__)\n return module\n", "issue": "Document and test the '-' file name command line argument\nThe `get_module` function in `extract_scene.py` allows the user to input the code for a Scene from stdin, but only when the argument passed as file name is `-`. This should be documented somewhere. At the very least, the `-h` flag should mention this possibility.\n", "before_files": [{"content": "import inspect\nimport os\nimport platform\nimport subprocess as sp\nimport sys\nimport re\nimport traceback\nimport importlib.util\n\nfrom .config import file_writer_config\nfrom .scene.scene import Scene\nfrom .utils.sounds import play_error_sound\nfrom .utils.sounds import play_finish_sound\nfrom . import constants\nfrom .logger import logger\n\n\ndef open_file_if_needed(file_writer):\n if file_writer_config[\"quiet\"]:\n curr_stdout = sys.stdout\n sys.stdout = open(os.devnull, \"w\")\n\n open_file = any([\n file_writer_config[\"preview\"],\n file_writer_config[\"show_file_in_finder\"]\n ])\n if open_file:\n current_os = platform.system()\n file_paths = []\n\n if file_writer_config[\"save_last_frame\"]:\n file_paths.append(file_writer.get_image_file_path())\n if file_writer_config[\"write_to_movie\"]:\n file_paths.append(file_writer.get_movie_file_path())\n\n for file_path in file_paths:\n if current_os == \"Windows\":\n os.startfile(file_path)\n else:\n commands = []\n if current_os == \"Linux\":\n commands.append(\"xdg-open\")\n elif current_os.startswith(\"CYGWIN\"):\n commands.append(\"cygstart\")\n else: # Assume macOS\n commands.append(\"open\")\n\n if file_writer_config[\"show_file_in_finder\"]:\n commands.append(\"-R\")\n\n commands.append(file_path)\n\n # commands.append(\"-g\")\n FNULL = open(os.devnull, 'w')\n sp.call(commands, stdout=FNULL, stderr=sp.STDOUT)\n FNULL.close()\n\n if file_writer_config[\"quiet\"]:\n sys.stdout.close()\n sys.stdout = curr_stdout\n\n\ndef is_child_scene(obj, module):\n return (inspect.isclass(obj)\n and issubclass(obj, Scene)\n and obj != Scene\n and obj.__module__.startswith(module.__name__))\n\n\ndef prompt_user_for_choice(scene_classes):\n num_to_class = {}\n for count, scene_class in enumerate(scene_classes):\n count += 1 # start with 1 instead of 0\n name = scene_class.__name__\n print(\"%d: %s\" % (count, name))\n num_to_class[count] = scene_class\n try:\n user_input = input(constants.CHOOSE_NUMBER_MESSAGE)\n return [num_to_class[int(num_str)]\n for num_str in re.split(r\"\\s*,\\s*\", user_input.strip())]\n except KeyError:\n logger.error(constants.INVALID_NUMBER_MESSAGE)\n sys.exit(2)\n except EOFError:\n sys.exit(1)\n\n\ndef get_scenes_to_render(scene_classes):\n if not scene_classes:\n logger.error(constants.NO_SCENE_MESSAGE)\n return []\n if file_writer_config[\"write_all\"]:\n return scene_classes\n result = []\n for scene_name in file_writer_config[\"scene_names\"]:\n found = False\n for scene_class in scene_classes:\n if scene_class.__name__ == scene_name:\n result.append(scene_class)\n found = True\n break\n if not found and (scene_name != \"\"):\n logger.error(\n constants.SCENE_NOT_FOUND_MESSAGE.format(\n scene_name\n )\n )\n if result:\n return result\n return [scene_classes[0]] if len(scene_classes) == 1 else prompt_user_for_choice(scene_classes)\n\n\ndef get_scene_classes_from_module(module):\n return [\n member[1]\n for member in inspect.getmembers(\n module,\n lambda x: is_child_scene(x, module)\n )\n ]\n\n\ndef get_module(file_name):\n if file_name == \"-\":\n module = types.ModuleType(\"input_scenes\")\n code = sys.stdin.read()\n try:\n exec(code, module.__dict__)\n return module\n except Exception as e:\n logger.error(f\"Failed to render scene: {str(e)}\")\n sys.exit(2)\n else:\n if os.path.exists(file_name):\n if file_name[-3:] != \".py\":\n raise Exception(f\"{file_name} is not a valid Manim python script.\")\n module_name = file_name[:-3].replace(os.sep, '.').split('.')[-1]\n spec = importlib.util.spec_from_file_location(module_name, file_name)\n module = importlib.util.module_from_spec(spec)\n spec.loader.exec_module(module)\n return module\n else:\n raise FileNotFoundError(f'{file_name} not found')\n\n\ndef main():\n module = get_module(file_writer_config[\"input_file\"])\n all_scene_classes = get_scene_classes_from_module(module)\n scene_classes_to_render = get_scenes_to_render(all_scene_classes)\n sound_on = file_writer_config[\"sound\"]\n for SceneClass in scene_classes_to_render:\n try:\n # By invoking, this renders the full scene\n scene = SceneClass()\n open_file_if_needed(scene.file_writer)\n if sound_on:\n play_finish_sound()\n except Exception:\n print(\"\\n\\n\")\n traceback.print_exc()\n print(\"\\n\\n\")\n if sound_on:\n play_error_sound()\n\n\nif __name__ == \"__main__\":\n main()\n", "path": "manim/__main__.py"}]} | 2,093 | 223 |
gh_patches_debug_40359 | rasdani/github-patches | git_diff | kartoza__prj.app-909 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Reshape html summary in atom/rss sponsors feed
Currently the sponsor items are looking like this:
```
<div>
<img
src="/media/images/projects/b9c08a00a74cba8e406e97f94a1f90595f5ac39d.png"
width="300px">
</div>
<p><span>Sponsorship level: Gold : 9000 EUR</span>
<br/>
<span>Sponsorship period: 21 June 2017 - 21 June 2018</span><br/>
<span>Amount sponsored: EUR 9000.00<span>
</p>
```
Is it (easy) possible in this html to change the following:
- make the img-element a full url (as I use the feed in qgis.org and it is easiest to just retrieve the images from changelog.qgis.org
- add some classes to the img-element and the p-element as then I can do some more styling.
An example:
```
<div>
<img src="http://changelog.qgis.org/media/images/projects/..5ac39d.png"
class="sponsor_img gold">
</div>
<p class="sponsor_body gold">
<span>Sponsorship level: Gold : 9000 EUR</span>
<br/>
<span>Sponsorship period: 21 June 2017 - 21 June 2018</span>
<br/>
<span>Amount sponsored: EUR 9000.00<span>
</p>
```
</issue>
<code>
[start of django_project/changes/feeds/sponsor.py]
1 # coding=utf-8
2
3 __author__ = 'Anita Hapsari <[email protected]>'
4 __date__ = '23/10/2017'
5
6 from django.conf import settings
7 from django.contrib.syndication.views import Feed
8 from django.utils.feedgenerator import Atom1Feed
9 from django.shortcuts import get_object_or_404
10 from base.models.project import Project
11 from changes.models.sponsorship_period import SponsorshipPeriod
12 from changes.feeds.json_rss_feed import JSONFeed
13
14
15 # noinspection PyMethodMayBeStatic
16 class RssSponsorFeed(Feed):
17 """RSS Feed class for sponsor."""
18
19 def get_object(self, request, *args, **kwargs):
20 """Return project object that matches the project_slug.
21
22 :param request: The incoming HTTP request object
23 :type request: HttpRequest
24
25 :param args: Positional arguments
26 :type args: tuple
27
28 :param kwargs: Keyword arguments
29 :type kwargs: dict
30
31 :returns: A project
32 :rtype: Project
33
34 :raises: Http404
35 """
36 project_slug = kwargs.get('project_slug', None)
37 return get_object_or_404(Project, slug=project_slug)
38
39 def title(self, obj):
40 """Return a title for the RSS.
41
42 :param obj: A project
43 :type obj: Project
44
45 :returns: Title of the RSS Feed.
46 :rtype: str
47 """
48 return 'RSS Sponsor of %s Project' % obj.name
49
50 def description(self, obj):
51 """Return a description for the RSS.
52
53 :param obj: A project
54 :type obj: Project
55
56 :returns: Description of the RSS Feed.
57 :rtype: str
58 """
59 return 'These are the latest sponsor of %s project.' % obj.name
60
61 def link(self, obj):
62 """Return the url of the latest sponsor.
63
64 :param obj: Latest sponsor of a project
65 :type obj: SponsorshipPeriod
66
67 :returns: Url of the latest sponsor.
68 :rtype: str
69 """
70 return obj.get_absolute_url()
71
72 def items(self, obj):
73 """Return latest sponsors of the project.
74
75 :param obj: A project
76 :type obj: Project
77
78 :returns: List of latest sponsor of a project
79 :rtype: list
80 """
81 return SponsorshipPeriod.objects.filter(
82 project=obj).order_by('-sponsorship_level__value', '-end_date')
83
84 def item_title(self, item):
85 """Return the title of the sponsor.
86
87 :param item: Sponsorship period object of a project
88 :type item: Sponsorship period
89
90 :returns: name of the sponsor
91 :rtype: str
92 """
93 return item.sponsor.name
94
95 def item_description(self, item):
96 """Return the description of the sponsor.
97
98 :param item: Sponsorship period object of a project
99 :type item: Sponsorship period
100
101 :returns: description of the sponsor
102 :rtype: str
103 """
104 data = {
105 'media_url': settings.MEDIA_URL,
106 'sponsor_logo': item.sponsor.logo,
107 'sponsor_level': item.sponsorship_level,
108 'start_date': item.start_date.strftime('%d %B %Y'),
109 'end_date': item.end_date.strftime('%d %B %Y'),
110 'currency': item.currency,
111 'amount_sponsored': item.amount_sponsored,
112 }
113
114 descriptions = \
115 '<div>' \
116 '<img src="{media_url}{sponsor_logo}" width="300px"></div>' \
117 '<p><span>Sponsorship level: {sponsor_level}</span><br/>' \
118 '<span>Sponsorship period: {start_date} - {end_date}</span><br/>' \
119 '<span>Amount sponsored: {currency} {amount_sponsored}<span></p>'\
120 .format(**data)
121 return descriptions
122
123 def item_extra_kwargs(self, item):
124 return {'image_url': item.sponsor.logo.url}
125
126
127
128 class AtomSponsorFeed(RssSponsorFeed):
129 """Atom Feed class for sponsor."""
130
131 feed_type = Atom1Feed
132 subtitle = RssSponsorFeed.description
133
134
135 class JSONSponsorFeed(RssSponsorFeed):
136 """JSON Feed class for sponsor."""
137
138 feed_type = JSONFeed
139
[end of django_project/changes/feeds/sponsor.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/django_project/changes/feeds/sponsor.py b/django_project/changes/feeds/sponsor.py
--- a/django_project/changes/feeds/sponsor.py
+++ b/django_project/changes/feeds/sponsor.py
@@ -3,8 +3,9 @@
__author__ = 'Anita Hapsari <[email protected]>'
__date__ = '23/10/2017'
-from django.conf import settings
+import datetime
from django.contrib.syndication.views import Feed
+from django.core.urlresolvers import reverse
from django.utils.feedgenerator import Atom1Feed
from django.shortcuts import get_object_or_404
from base.models.project import Project
@@ -34,6 +35,7 @@
:raises: Http404
"""
project_slug = kwargs.get('project_slug', None)
+ self.domain_path_url = request.build_absolute_uri(reverse('home'))
return get_object_or_404(Project, slug=project_slug)
def title(self, obj):
@@ -78,8 +80,10 @@
:returns: List of latest sponsor of a project
:rtype: list
"""
+ today = datetime.datetime.now().date()
return SponsorshipPeriod.objects.filter(
- project=obj).order_by('-sponsorship_level__value', '-end_date')
+ project=obj, end_date__gte=today
+ ).order_by('-sponsorship_level__value', '-end_date')
def item_title(self, item):
"""Return the title of the sponsor.
@@ -101,20 +105,26 @@
:returns: description of the sponsor
:rtype: str
"""
+ level_class = str(item.sponsorship_level.name).decode('utf-8').lower()
+ head, sep, tail = self.domain_path_url.partition('/en/')
+
data = {
- 'media_url': settings.MEDIA_URL,
- 'sponsor_logo': item.sponsor.logo,
+ 'domain': head,
+ 'sponsor_logo': item.sponsor.logo.url,
'sponsor_level': item.sponsorship_level,
'start_date': item.start_date.strftime('%d %B %Y'),
'end_date': item.end_date.strftime('%d %B %Y'),
'currency': item.currency,
'amount_sponsored': item.amount_sponsored,
+ 'sponsor_class': level_class,
}
descriptions = \
'<div>' \
- '<img src="{media_url}{sponsor_logo}" width="300px"></div>' \
- '<p><span>Sponsorship level: {sponsor_level}</span><br/>' \
+ '<img class="sponsor_img {sponsor_class}" ' \
+ 'src="{domain}{sponsor_logo}" width="300px"></div>' \
+ '<p class="sponsor_body {sponsor_class}">' \
+ '<span>Sponsorship level: {sponsor_level}</span><br/>' \
'<span>Sponsorship period: {start_date} - {end_date}</span><br/>' \
'<span>Amount sponsored: {currency} {amount_sponsored}<span></p>'\
.format(**data)
| {"golden_diff": "diff --git a/django_project/changes/feeds/sponsor.py b/django_project/changes/feeds/sponsor.py\n--- a/django_project/changes/feeds/sponsor.py\n+++ b/django_project/changes/feeds/sponsor.py\n@@ -3,8 +3,9 @@\n __author__ = 'Anita Hapsari <[email protected]>'\n __date__ = '23/10/2017'\n \n-from django.conf import settings\n+import datetime\n from django.contrib.syndication.views import Feed\n+from django.core.urlresolvers import reverse\n from django.utils.feedgenerator import Atom1Feed\n from django.shortcuts import get_object_or_404\n from base.models.project import Project\n@@ -34,6 +35,7 @@\n :raises: Http404\n \"\"\"\n project_slug = kwargs.get('project_slug', None)\n+ self.domain_path_url = request.build_absolute_uri(reverse('home'))\n return get_object_or_404(Project, slug=project_slug)\n \n def title(self, obj):\n@@ -78,8 +80,10 @@\n :returns: List of latest sponsor of a project\n :rtype: list\n \"\"\"\n+ today = datetime.datetime.now().date()\n return SponsorshipPeriod.objects.filter(\n- project=obj).order_by('-sponsorship_level__value', '-end_date')\n+ project=obj, end_date__gte=today\n+ ).order_by('-sponsorship_level__value', '-end_date')\n \n def item_title(self, item):\n \"\"\"Return the title of the sponsor.\n@@ -101,20 +105,26 @@\n :returns: description of the sponsor\n :rtype: str\n \"\"\"\n+ level_class = str(item.sponsorship_level.name).decode('utf-8').lower()\n+ head, sep, tail = self.domain_path_url.partition('/en/')\n+\n data = {\n- 'media_url': settings.MEDIA_URL,\n- 'sponsor_logo': item.sponsor.logo,\n+ 'domain': head,\n+ 'sponsor_logo': item.sponsor.logo.url,\n 'sponsor_level': item.sponsorship_level,\n 'start_date': item.start_date.strftime('%d %B %Y'),\n 'end_date': item.end_date.strftime('%d %B %Y'),\n 'currency': item.currency,\n 'amount_sponsored': item.amount_sponsored,\n+ 'sponsor_class': level_class,\n }\n \n descriptions = \\\n '<div>' \\\n- '<img src=\"{media_url}{sponsor_logo}\" width=\"300px\"></div>' \\\n- '<p><span>Sponsorship level: {sponsor_level}</span><br/>' \\\n+ '<img class=\"sponsor_img {sponsor_class}\" ' \\\n+ 'src=\"{domain}{sponsor_logo}\" width=\"300px\"></div>' \\\n+ '<p class=\"sponsor_body {sponsor_class}\">' \\\n+ '<span>Sponsorship level: {sponsor_level}</span><br/>' \\\n '<span>Sponsorship period: {start_date} - {end_date}</span><br/>' \\\n '<span>Amount sponsored: {currency} {amount_sponsored}<span></p>'\\\n .format(**data)\n", "issue": "Reshape html summary in atom/rss sponsors feed\nCurrently the sponsor items are looking like this:\r\n\r\n```\r\n<div>\r\n<img\r\nsrc=\"/media/images/projects/b9c08a00a74cba8e406e97f94a1f90595f5ac39d.png\"\r\nwidth=\"300px\">\r\n</div>\r\n<p><span>Sponsorship level: Gold : 9000 EUR</span>\r\n<br/>\r\n<span>Sponsorship period: 21 June 2017 - 21 June 2018</span><br/>\r\n<span>Amount sponsored: EUR 9000.00<span>\r\n</p>\r\n```\r\n\r\nIs it (easy) possible in this html to change the following:\r\n- make the img-element a full url (as I use the feed in qgis.org and it is easiest to just retrieve the images from changelog.qgis.org\r\n- add some classes to the img-element and the p-element as then I can do some more styling.\r\n\r\nAn example:\r\n\r\n```\r\n<div>\r\n<img src=\"http://changelog.qgis.org/media/images/projects/..5ac39d.png\"\r\nclass=\"sponsor_img gold\">\r\n</div>\r\n<p class=\"sponsor_body gold\">\r\n<span>Sponsorship level: Gold : 9000 EUR</span>\r\n<br/>\r\n<span>Sponsorship period: 21 June 2017 - 21 June 2018</span>\r\n<br/>\r\n<span>Amount sponsored: EUR 9000.00<span>\r\n</p>\r\n```\r\n\r\n\n", "before_files": [{"content": "# coding=utf-8\n\n__author__ = 'Anita Hapsari <[email protected]>'\n__date__ = '23/10/2017'\n\nfrom django.conf import settings\nfrom django.contrib.syndication.views import Feed\nfrom django.utils.feedgenerator import Atom1Feed\nfrom django.shortcuts import get_object_or_404\nfrom base.models.project import Project\nfrom changes.models.sponsorship_period import SponsorshipPeriod\nfrom changes.feeds.json_rss_feed import JSONFeed\n\n\n# noinspection PyMethodMayBeStatic\nclass RssSponsorFeed(Feed):\n \"\"\"RSS Feed class for sponsor.\"\"\"\n\n def get_object(self, request, *args, **kwargs):\n \"\"\"Return project object that matches the project_slug.\n\n :param request: The incoming HTTP request object\n :type request: HttpRequest\n\n :param args: Positional arguments\n :type args: tuple\n\n :param kwargs: Keyword arguments\n :type kwargs: dict\n\n :returns: A project\n :rtype: Project\n\n :raises: Http404\n \"\"\"\n project_slug = kwargs.get('project_slug', None)\n return get_object_or_404(Project, slug=project_slug)\n\n def title(self, obj):\n \"\"\"Return a title for the RSS.\n\n :param obj: A project\n :type obj: Project\n\n :returns: Title of the RSS Feed.\n :rtype: str\n \"\"\"\n return 'RSS Sponsor of %s Project' % obj.name\n\n def description(self, obj):\n \"\"\"Return a description for the RSS.\n\n :param obj: A project\n :type obj: Project\n\n :returns: Description of the RSS Feed.\n :rtype: str\n \"\"\"\n return 'These are the latest sponsor of %s project.' % obj.name\n\n def link(self, obj):\n \"\"\"Return the url of the latest sponsor.\n\n :param obj: Latest sponsor of a project\n :type obj: SponsorshipPeriod\n\n :returns: Url of the latest sponsor.\n :rtype: str\n \"\"\"\n return obj.get_absolute_url()\n\n def items(self, obj):\n \"\"\"Return latest sponsors of the project.\n\n :param obj: A project\n :type obj: Project\n\n :returns: List of latest sponsor of a project\n :rtype: list\n \"\"\"\n return SponsorshipPeriod.objects.filter(\n project=obj).order_by('-sponsorship_level__value', '-end_date')\n\n def item_title(self, item):\n \"\"\"Return the title of the sponsor.\n\n :param item: Sponsorship period object of a project\n :type item: Sponsorship period\n\n :returns: name of the sponsor\n :rtype: str\n \"\"\"\n return item.sponsor.name\n\n def item_description(self, item):\n \"\"\"Return the description of the sponsor.\n\n :param item: Sponsorship period object of a project\n :type item: Sponsorship period\n\n :returns: description of the sponsor\n :rtype: str\n \"\"\"\n data = {\n 'media_url': settings.MEDIA_URL,\n 'sponsor_logo': item.sponsor.logo,\n 'sponsor_level': item.sponsorship_level,\n 'start_date': item.start_date.strftime('%d %B %Y'),\n 'end_date': item.end_date.strftime('%d %B %Y'),\n 'currency': item.currency,\n 'amount_sponsored': item.amount_sponsored,\n }\n\n descriptions = \\\n '<div>' \\\n '<img src=\"{media_url}{sponsor_logo}\" width=\"300px\"></div>' \\\n '<p><span>Sponsorship level: {sponsor_level}</span><br/>' \\\n '<span>Sponsorship period: {start_date} - {end_date}</span><br/>' \\\n '<span>Amount sponsored: {currency} {amount_sponsored}<span></p>'\\\n .format(**data)\n return descriptions\n\n def item_extra_kwargs(self, item):\n return {'image_url': item.sponsor.logo.url}\n\n\n\nclass AtomSponsorFeed(RssSponsorFeed):\n \"\"\"Atom Feed class for sponsor.\"\"\"\n\n feed_type = Atom1Feed\n subtitle = RssSponsorFeed.description\n\n\nclass JSONSponsorFeed(RssSponsorFeed):\n \"\"\"JSON Feed class for sponsor.\"\"\"\n\n feed_type = JSONFeed\n", "path": "django_project/changes/feeds/sponsor.py"}]} | 2,147 | 702 |
gh_patches_debug_7720 | rasdani/github-patches | git_diff | yt-project__yt-3773 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
pytest is now a hidden hard dependency
<!--To help us understand and resolve your issue, please fill out the form to
the best of your ability.-->
<!--You can feel free to delete the sections that do not apply.-->
### Bug report
We now import `pytest` directly in `yt/testing.py`, but `pytest` is not yet listed as a hard dependency. This will cause a `ModuleNotFoundError` to be raised after installing yt until you install pytest manually.
I'm opening an issue rather than a PR because I don't know whether people would prefer to put the `pytest` import in a try block or make it a dependency.
</issue>
<code>
[start of yt/__init__.py]
1 """
2 yt is a toolkit for analyzing and visualizing volumetric data.
3
4 * Website: https://yt-project.org
5 * Documentation: https://yt-project.org/doc
6 * Data hub: https://girder.hub.yt
7 * Contribute: https://github.com/yt-project/yt
8
9 """
10 __version__ = "4.1.dev0"
11
12 import yt.units as units
13 import yt.utilities.physical_constants as physical_constants
14 from yt.data_objects.api import (
15 DatasetSeries,
16 ImageArray,
17 ParticleProfile,
18 Profile1D,
19 Profile2D,
20 Profile3D,
21 add_particle_filter,
22 create_profile,
23 particle_filter,
24 )
25 from yt.fields.api import (
26 DerivedField,
27 FieldDetector,
28 FieldInfoContainer,
29 ValidateDataField,
30 ValidateGridType,
31 ValidateParameter,
32 ValidateProperty,
33 ValidateSpatial,
34 add_field,
35 add_xray_emissivity_field,
36 derived_field,
37 field_plugins,
38 )
39 from yt.frontends.api import _frontend_container
40 from yt.funcs import (
41 enable_plugins,
42 get_memory_usage,
43 get_pbar,
44 get_version_stack,
45 get_yt_version,
46 insert_ipython,
47 is_root,
48 is_sequence,
49 memory_checker,
50 only_on_root,
51 parallel_profile,
52 print_tb,
53 rootonly,
54 toggle_interactivity,
55 )
56 from yt.units import (
57 YTArray,
58 YTQuantity,
59 display_ytarray,
60 loadtxt,
61 savetxt,
62 uconcatenate,
63 ucross,
64 udot,
65 uhstack,
66 uintersect1d,
67 unorm,
68 ustack,
69 uunion1d,
70 uvstack,
71 )
72 from yt.units.unit_object import define_unit # type: ignore
73 from yt.utilities.logger import set_log_level, ytLogger as mylog
74
75 frontends = _frontend_container()
76
77 import yt.visualization.volume_rendering.api as volume_rendering
78 from yt.frontends.stream.api import hexahedral_connectivity
79 from yt.frontends.ytdata.api import save_as_dataset
80 from yt.loaders import (
81 load,
82 load_amr_grids,
83 load_archive,
84 load_hexahedral_mesh,
85 load_octree,
86 load_particles,
87 load_sample,
88 load_simulation,
89 load_uniform_grid,
90 load_unstructured_mesh,
91 )
92 from yt.testing import run_nose
93 from yt.units.unit_systems import UnitSystem, unit_system_registry # type: ignore
94
95 # Import some helpful math utilities
96 from yt.utilities.math_utils import ortho_find, periodic_position, quartiles
97 from yt.utilities.parallel_tools.parallel_analysis_interface import (
98 communication_system,
99 enable_parallelism,
100 parallel_objects,
101 )
102
103 # Now individual component imports from the visualization API
104 from yt.visualization.api import (
105 AxisAlignedProjectionPlot,
106 AxisAlignedSlicePlot,
107 FITSImageData,
108 FITSOffAxisProjection,
109 FITSOffAxisSlice,
110 FITSParticleProjection,
111 FITSProjection,
112 FITSSlice,
113 FixedResolutionBuffer,
114 LineBuffer,
115 LinePlot,
116 OffAxisProjectionPlot,
117 OffAxisSlicePlot,
118 ParticleImageBuffer,
119 ParticlePhasePlot,
120 ParticlePlot,
121 ParticleProjectionPlot,
122 PhasePlot,
123 ProfilePlot,
124 ProjectionPlot,
125 SlicePlot,
126 add_colormap,
127 apply_colormap,
128 make_colormap,
129 plot_2d,
130 scale_image,
131 show_colormaps,
132 write_bitmap,
133 write_image,
134 write_projection,
135 )
136 from yt.visualization.volume_rendering.api import (
137 ColorTransferFunction,
138 TransferFunction,
139 create_scene,
140 off_axis_projection,
141 volume_render,
142 )
143
144 # TransferFunctionHelper, MultiVariateTransferFunction
145 # off_axis_projection
146
[end of yt/__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/yt/__init__.py b/yt/__init__.py
--- a/yt/__init__.py
+++ b/yt/__init__.py
@@ -89,7 +89,17 @@
load_uniform_grid,
load_unstructured_mesh,
)
-from yt.testing import run_nose
+
+
+def run_nose(*args, **kwargs):
+ # we hide this function behind a closure so we
+ # don't make pytest a hard dependency for end users
+ # see https://github.com/yt-project/yt/issues/3771
+ from yt.testing import run_nose
+
+ return run_nose(*args, **kwargs)
+
+
from yt.units.unit_systems import UnitSystem, unit_system_registry # type: ignore
# Import some helpful math utilities
| {"golden_diff": "diff --git a/yt/__init__.py b/yt/__init__.py\n--- a/yt/__init__.py\n+++ b/yt/__init__.py\n@@ -89,7 +89,17 @@\n load_uniform_grid,\n load_unstructured_mesh,\n )\n-from yt.testing import run_nose\n+\n+\n+def run_nose(*args, **kwargs):\n+ # we hide this function behind a closure so we\n+ # don't make pytest a hard dependency for end users\n+ # see https://github.com/yt-project/yt/issues/3771\n+ from yt.testing import run_nose\n+\n+ return run_nose(*args, **kwargs)\n+\n+\n from yt.units.unit_systems import UnitSystem, unit_system_registry # type: ignore\n \n # Import some helpful math utilities\n", "issue": "pytest is now a hidden hard dependency\n<!--To help us understand and resolve your issue, please fill out the form to\r\nthe best of your ability.-->\r\n<!--You can feel free to delete the sections that do not apply.-->\r\n\r\n### Bug report\r\n\r\nWe now import `pytest` directly in `yt/testing.py`, but `pytest` is not yet listed as a hard dependency. This will cause a `ModuleNotFoundError` to be raised after installing yt until you install pytest manually.\r\n\r\nI'm opening an issue rather than a PR because I don't know whether people would prefer to put the `pytest` import in a try block or make it a dependency.\n", "before_files": [{"content": "\"\"\"\nyt is a toolkit for analyzing and visualizing volumetric data.\n\n* Website: https://yt-project.org\n* Documentation: https://yt-project.org/doc\n* Data hub: https://girder.hub.yt\n* Contribute: https://github.com/yt-project/yt\n\n\"\"\"\n__version__ = \"4.1.dev0\"\n\nimport yt.units as units\nimport yt.utilities.physical_constants as physical_constants\nfrom yt.data_objects.api import (\n DatasetSeries,\n ImageArray,\n ParticleProfile,\n Profile1D,\n Profile2D,\n Profile3D,\n add_particle_filter,\n create_profile,\n particle_filter,\n)\nfrom yt.fields.api import (\n DerivedField,\n FieldDetector,\n FieldInfoContainer,\n ValidateDataField,\n ValidateGridType,\n ValidateParameter,\n ValidateProperty,\n ValidateSpatial,\n add_field,\n add_xray_emissivity_field,\n derived_field,\n field_plugins,\n)\nfrom yt.frontends.api import _frontend_container\nfrom yt.funcs import (\n enable_plugins,\n get_memory_usage,\n get_pbar,\n get_version_stack,\n get_yt_version,\n insert_ipython,\n is_root,\n is_sequence,\n memory_checker,\n only_on_root,\n parallel_profile,\n print_tb,\n rootonly,\n toggle_interactivity,\n)\nfrom yt.units import (\n YTArray,\n YTQuantity,\n display_ytarray,\n loadtxt,\n savetxt,\n uconcatenate,\n ucross,\n udot,\n uhstack,\n uintersect1d,\n unorm,\n ustack,\n uunion1d,\n uvstack,\n)\nfrom yt.units.unit_object import define_unit # type: ignore\nfrom yt.utilities.logger import set_log_level, ytLogger as mylog\n\nfrontends = _frontend_container()\n\nimport yt.visualization.volume_rendering.api as volume_rendering\nfrom yt.frontends.stream.api import hexahedral_connectivity\nfrom yt.frontends.ytdata.api import save_as_dataset\nfrom yt.loaders import (\n load,\n load_amr_grids,\n load_archive,\n load_hexahedral_mesh,\n load_octree,\n load_particles,\n load_sample,\n load_simulation,\n load_uniform_grid,\n load_unstructured_mesh,\n)\nfrom yt.testing import run_nose\nfrom yt.units.unit_systems import UnitSystem, unit_system_registry # type: ignore\n\n# Import some helpful math utilities\nfrom yt.utilities.math_utils import ortho_find, periodic_position, quartiles\nfrom yt.utilities.parallel_tools.parallel_analysis_interface import (\n communication_system,\n enable_parallelism,\n parallel_objects,\n)\n\n# Now individual component imports from the visualization API\nfrom yt.visualization.api import (\n AxisAlignedProjectionPlot,\n AxisAlignedSlicePlot,\n FITSImageData,\n FITSOffAxisProjection,\n FITSOffAxisSlice,\n FITSParticleProjection,\n FITSProjection,\n FITSSlice,\n FixedResolutionBuffer,\n LineBuffer,\n LinePlot,\n OffAxisProjectionPlot,\n OffAxisSlicePlot,\n ParticleImageBuffer,\n ParticlePhasePlot,\n ParticlePlot,\n ParticleProjectionPlot,\n PhasePlot,\n ProfilePlot,\n ProjectionPlot,\n SlicePlot,\n add_colormap,\n apply_colormap,\n make_colormap,\n plot_2d,\n scale_image,\n show_colormaps,\n write_bitmap,\n write_image,\n write_projection,\n)\nfrom yt.visualization.volume_rendering.api import (\n ColorTransferFunction,\n TransferFunction,\n create_scene,\n off_axis_projection,\n volume_render,\n)\n\n# TransferFunctionHelper, MultiVariateTransferFunction\n# off_axis_projection\n", "path": "yt/__init__.py"}]} | 1,776 | 180 |
gh_patches_debug_19805 | rasdani/github-patches | git_diff | NVIDIA__NVFlare-260 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Plot the results in cifar10 example
Hi, I ran the experiments (run_2 to run_10 in the cifar10 example) following the steps 3.1-3.6 and would like to plot the results and regenerate the figures you show. However, running this command as advised in step 3.3 to view the results does not work:
cat ./workspaces/poc_workspace/server/run_2/cross_site_val/cross_site_val.json
Could you advise please on how to regenerate the results after completing all experiments?
</issue>
<code>
[start of examples/cifar10/figs/plot_tensorboard_events.py]
1 # Copyright (c) 2021, NVIDIA CORPORATION.
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 glob
16 import json
17 import os
18
19 import matplotlib.pyplot as plt
20 import pandas as pd
21 import seaborn as sns
22 import tensorflow as tf
23
24 client_results_root = "./workspaces/secure_workspace/site-1"
25 server_results_root = "./workspaces/secure_workspace/localhost"
26
27 # 4.1 Central vs. FedAvg
28 experiments = {
29 "cifar10_central": {"run": "run_1", "tag": "val_acc_local_model"},
30 "cifar10_fedavg": {"run": "run_2", "tag": "val_acc_global_model"},
31 "cifar10_fedavg_he": {"run": "run_9", "tag": "val_acc_global_model"},
32 }
33
34 # # 4.2 Impact of client data heterogeneity
35 # experiments = {"cifar10_fedavg (alpha=1.0)": {"run": "run_2", "tag": "val_acc_global_model"},
36 # "cifar10_fedavg (alpha=0.5)": {"run": "run_3", "tag": "val_acc_global_model"},
37 # "cifar10_fedavg (alpha=0.3)": {"run": "run_4", "tag": "val_acc_global_model"},
38 # "cifar10_fedavg (alpha=0.1)": {"run": "run_5", "tag": "val_acc_global_model"}}
39 #
40 # # 4.3 FedProx vs. FedOpt vs. SCAFFOLD
41 # experiments = {"cifar10_fedavg": {"run": "run_5", "tag": "val_acc_global_model"},
42 # "cifar10_fedprox": {"run": "run_6", "tag": "val_acc_global_model"},
43 # "cifar10_fedopt": {"run": "run_7", "tag": "val_acc_global_model"},
44 # "cifar10_scaffold": {"run": "run_8", "tag": "val_acc_global_model"}}
45
46 add_cross_site_val = True
47
48
49 def read_eventfile(filepath, tags=["val_acc_global_model"]):
50 data = {}
51 for summary in tf.compat.v1.train.summary_iterator(filepath):
52 for v in summary.summary.value:
53 if v.tag in tags:
54 # print(v.tag, summary.step, v.simple_value)
55 if v.tag in data.keys():
56 data[v.tag].append([summary.step, v.simple_value])
57 else:
58 data[v.tag] = [[summary.step, v.simple_value]]
59 return data
60
61
62 def add_eventdata(data, config, filepath, tag="val_acc_global_model"):
63 event_data = read_eventfile(filepath, tags=[tag])
64
65 assert len(event_data[tag]) > 0, f"No data for key {tag}"
66 # print(event_data)
67 for e in event_data[tag]:
68 # print(e)
69 data["Config"].append(config)
70 data["Step"].append(e[0])
71 data["Accuracy"].append(e[1])
72 print(f"added {len(event_data[tag])} entries for {tag}")
73
74
75 def main():
76 data = {"Config": [], "Step": [], "Accuracy": []}
77
78 if add_cross_site_val:
79 xsite_keys = ["SRV_server", "SRV_server_best"]
80 xsite_data = {"Config": []}
81 for k in xsite_keys:
82 xsite_data.update({k: []})
83 else:
84 xsite_data = None
85 xsite_keys = None
86
87 # add event files
88 for config, exp in experiments.items():
89 eventfile = glob.glob(os.path.join(client_results_root, exp["run"] + "/**/events.*"), recursive=True)
90 assert len(eventfile) == 1, "No unique event file found!"
91 eventfile = eventfile[0]
92 print("adding", eventfile)
93 add_eventdata(data, config, eventfile, tag=exp["tag"])
94
95 if add_cross_site_val:
96 xsite_file = glob.glob(
97 os.path.join(server_results_root, exp["run"] + "/**/cross_site_val.json"), recursive=True
98 )
99 assert len(xsite_file) == 1, "No unique x-site file found!"
100 with open(xsite_file[0], "r") as f:
101 xsite_results = json.load(f)
102
103 xsite_data["Config"].append(config)
104 for k in xsite_keys:
105 xsite_data[k].append(xsite_results["site-1"][k]["val_accuracy"])
106
107 print("Training TB data:")
108 print(pd.DataFrame(data))
109
110 if xsite_data:
111 print("Cross-site val data:")
112 print(pd.DataFrame(xsite_data))
113
114 sns.lineplot(x="Step", y="Accuracy", hue="Config", data=data)
115 plt.show()
116
117
118 if __name__ == "__main__":
119 main()
120
[end of examples/cifar10/figs/plot_tensorboard_events.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/examples/cifar10/figs/plot_tensorboard_events.py b/examples/cifar10/figs/plot_tensorboard_events.py
--- a/examples/cifar10/figs/plot_tensorboard_events.py
+++ b/examples/cifar10/figs/plot_tensorboard_events.py
@@ -76,7 +76,7 @@
data = {"Config": [], "Step": [], "Accuracy": []}
if add_cross_site_val:
- xsite_keys = ["SRV_server", "SRV_server_best"]
+ xsite_keys = ["SRV_FL_global_model.pt", "SRV_best_FL_global_model.pt"]
xsite_data = {"Config": []}
for k in xsite_keys:
xsite_data.update({k: []})
@@ -94,7 +94,7 @@
if add_cross_site_val:
xsite_file = glob.glob(
- os.path.join(server_results_root, exp["run"] + "/**/cross_site_val.json"), recursive=True
+ os.path.join(server_results_root, exp["run"] + "/**/cross_val_results.json"), recursive=True
)
assert len(xsite_file) == 1, "No unique x-site file found!"
with open(xsite_file[0], "r") as f:
| {"golden_diff": "diff --git a/examples/cifar10/figs/plot_tensorboard_events.py b/examples/cifar10/figs/plot_tensorboard_events.py\n--- a/examples/cifar10/figs/plot_tensorboard_events.py\n+++ b/examples/cifar10/figs/plot_tensorboard_events.py\n@@ -76,7 +76,7 @@\n data = {\"Config\": [], \"Step\": [], \"Accuracy\": []}\n \n if add_cross_site_val:\n- xsite_keys = [\"SRV_server\", \"SRV_server_best\"]\n+ xsite_keys = [\"SRV_FL_global_model.pt\", \"SRV_best_FL_global_model.pt\"]\n xsite_data = {\"Config\": []}\n for k in xsite_keys:\n xsite_data.update({k: []})\n@@ -94,7 +94,7 @@\n \n if add_cross_site_val:\n xsite_file = glob.glob(\n- os.path.join(server_results_root, exp[\"run\"] + \"/**/cross_site_val.json\"), recursive=True\n+ os.path.join(server_results_root, exp[\"run\"] + \"/**/cross_val_results.json\"), recursive=True\n )\n assert len(xsite_file) == 1, \"No unique x-site file found!\"\n with open(xsite_file[0], \"r\") as f:\n", "issue": "Plot the results in cifar10 example\nHi, I ran the experiments (run_2 to run_10 in the cifar10 example) following the steps 3.1-3.6 and would like to plot the results and regenerate the figures you show. However, running this command as advised in step 3.3 to view the results does not work:\r\n cat ./workspaces/poc_workspace/server/run_2/cross_site_val/cross_site_val.json\r\nCould you advise please on how to regenerate the results after completing all experiments?\r\n\n", "before_files": [{"content": "# Copyright (c) 2021, NVIDIA CORPORATION.\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 glob\nimport json\nimport os\n\nimport matplotlib.pyplot as plt\nimport pandas as pd\nimport seaborn as sns\nimport tensorflow as tf\n\nclient_results_root = \"./workspaces/secure_workspace/site-1\"\nserver_results_root = \"./workspaces/secure_workspace/localhost\"\n\n# 4.1 Central vs. FedAvg\nexperiments = {\n \"cifar10_central\": {\"run\": \"run_1\", \"tag\": \"val_acc_local_model\"},\n \"cifar10_fedavg\": {\"run\": \"run_2\", \"tag\": \"val_acc_global_model\"},\n \"cifar10_fedavg_he\": {\"run\": \"run_9\", \"tag\": \"val_acc_global_model\"},\n}\n\n# # 4.2 Impact of client data heterogeneity\n# experiments = {\"cifar10_fedavg (alpha=1.0)\": {\"run\": \"run_2\", \"tag\": \"val_acc_global_model\"},\n# \"cifar10_fedavg (alpha=0.5)\": {\"run\": \"run_3\", \"tag\": \"val_acc_global_model\"},\n# \"cifar10_fedavg (alpha=0.3)\": {\"run\": \"run_4\", \"tag\": \"val_acc_global_model\"},\n# \"cifar10_fedavg (alpha=0.1)\": {\"run\": \"run_5\", \"tag\": \"val_acc_global_model\"}}\n#\n# # 4.3 FedProx vs. FedOpt vs. SCAFFOLD\n# experiments = {\"cifar10_fedavg\": {\"run\": \"run_5\", \"tag\": \"val_acc_global_model\"},\n# \"cifar10_fedprox\": {\"run\": \"run_6\", \"tag\": \"val_acc_global_model\"},\n# \"cifar10_fedopt\": {\"run\": \"run_7\", \"tag\": \"val_acc_global_model\"},\n# \"cifar10_scaffold\": {\"run\": \"run_8\", \"tag\": \"val_acc_global_model\"}}\n\nadd_cross_site_val = True\n\n\ndef read_eventfile(filepath, tags=[\"val_acc_global_model\"]):\n data = {}\n for summary in tf.compat.v1.train.summary_iterator(filepath):\n for v in summary.summary.value:\n if v.tag in tags:\n # print(v.tag, summary.step, v.simple_value)\n if v.tag in data.keys():\n data[v.tag].append([summary.step, v.simple_value])\n else:\n data[v.tag] = [[summary.step, v.simple_value]]\n return data\n\n\ndef add_eventdata(data, config, filepath, tag=\"val_acc_global_model\"):\n event_data = read_eventfile(filepath, tags=[tag])\n\n assert len(event_data[tag]) > 0, f\"No data for key {tag}\"\n # print(event_data)\n for e in event_data[tag]:\n # print(e)\n data[\"Config\"].append(config)\n data[\"Step\"].append(e[0])\n data[\"Accuracy\"].append(e[1])\n print(f\"added {len(event_data[tag])} entries for {tag}\")\n\n\ndef main():\n data = {\"Config\": [], \"Step\": [], \"Accuracy\": []}\n\n if add_cross_site_val:\n xsite_keys = [\"SRV_server\", \"SRV_server_best\"]\n xsite_data = {\"Config\": []}\n for k in xsite_keys:\n xsite_data.update({k: []})\n else:\n xsite_data = None\n xsite_keys = None\n\n # add event files\n for config, exp in experiments.items():\n eventfile = glob.glob(os.path.join(client_results_root, exp[\"run\"] + \"/**/events.*\"), recursive=True)\n assert len(eventfile) == 1, \"No unique event file found!\"\n eventfile = eventfile[0]\n print(\"adding\", eventfile)\n add_eventdata(data, config, eventfile, tag=exp[\"tag\"])\n\n if add_cross_site_val:\n xsite_file = glob.glob(\n os.path.join(server_results_root, exp[\"run\"] + \"/**/cross_site_val.json\"), recursive=True\n )\n assert len(xsite_file) == 1, \"No unique x-site file found!\"\n with open(xsite_file[0], \"r\") as f:\n xsite_results = json.load(f)\n\n xsite_data[\"Config\"].append(config)\n for k in xsite_keys:\n xsite_data[k].append(xsite_results[\"site-1\"][k][\"val_accuracy\"])\n\n print(\"Training TB data:\")\n print(pd.DataFrame(data))\n\n if xsite_data:\n print(\"Cross-site val data:\")\n print(pd.DataFrame(xsite_data))\n\n sns.lineplot(x=\"Step\", y=\"Accuracy\", hue=\"Config\", data=data)\n plt.show()\n\n\nif __name__ == \"__main__\":\n main()\n", "path": "examples/cifar10/figs/plot_tensorboard_events.py"}]} | 2,108 | 286 |
gh_patches_debug_28217 | rasdani/github-patches | git_diff | Mailu__Mailu-1902 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Make smtp_tls_policy_maps easily configurable
Hi Team,
It will be great to have following options configurable from mailu.env as they are required in many cases
when SMTP RELAY from an ISP is in use:
smtp_tls_security_level
smtp_tls_wrappermode
(PR is following)
</issue>
<code>
[start of core/postfix/start.py]
1 #!/usr/bin/python3
2
3 import os
4 import glob
5 import shutil
6 import multiprocessing
7 import logging as log
8 import sys
9
10 from podop import run_server
11 from pwd import getpwnam
12 from socrate import system, conf
13
14 log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING"))
15
16 def start_podop():
17 os.setuid(getpwnam('postfix').pw_uid)
18 os.mkdir('/dev/shm/postfix',mode=0o700)
19 url = "http://" + os.environ["ADMIN_ADDRESS"] + "/internal/postfix/"
20 # TODO: Remove verbosity setting from Podop?
21 run_server(0, "postfix", "/tmp/podop.socket", [
22 ("transport", "url", url + "transport/§"),
23 ("alias", "url", url + "alias/§"),
24 ("domain", "url", url + "domain/§"),
25 ("mailbox", "url", url + "mailbox/§"),
26 ("recipientmap", "url", url + "recipient/map/§"),
27 ("sendermap", "url", url + "sender/map/§"),
28 ("senderaccess", "url", url + "sender/access/§"),
29 ("senderlogin", "url", url + "sender/login/§"),
30 ("senderrate", "url", url + "sender/rate/§")
31 ])
32
33 def is_valid_postconf_line(line):
34 return not line.startswith("#") \
35 and not line == ''
36
37 # Actual startup script
38 os.environ["FRONT_ADDRESS"] = system.get_host_address_from_environment("FRONT", "front")
39 os.environ["ADMIN_ADDRESS"] = system.get_host_address_from_environment("ADMIN", "admin")
40 os.environ["ANTISPAM_MILTER_ADDRESS"] = system.get_host_address_from_environment("ANTISPAM_MILTER", "antispam:11332")
41 os.environ["LMTP_ADDRESS"] = system.get_host_address_from_environment("LMTP", "imap:2525")
42 os.environ["OUTCLEAN"] = os.environ["HOSTNAMES"].split(",")[0]
43 try:
44 _to_lookup = os.environ["OUTCLEAN"]
45 # Ensure we lookup a FQDN: @see #1884
46 if not _to_lookup.endswith('.'):
47 _to_lookup += '.'
48 os.environ["OUTCLEAN_ADDRESS"] = system.resolve_hostname(_to_lookup)
49 except:
50 os.environ["OUTCLEAN_ADDRESS"] = "10.10.10.10"
51
52 for postfix_file in glob.glob("/conf/*.cf"):
53 conf.jinja(postfix_file, os.environ, os.path.join("/etc/postfix", os.path.basename(postfix_file)))
54
55 if os.path.exists("/overrides/postfix.cf"):
56 for line in open("/overrides/postfix.cf").read().strip().split("\n"):
57 if is_valid_postconf_line(line):
58 os.system('postconf -e "{}"'.format(line))
59
60 if os.path.exists("/overrides/postfix.master"):
61 for line in open("/overrides/postfix.master").read().strip().split("\n"):
62 if is_valid_postconf_line(line):
63 os.system('postconf -Me "{}"'.format(line))
64
65 for map_file in glob.glob("/overrides/*.map"):
66 destination = os.path.join("/etc/postfix", os.path.basename(map_file))
67 shutil.copyfile(map_file, destination)
68 os.system("postmap {}".format(destination))
69 os.remove(destination)
70
71 if "RELAYUSER" in os.environ:
72 path = "/etc/postfix/sasl_passwd"
73 conf.jinja("/conf/sasl_passwd", os.environ, path)
74 os.system("postmap {}".format(path))
75
76 # Run Podop and Postfix
77 multiprocessing.Process(target=start_podop).start()
78 os.system("/usr/libexec/postfix/post-install meta_directory=/etc/postfix create-missing")
79 # Before starting postfix, we need to check permissions on /queue
80 # in the event that postfix,postdrop id have changed
81 os.system("postfix set-permissions")
82 os.system("postfix start-fg")
83
[end of core/postfix/start.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/core/postfix/start.py b/core/postfix/start.py
--- a/core/postfix/start.py
+++ b/core/postfix/start.py
@@ -68,6 +68,12 @@
os.system("postmap {}".format(destination))
os.remove(destination)
+if not os.path.exists("/etc/postfix/tls_policy.map.db"):
+ with open("/etc/postfix/tls_policy.map", "w") as f:
+ for domain in ['gmail.com', 'yahoo.com', 'hotmail.com', 'aol.com', 'outlook.com', 'comcast.net', 'icloud.com', 'msn.com', 'hotmail.co.uk', 'live.com', 'yahoo.co.in', 'me.com', 'mail.ru', 'cox.net', 'yahoo.co.uk', 'verizon.net', 'ymail.com', 'hotmail.it', 'kw.com', 'yahoo.com.tw', 'mac.com', 'live.se', 'live.nl', 'yahoo.com.br', 'googlemail.com', 'libero.it', 'web.de', 'allstate.com', 'btinternet.com', 'online.no', 'yahoo.com.au', 'live.dk', 'earthlink.net', 'yahoo.fr', 'yahoo.it', 'gmx.de', 'hotmail.fr', 'shawinc.com', 'yahoo.de', 'moe.edu.sg', 'naver.com', 'bigpond.com', 'statefarm.com', 'remax.net', 'rocketmail.com', 'live.no', 'yahoo.ca', 'bigpond.net.au', 'hotmail.se', 'gmx.at', 'live.co.uk', 'mail.com', 'yahoo.in', 'yandex.ru', 'qq.com', 'charter.net', 'indeedemail.com', 'alice.it', 'hotmail.de', 'bluewin.ch', 'optonline.net', 'wp.pl', 'yahoo.es', 'hotmail.no', 'pindotmedia.com', 'orange.fr', 'live.it', 'yahoo.co.id', 'yahoo.no', 'hotmail.es', 'morganstanley.com', 'wellsfargo.com', 'wanadoo.fr', 'facebook.com', 'yahoo.se', 'fema.dhs.gov', 'rogers.com', 'yahoo.com.hk', 'live.com.au', 'nic.in', 'nab.com.au', 'ubs.com', 'shaw.ca', 'umich.edu', 'westpac.com.au', 'yahoo.com.mx', 'yahoo.com.sg', 'farmersagent.com', 'yahoo.dk', 'dhs.gov']:
+ f.write(f'{domain}\tsecure\n')
+ os.system("postmap /etc/postfix/tls_policy.map")
+
if "RELAYUSER" in os.environ:
path = "/etc/postfix/sasl_passwd"
conf.jinja("/conf/sasl_passwd", os.environ, path)
| {"golden_diff": "diff --git a/core/postfix/start.py b/core/postfix/start.py\n--- a/core/postfix/start.py\n+++ b/core/postfix/start.py\n@@ -68,6 +68,12 @@\n os.system(\"postmap {}\".format(destination))\n os.remove(destination)\n \n+if not os.path.exists(\"/etc/postfix/tls_policy.map.db\"):\n+ with open(\"/etc/postfix/tls_policy.map\", \"w\") as f:\n+ for domain in ['gmail.com', 'yahoo.com', 'hotmail.com', 'aol.com', 'outlook.com', 'comcast.net', 'icloud.com', 'msn.com', 'hotmail.co.uk', 'live.com', 'yahoo.co.in', 'me.com', 'mail.ru', 'cox.net', 'yahoo.co.uk', 'verizon.net', 'ymail.com', 'hotmail.it', 'kw.com', 'yahoo.com.tw', 'mac.com', 'live.se', 'live.nl', 'yahoo.com.br', 'googlemail.com', 'libero.it', 'web.de', 'allstate.com', 'btinternet.com', 'online.no', 'yahoo.com.au', 'live.dk', 'earthlink.net', 'yahoo.fr', 'yahoo.it', 'gmx.de', 'hotmail.fr', 'shawinc.com', 'yahoo.de', 'moe.edu.sg', 'naver.com', 'bigpond.com', 'statefarm.com', 'remax.net', 'rocketmail.com', 'live.no', 'yahoo.ca', 'bigpond.net.au', 'hotmail.se', 'gmx.at', 'live.co.uk', 'mail.com', 'yahoo.in', 'yandex.ru', 'qq.com', 'charter.net', 'indeedemail.com', 'alice.it', 'hotmail.de', 'bluewin.ch', 'optonline.net', 'wp.pl', 'yahoo.es', 'hotmail.no', 'pindotmedia.com', 'orange.fr', 'live.it', 'yahoo.co.id', 'yahoo.no', 'hotmail.es', 'morganstanley.com', 'wellsfargo.com', 'wanadoo.fr', 'facebook.com', 'yahoo.se', 'fema.dhs.gov', 'rogers.com', 'yahoo.com.hk', 'live.com.au', 'nic.in', 'nab.com.au', 'ubs.com', 'shaw.ca', 'umich.edu', 'westpac.com.au', 'yahoo.com.mx', 'yahoo.com.sg', 'farmersagent.com', 'yahoo.dk', 'dhs.gov']:\n+ f.write(f'{domain}\\tsecure\\n')\n+ os.system(\"postmap /etc/postfix/tls_policy.map\")\n+\n if \"RELAYUSER\" in os.environ:\n path = \"/etc/postfix/sasl_passwd\"\n conf.jinja(\"/conf/sasl_passwd\", os.environ, path)\n", "issue": "Make smtp_tls_policy_maps easily configurable\nHi Team,\r\n\r\nIt will be great to have following options configurable from mailu.env as they are required in many cases\r\nwhen SMTP RELAY from an ISP is in use:\r\nsmtp_tls_security_level\r\nsmtp_tls_wrappermode\r\n(PR is following)\n", "before_files": [{"content": "#!/usr/bin/python3\n\nimport os\nimport glob\nimport shutil\nimport multiprocessing\nimport logging as log\nimport sys\n\nfrom podop import run_server\nfrom pwd import getpwnam\nfrom socrate import system, conf\n\nlog.basicConfig(stream=sys.stderr, level=os.environ.get(\"LOG_LEVEL\", \"WARNING\"))\n\ndef start_podop():\n os.setuid(getpwnam('postfix').pw_uid)\n os.mkdir('/dev/shm/postfix',mode=0o700)\n url = \"http://\" + os.environ[\"ADMIN_ADDRESS\"] + \"/internal/postfix/\"\n # TODO: Remove verbosity setting from Podop?\n run_server(0, \"postfix\", \"/tmp/podop.socket\", [\n\t\t(\"transport\", \"url\", url + \"transport/\u00a7\"),\n\t\t(\"alias\", \"url\", url + \"alias/\u00a7\"),\n\t\t(\"domain\", \"url\", url + \"domain/\u00a7\"),\n (\"mailbox\", \"url\", url + \"mailbox/\u00a7\"),\n (\"recipientmap\", \"url\", url + \"recipient/map/\u00a7\"),\n (\"sendermap\", \"url\", url + \"sender/map/\u00a7\"),\n (\"senderaccess\", \"url\", url + \"sender/access/\u00a7\"),\n (\"senderlogin\", \"url\", url + \"sender/login/\u00a7\"),\n (\"senderrate\", \"url\", url + \"sender/rate/\u00a7\")\n ])\n\ndef is_valid_postconf_line(line):\n return not line.startswith(\"#\") \\\n and not line == ''\n\n# Actual startup script\nos.environ[\"FRONT_ADDRESS\"] = system.get_host_address_from_environment(\"FRONT\", \"front\")\nos.environ[\"ADMIN_ADDRESS\"] = system.get_host_address_from_environment(\"ADMIN\", \"admin\")\nos.environ[\"ANTISPAM_MILTER_ADDRESS\"] = system.get_host_address_from_environment(\"ANTISPAM_MILTER\", \"antispam:11332\")\nos.environ[\"LMTP_ADDRESS\"] = system.get_host_address_from_environment(\"LMTP\", \"imap:2525\")\nos.environ[\"OUTCLEAN\"] = os.environ[\"HOSTNAMES\"].split(\",\")[0]\ntry:\n _to_lookup = os.environ[\"OUTCLEAN\"]\n # Ensure we lookup a FQDN: @see #1884\n if not _to_lookup.endswith('.'):\n _to_lookup += '.'\n os.environ[\"OUTCLEAN_ADDRESS\"] = system.resolve_hostname(_to_lookup)\nexcept:\n os.environ[\"OUTCLEAN_ADDRESS\"] = \"10.10.10.10\"\n\nfor postfix_file in glob.glob(\"/conf/*.cf\"):\n conf.jinja(postfix_file, os.environ, os.path.join(\"/etc/postfix\", os.path.basename(postfix_file)))\n\nif os.path.exists(\"/overrides/postfix.cf\"):\n for line in open(\"/overrides/postfix.cf\").read().strip().split(\"\\n\"):\n if is_valid_postconf_line(line):\n os.system('postconf -e \"{}\"'.format(line))\n\nif os.path.exists(\"/overrides/postfix.master\"):\n for line in open(\"/overrides/postfix.master\").read().strip().split(\"\\n\"):\n if is_valid_postconf_line(line):\n os.system('postconf -Me \"{}\"'.format(line))\n\nfor map_file in glob.glob(\"/overrides/*.map\"):\n destination = os.path.join(\"/etc/postfix\", os.path.basename(map_file))\n shutil.copyfile(map_file, destination)\n os.system(\"postmap {}\".format(destination))\n os.remove(destination)\n\nif \"RELAYUSER\" in os.environ:\n path = \"/etc/postfix/sasl_passwd\"\n conf.jinja(\"/conf/sasl_passwd\", os.environ, path)\n os.system(\"postmap {}\".format(path))\n\n# Run Podop and Postfix\nmultiprocessing.Process(target=start_podop).start()\nos.system(\"/usr/libexec/postfix/post-install meta_directory=/etc/postfix create-missing\")\n# Before starting postfix, we need to check permissions on /queue\n# in the event that postfix,postdrop id have changed\nos.system(\"postfix set-permissions\")\nos.system(\"postfix start-fg\")\n", "path": "core/postfix/start.py"}]} | 1,618 | 590 |
gh_patches_debug_7997 | rasdani/github-patches | git_diff | searx__searx-332 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Bing news engine broken
There is no result when I'm using the bang "!bing_news".
</issue>
<code>
[start of searx/engines/bing_news.py]
1 """
2 Bing (News)
3
4 @website https://www.bing.com/news
5 @provide-api yes (http://datamarket.azure.com/dataset/bing/search),
6 max. 5000 query/month
7
8 @using-api no (because of query limit)
9 @results HTML (using search portal)
10 @stable no (HTML can change)
11 @parse url, title, content, publishedDate
12 """
13
14 from urllib import urlencode
15 from cgi import escape
16 from lxml import html
17 from datetime import datetime, timedelta
18 from dateutil import parser
19 import re
20 from searx.engines.xpath import extract_text
21
22 # engine dependent config
23 categories = ['news']
24 paging = True
25 language_support = True
26
27 # search-url
28 base_url = 'https://www.bing.com/'
29 search_string = 'news/search?{query}&first={offset}'
30
31
32 # do search-request
33 def request(query, params):
34 offset = (params['pageno'] - 1) * 10 + 1
35
36 if params['language'] == 'all':
37 language = 'en-US'
38 else:
39 language = params['language'].replace('_', '-')
40
41 search_path = search_string.format(
42 query=urlencode({'q': query, 'setmkt': language}),
43 offset=offset)
44
45 params['cookies']['_FP'] = "ui=en-US"
46
47 params['url'] = base_url + search_path
48
49 return params
50
51
52 # get response from search-request
53 def response(resp):
54 results = []
55
56 dom = html.fromstring(resp.content)
57
58 # parse results
59 for result in dom.xpath('//div[@class="sn_r"]'):
60 link = result.xpath('.//div[@class="newstitle"]/a')[0]
61 url = link.attrib.get('href')
62 title = extract_text(link)
63 contentXPath = result.xpath('.//div[@class="sn_txt"]/div//span[@class="sn_snip"]')
64 content = escape(extract_text(contentXPath))
65
66 # parse publishedDate
67 publishedDateXPath = result.xpath('.//div[@class="sn_txt"]/div'
68 '//span[contains(@class,"sn_ST")]'
69 '//span[contains(@class,"sn_tm")]')
70
71 publishedDate = escape(extract_text(publishedDateXPath))
72
73 if re.match("^[0-9]+ minute(s|) ago$", publishedDate):
74 timeNumbers = re.findall(r'\d+', publishedDate)
75 publishedDate = datetime.now() - timedelta(minutes=int(timeNumbers[0]))
76 elif re.match("^[0-9]+ hour(s|) ago$", publishedDate):
77 timeNumbers = re.findall(r'\d+', publishedDate)
78 publishedDate = datetime.now() - timedelta(hours=int(timeNumbers[0]))
79 elif re.match("^[0-9]+ hour(s|), [0-9]+ minute(s|) ago$", publishedDate):
80 timeNumbers = re.findall(r'\d+', publishedDate)
81 publishedDate = datetime.now()\
82 - timedelta(hours=int(timeNumbers[0]))\
83 - timedelta(minutes=int(timeNumbers[1]))
84 elif re.match("^[0-9]+ day(s|) ago$", publishedDate):
85 timeNumbers = re.findall(r'\d+', publishedDate)
86 publishedDate = datetime.now() - timedelta(days=int(timeNumbers[0]))
87 else:
88 try:
89 publishedDate = parser.parse(publishedDate, dayfirst=False)
90 except TypeError:
91 publishedDate = datetime.now()
92 except ValueError:
93 publishedDate = datetime.now()
94
95 # append result
96 results.append({'url': url,
97 'title': title,
98 'publishedDate': publishedDate,
99 'content': content})
100
101 # return results
102 return results
103
[end of searx/engines/bing_news.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/searx/engines/bing_news.py b/searx/engines/bing_news.py
--- a/searx/engines/bing_news.py
+++ b/searx/engines/bing_news.py
@@ -65,7 +65,7 @@
# parse publishedDate
publishedDateXPath = result.xpath('.//div[@class="sn_txt"]/div'
- '//span[contains(@class,"sn_ST")]'
+ '//div[contains(@class,"sn_ST")]'
'//span[contains(@class,"sn_tm")]')
publishedDate = escape(extract_text(publishedDateXPath))
| {"golden_diff": "diff --git a/searx/engines/bing_news.py b/searx/engines/bing_news.py\n--- a/searx/engines/bing_news.py\n+++ b/searx/engines/bing_news.py\n@@ -65,7 +65,7 @@\n \n # parse publishedDate\n publishedDateXPath = result.xpath('.//div[@class=\"sn_txt\"]/div'\n- '//span[contains(@class,\"sn_ST\")]'\n+ '//div[contains(@class,\"sn_ST\")]'\n '//span[contains(@class,\"sn_tm\")]')\n \n publishedDate = escape(extract_text(publishedDateXPath))\n", "issue": "Bing news engine broken\nThere is no result when I'm using the bang \"!bing_news\".\n\n", "before_files": [{"content": "\"\"\"\n Bing (News)\n\n @website https://www.bing.com/news\n @provide-api yes (http://datamarket.azure.com/dataset/bing/search),\n max. 5000 query/month\n\n @using-api no (because of query limit)\n @results HTML (using search portal)\n @stable no (HTML can change)\n @parse url, title, content, publishedDate\n\"\"\"\n\nfrom urllib import urlencode\nfrom cgi import escape\nfrom lxml import html\nfrom datetime import datetime, timedelta\nfrom dateutil import parser\nimport re\nfrom searx.engines.xpath import extract_text\n\n# engine dependent config\ncategories = ['news']\npaging = True\nlanguage_support = True\n\n# search-url\nbase_url = 'https://www.bing.com/'\nsearch_string = 'news/search?{query}&first={offset}'\n\n\n# do search-request\ndef request(query, params):\n offset = (params['pageno'] - 1) * 10 + 1\n\n if params['language'] == 'all':\n language = 'en-US'\n else:\n language = params['language'].replace('_', '-')\n\n search_path = search_string.format(\n query=urlencode({'q': query, 'setmkt': language}),\n offset=offset)\n\n params['cookies']['_FP'] = \"ui=en-US\"\n\n params['url'] = base_url + search_path\n\n return params\n\n\n# get response from search-request\ndef response(resp):\n results = []\n\n dom = html.fromstring(resp.content)\n\n # parse results\n for result in dom.xpath('//div[@class=\"sn_r\"]'):\n link = result.xpath('.//div[@class=\"newstitle\"]/a')[0]\n url = link.attrib.get('href')\n title = extract_text(link)\n contentXPath = result.xpath('.//div[@class=\"sn_txt\"]/div//span[@class=\"sn_snip\"]')\n content = escape(extract_text(contentXPath))\n\n # parse publishedDate\n publishedDateXPath = result.xpath('.//div[@class=\"sn_txt\"]/div'\n '//span[contains(@class,\"sn_ST\")]'\n '//span[contains(@class,\"sn_tm\")]')\n\n publishedDate = escape(extract_text(publishedDateXPath))\n\n if re.match(\"^[0-9]+ minute(s|) ago$\", publishedDate):\n timeNumbers = re.findall(r'\\d+', publishedDate)\n publishedDate = datetime.now() - timedelta(minutes=int(timeNumbers[0]))\n elif re.match(\"^[0-9]+ hour(s|) ago$\", publishedDate):\n timeNumbers = re.findall(r'\\d+', publishedDate)\n publishedDate = datetime.now() - timedelta(hours=int(timeNumbers[0]))\n elif re.match(\"^[0-9]+ hour(s|), [0-9]+ minute(s|) ago$\", publishedDate):\n timeNumbers = re.findall(r'\\d+', publishedDate)\n publishedDate = datetime.now()\\\n - timedelta(hours=int(timeNumbers[0]))\\\n - timedelta(minutes=int(timeNumbers[1]))\n elif re.match(\"^[0-9]+ day(s|) ago$\", publishedDate):\n timeNumbers = re.findall(r'\\d+', publishedDate)\n publishedDate = datetime.now() - timedelta(days=int(timeNumbers[0]))\n else:\n try:\n publishedDate = parser.parse(publishedDate, dayfirst=False)\n except TypeError:\n publishedDate = datetime.now()\n except ValueError:\n publishedDate = datetime.now()\n\n # append result\n results.append({'url': url,\n 'title': title,\n 'publishedDate': publishedDate,\n 'content': content})\n\n # return results\n return results\n", "path": "searx/engines/bing_news.py"}]} | 1,565 | 138 |
gh_patches_debug_23842 | rasdani/github-patches | git_diff | freqtrade__freqtrade-3614 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Hyperopt confusing warning message
## Step 1: Describe your environment
* Operating system: Windows 10
* Python Version: 3.7.5 (`python -V`)
* Branch: freqtrade develop-1aa1fada
## Step 2: Describe the problem:
When hyperopting with the following command: `freqtrade hyperopt -c test_config.json --hyperopt strategy_hyperopt -e 750--spaces buy sell stoploss trailing -–min-trades=20 –-timerange=20200111-20200510 –j 2 --no-color`
I get the following warning messages:
I didn't include the 'normal' buy/sell trends in the hyperopt file, but since I am using the buy/sell trends generated by the hyperopt file, these messages can be confusing. It's taking the 'normal' buy/sell trends from the original strategy file, but it doesn't use it anyway.
</issue>
<code>
[start of freqtrade/resolvers/hyperopt_resolver.py]
1 # pragma pylint: disable=attribute-defined-outside-init
2
3 """
4 This module load custom hyperopt
5 """
6 import logging
7 from pathlib import Path
8 from typing import Dict
9
10 from freqtrade.constants import DEFAULT_HYPEROPT_LOSS, USERPATH_HYPEROPTS
11 from freqtrade.exceptions import OperationalException
12 from freqtrade.optimize.hyperopt_interface import IHyperOpt
13 from freqtrade.optimize.hyperopt_loss_interface import IHyperOptLoss
14 from freqtrade.resolvers import IResolver
15
16 logger = logging.getLogger(__name__)
17
18
19 class HyperOptResolver(IResolver):
20 """
21 This class contains all the logic to load custom hyperopt class
22 """
23 object_type = IHyperOpt
24 object_type_str = "Hyperopt"
25 user_subdir = USERPATH_HYPEROPTS
26 initial_search_path = Path(__file__).parent.parent.joinpath('optimize').resolve()
27
28 @staticmethod
29 def load_hyperopt(config: Dict) -> IHyperOpt:
30 """
31 Load the custom hyperopt class from config parameter
32 :param config: configuration dictionary
33 """
34 if not config.get('hyperopt'):
35 raise OperationalException("No Hyperopt set. Please use `--hyperopt` to specify "
36 "the Hyperopt class to use.")
37
38 hyperopt_name = config['hyperopt']
39
40 hyperopt = HyperOptResolver.load_object(hyperopt_name, config,
41 kwargs={'config': config},
42 extra_dir=config.get('hyperopt_path'))
43
44 if not hasattr(hyperopt, 'populate_indicators'):
45 logger.warning("Hyperopt class does not provide populate_indicators() method. "
46 "Using populate_indicators from the strategy.")
47 if not hasattr(hyperopt, 'populate_buy_trend'):
48 logger.warning("Hyperopt class does not provide populate_buy_trend() method. "
49 "Using populate_buy_trend from the strategy.")
50 if not hasattr(hyperopt, 'populate_sell_trend'):
51 logger.warning("Hyperopt class does not provide populate_sell_trend() method. "
52 "Using populate_sell_trend from the strategy.")
53 return hyperopt
54
55
56 class HyperOptLossResolver(IResolver):
57 """
58 This class contains all the logic to load custom hyperopt loss class
59 """
60 object_type = IHyperOptLoss
61 object_type_str = "HyperoptLoss"
62 user_subdir = USERPATH_HYPEROPTS
63 initial_search_path = Path(__file__).parent.parent.joinpath('optimize').resolve()
64
65 @staticmethod
66 def load_hyperoptloss(config: Dict) -> IHyperOptLoss:
67 """
68 Load the custom class from config parameter
69 :param config: configuration dictionary
70 """
71
72 # Verify the hyperopt_loss is in the configuration, otherwise fallback to the
73 # default hyperopt loss
74 hyperoptloss_name = config.get('hyperopt_loss') or DEFAULT_HYPEROPT_LOSS
75
76 hyperoptloss = HyperOptLossResolver.load_object(hyperoptloss_name,
77 config, kwargs={},
78 extra_dir=config.get('hyperopt_path'))
79
80 # Assign timeframe to be used in hyperopt
81 hyperoptloss.__class__.ticker_interval = str(config['timeframe'])
82 hyperoptloss.__class__.timeframe = str(config['timeframe'])
83
84 if not hasattr(hyperoptloss, 'hyperopt_loss_function'):
85 raise OperationalException(
86 f"Found HyperoptLoss class {hyperoptloss_name} does not "
87 "implement `hyperopt_loss_function`.")
88 return hyperoptloss
89
[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/resolvers/hyperopt_resolver.py b/freqtrade/resolvers/hyperopt_resolver.py
--- a/freqtrade/resolvers/hyperopt_resolver.py
+++ b/freqtrade/resolvers/hyperopt_resolver.py
@@ -42,14 +42,14 @@
extra_dir=config.get('hyperopt_path'))
if not hasattr(hyperopt, 'populate_indicators'):
- logger.warning("Hyperopt class does not provide populate_indicators() method. "
- "Using populate_indicators from the strategy.")
+ logger.info("Hyperopt class does not provide populate_indicators() method. "
+ "Using populate_indicators from the strategy.")
if not hasattr(hyperopt, 'populate_buy_trend'):
- logger.warning("Hyperopt class does not provide populate_buy_trend() method. "
- "Using populate_buy_trend from the strategy.")
+ logger.info("Hyperopt class does not provide populate_buy_trend() method. "
+ "Using populate_buy_trend from the strategy.")
if not hasattr(hyperopt, 'populate_sell_trend'):
- logger.warning("Hyperopt class does not provide populate_sell_trend() method. "
- "Using populate_sell_trend from the strategy.")
+ logger.info("Hyperopt class does not provide populate_sell_trend() method. "
+ "Using populate_sell_trend from the strategy.")
return hyperopt
| {"golden_diff": "diff --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@@ -42,14 +42,14 @@\n extra_dir=config.get('hyperopt_path'))\n \n if not hasattr(hyperopt, 'populate_indicators'):\n- logger.warning(\"Hyperopt class does not provide populate_indicators() method. \"\n- \"Using populate_indicators from the strategy.\")\n+ logger.info(\"Hyperopt class does not provide populate_indicators() method. \"\n+ \"Using populate_indicators from the strategy.\")\n if not hasattr(hyperopt, 'populate_buy_trend'):\n- logger.warning(\"Hyperopt class does not provide populate_buy_trend() method. \"\n- \"Using populate_buy_trend from the strategy.\")\n+ logger.info(\"Hyperopt class does not provide populate_buy_trend() method. \"\n+ \"Using populate_buy_trend from the strategy.\")\n if not hasattr(hyperopt, 'populate_sell_trend'):\n- logger.warning(\"Hyperopt class does not provide populate_sell_trend() method. \"\n- \"Using populate_sell_trend from the strategy.\")\n+ logger.info(\"Hyperopt class does not provide populate_sell_trend() method. \"\n+ \"Using populate_sell_trend from the strategy.\")\n return hyperopt\n", "issue": "Hyperopt confusing warning message\n## Step 1: Describe your environment\r\n\r\n * Operating system: Windows 10\r\n * Python Version: 3.7.5 (`python -V`)\r\n * Branch: freqtrade develop-1aa1fada\r\n \r\n## Step 2: Describe the problem:\r\n\r\nWhen hyperopting with the following command: `freqtrade hyperopt -c test_config.json --hyperopt strategy_hyperopt -e 750--spaces buy sell stoploss trailing -\u2013min-trades=20 \u2013-timerange=20200111-20200510 \u2013j 2 --no-color` \r\n\r\nI get the following warning messages:\r\n\r\n\r\nI didn't include the 'normal' buy/sell trends in the hyperopt file, but since I am using the buy/sell trends generated by the hyperopt file, these messages can be confusing. It's taking the 'normal' buy/sell trends from the original strategy file, but it doesn't use it anyway.\r\n\n", "before_files": [{"content": "# pragma pylint: disable=attribute-defined-outside-init\n\n\"\"\"\nThis module load custom hyperopt\n\"\"\"\nimport logging\nfrom pathlib import Path\nfrom typing import Dict\n\nfrom freqtrade.constants import DEFAULT_HYPEROPT_LOSS, USERPATH_HYPEROPTS\nfrom freqtrade.exceptions import OperationalException\nfrom freqtrade.optimize.hyperopt_interface import IHyperOpt\nfrom freqtrade.optimize.hyperopt_loss_interface import IHyperOptLoss\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 object_type = IHyperOpt\n object_type_str = \"Hyperopt\"\n user_subdir = USERPATH_HYPEROPTS\n initial_search_path = Path(__file__).parent.parent.joinpath('optimize').resolve()\n\n @staticmethod\n def load_hyperopt(config: Dict) -> IHyperOpt:\n \"\"\"\n Load the custom hyperopt class from config parameter\n :param config: configuration dictionary\n \"\"\"\n if not config.get('hyperopt'):\n raise OperationalException(\"No Hyperopt set. Please use `--hyperopt` to specify \"\n \"the Hyperopt class to use.\")\n\n hyperopt_name = config['hyperopt']\n\n hyperopt = HyperOptResolver.load_object(hyperopt_name, config,\n kwargs={'config': config},\n extra_dir=config.get('hyperopt_path'))\n\n if not hasattr(hyperopt, 'populate_indicators'):\n logger.warning(\"Hyperopt class does not provide populate_indicators() method. \"\n \"Using populate_indicators from the strategy.\")\n if not hasattr(hyperopt, 'populate_buy_trend'):\n logger.warning(\"Hyperopt class does not provide populate_buy_trend() method. \"\n \"Using populate_buy_trend from the strategy.\")\n if not hasattr(hyperopt, 'populate_sell_trend'):\n logger.warning(\"Hyperopt class does not provide populate_sell_trend() method. \"\n \"Using populate_sell_trend from the strategy.\")\n return hyperopt\n\n\nclass HyperOptLossResolver(IResolver):\n \"\"\"\n This class contains all the logic to load custom hyperopt loss class\n \"\"\"\n object_type = IHyperOptLoss\n object_type_str = \"HyperoptLoss\"\n user_subdir = USERPATH_HYPEROPTS\n initial_search_path = Path(__file__).parent.parent.joinpath('optimize').resolve()\n\n @staticmethod\n def load_hyperoptloss(config: Dict) -> IHyperOptLoss:\n \"\"\"\n Load the custom class from config parameter\n :param config: configuration dictionary\n \"\"\"\n\n # Verify the hyperopt_loss is in the configuration, otherwise fallback to the\n # default hyperopt loss\n hyperoptloss_name = config.get('hyperopt_loss') or DEFAULT_HYPEROPT_LOSS\n\n hyperoptloss = HyperOptLossResolver.load_object(hyperoptloss_name,\n config, kwargs={},\n extra_dir=config.get('hyperopt_path'))\n\n # Assign timeframe to be used in hyperopt\n hyperoptloss.__class__.ticker_interval = str(config['timeframe'])\n hyperoptloss.__class__.timeframe = str(config['timeframe'])\n\n if not hasattr(hyperoptloss, 'hyperopt_loss_function'):\n raise OperationalException(\n f\"Found HyperoptLoss class {hyperoptloss_name} does not \"\n \"implement `hyperopt_loss_function`.\")\n return hyperoptloss\n", "path": "freqtrade/resolvers/hyperopt_resolver.py"}]} | 1,732 | 305 |
gh_patches_debug_33323 | rasdani/github-patches | git_diff | ytdl-org__youtube-dl-4629 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Support for tfou.fr
youtube-dl --verbose 'http://www.tfou.fr/les-mysterieuses-cites-d-or-saison-2/videos/l-expedition-les-mysterieuses-cites-d-or-8302866-739.html'
[debug] System config: []
[debug] User config: []
[debug] Command-line args: ['--verbose', 'http://www.tfou.fr/les-mysterieuses-cites-d-or-saison-2/videos/l-expedition-les-mysterieuses-cites-d-or-8302866-739.html']
[debug] Encodings: locale ANSI_X3.4-1968, fs ANSI_X3.4-1968, out ANSI_X3.4-1968, pref ANSI_X3.4-1968
[debug] youtube-dl version 2015.01.01
[debug] Python version 2.7.6 - Linux-3.13.0-34-generic-x86_64-with-Ubuntu-14.04-trusty
[debug] exe versions: avconv 9.16-6, avprobe 9.16-6, ffmpeg 2.4.2, ffprobe 2.4.2, rtmpdump 2.4
[debug] Proxy map: {}
[generic] l-expedition-les-mysterieuses-cites-d-or-8302866-739: Requesting header
WARNING: Falling back on generic information extractor.
[generic] l-expedition-les-mysterieuses-cites-d-or-8302866-739: Downloading webpage
[generic] l-expedition-les-mysterieuses-cites-d-or-8302866-739: Extracting information
ERROR: Unsupported URL: http://www.tfou.fr/les-mysterieuses-cites-d-or-saison-2/videos/l-expedition-les-mysterieuses-cites-d-or-8302866-739.html
</issue>
<code>
[start of youtube_dl/extractor/tf1.py]
1 # coding: utf-8
2 from __future__ import unicode_literals
3
4 import re
5
6 from .common import InfoExtractor
7
8
9 class TF1IE(InfoExtractor):
10 """TF1 uses the wat.tv player."""
11 _VALID_URL = r'http://videos\.tf1\.fr/.*-(?P<id>.*?)\.html'
12 _TEST = {
13 'url': 'http://videos.tf1.fr/auto-moto/citroen-grand-c4-picasso-2013-presentation-officielle-8062060.html',
14 'info_dict': {
15 'id': '10635995',
16 'ext': 'mp4',
17 'title': 'Citroën Grand C4 Picasso 2013 : présentation officielle',
18 'description': 'Vidéo officielle du nouveau Citroën Grand C4 Picasso, lancé à l\'automne 2013.',
19 },
20 'params': {
21 # Sometimes wat serves the whole file with the --test option
22 'skip_download': True,
23 },
24 }
25
26 def _real_extract(self, url):
27 mobj = re.match(self._VALID_URL, url)
28 video_id = mobj.group('id')
29 webpage = self._download_webpage(url, video_id)
30 embed_url = self._html_search_regex(
31 r'"(https://www.wat.tv/embedframe/.*?)"', webpage, 'embed url')
32 embed_page = self._download_webpage(embed_url, video_id,
33 'Downloading embed player page')
34 wat_id = self._search_regex(r'UVID=(.*?)&', embed_page, 'wat id')
35 wat_info = self._download_json(
36 'http://www.wat.tv/interface/contentv3/%s' % wat_id, video_id)
37 return self.url_result(wat_info['media']['url'], 'Wat')
38
[end of youtube_dl/extractor/tf1.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/youtube_dl/extractor/tf1.py b/youtube_dl/extractor/tf1.py
--- a/youtube_dl/extractor/tf1.py
+++ b/youtube_dl/extractor/tf1.py
@@ -8,8 +8,8 @@
class TF1IE(InfoExtractor):
"""TF1 uses the wat.tv player."""
- _VALID_URL = r'http://videos\.tf1\.fr/.*-(?P<id>.*?)\.html'
- _TEST = {
+ _VALID_URL = r'http://(?:videos\.tf1|www\.tfou)\.fr/.*?-(?P<id>\d+)(?:-\d+)?\.html'
+ _TESTS = {
'url': 'http://videos.tf1.fr/auto-moto/citroen-grand-c4-picasso-2013-presentation-officielle-8062060.html',
'info_dict': {
'id': '10635995',
@@ -21,14 +21,26 @@
# Sometimes wat serves the whole file with the --test option
'skip_download': True,
},
+ }, {
+ 'url': 'http://www.tfou.fr/chuggington/videos/le-grand-mysterioso-chuggington-7085291-739.html',
+ 'info_dict': {
+ 'id': '12043945',
+ 'ext': 'mp4',
+ 'title': 'Le grand Mystérioso - Chuggington',
+ 'description': 'Le grand Mystérioso - Emery rêve qu\'un article lui soit consacré dans le journal.',
+ 'upload_date': '20150103',
+ },
+ 'params': {
+ # Sometimes wat serves the whole file with the --test option
+ 'skip_download': True,
+ },
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
embed_url = self._html_search_regex(
- r'"(https://www.wat.tv/embedframe/.*?)"', webpage, 'embed url')
+ r'["\'](https?://www.wat.tv/embedframe/.*?)["\']', webpage, 'embed url')
embed_page = self._download_webpage(embed_url, video_id,
'Downloading embed player page')
wat_id = self._search_regex(r'UVID=(.*?)&', embed_page, 'wat id')
| {"golden_diff": "diff --git a/youtube_dl/extractor/tf1.py b/youtube_dl/extractor/tf1.py\n--- a/youtube_dl/extractor/tf1.py\n+++ b/youtube_dl/extractor/tf1.py\n@@ -8,8 +8,8 @@\n \n class TF1IE(InfoExtractor):\n \"\"\"TF1 uses the wat.tv player.\"\"\"\n- _VALID_URL = r'http://videos\\.tf1\\.fr/.*-(?P<id>.*?)\\.html'\n- _TEST = {\n+ _VALID_URL = r'http://(?:videos\\.tf1|www\\.tfou)\\.fr/.*?-(?P<id>\\d+)(?:-\\d+)?\\.html'\n+ _TESTS = {\n 'url': 'http://videos.tf1.fr/auto-moto/citroen-grand-c4-picasso-2013-presentation-officielle-8062060.html',\n 'info_dict': {\n 'id': '10635995',\n@@ -21,14 +21,26 @@\n # Sometimes wat serves the whole file with the --test option\n 'skip_download': True,\n },\n+ }, {\n+ 'url': 'http://www.tfou.fr/chuggington/videos/le-grand-mysterioso-chuggington-7085291-739.html',\n+ 'info_dict': {\n+ 'id': '12043945',\n+ 'ext': 'mp4',\n+ 'title': 'Le grand Myst\u00e9rioso - Chuggington',\n+ 'description': 'Le grand Myst\u00e9rioso - Emery r\u00eave qu\\'un article lui soit consacr\u00e9 dans le journal.',\n+ 'upload_date': '20150103',\n+ },\n+ 'params': {\n+ # Sometimes wat serves the whole file with the --test option\n+ 'skip_download': True,\n+ },\n }\n \n def _real_extract(self, url):\n- mobj = re.match(self._VALID_URL, url)\n- video_id = mobj.group('id')\n+ video_id = self._match_id(url)\n webpage = self._download_webpage(url, video_id)\n embed_url = self._html_search_regex(\n- r'\"(https://www.wat.tv/embedframe/.*?)\"', webpage, 'embed url')\n+ r'[\"\\'](https?://www.wat.tv/embedframe/.*?)[\"\\']', webpage, 'embed url')\n embed_page = self._download_webpage(embed_url, video_id,\n 'Downloading embed player page')\n wat_id = self._search_regex(r'UVID=(.*?)&', embed_page, 'wat id')\n", "issue": "Support for tfou.fr\n youtube-dl --verbose 'http://www.tfou.fr/les-mysterieuses-cites-d-or-saison-2/videos/l-expedition-les-mysterieuses-cites-d-or-8302866-739.html'\n[debug] System config: []\n[debug] User config: []\n[debug] Command-line args: ['--verbose', 'http://www.tfou.fr/les-mysterieuses-cites-d-or-saison-2/videos/l-expedition-les-mysterieuses-cites-d-or-8302866-739.html']\n[debug] Encodings: locale ANSI_X3.4-1968, fs ANSI_X3.4-1968, out ANSI_X3.4-1968, pref ANSI_X3.4-1968\n[debug] youtube-dl version 2015.01.01\n[debug] Python version 2.7.6 - Linux-3.13.0-34-generic-x86_64-with-Ubuntu-14.04-trusty\n[debug] exe versions: avconv 9.16-6, avprobe 9.16-6, ffmpeg 2.4.2, ffprobe 2.4.2, rtmpdump 2.4\n[debug] Proxy map: {}\n[generic] l-expedition-les-mysterieuses-cites-d-or-8302866-739: Requesting header\nWARNING: Falling back on generic information extractor.\n[generic] l-expedition-les-mysterieuses-cites-d-or-8302866-739: Downloading webpage\n[generic] l-expedition-les-mysterieuses-cites-d-or-8302866-739: Extracting information\nERROR: Unsupported URL: http://www.tfou.fr/les-mysterieuses-cites-d-or-saison-2/videos/l-expedition-les-mysterieuses-cites-d-or-8302866-739.html\n\n", "before_files": [{"content": "# coding: utf-8\nfrom __future__ import unicode_literals\n\nimport re\n\nfrom .common import InfoExtractor\n\n\nclass TF1IE(InfoExtractor):\n \"\"\"TF1 uses the wat.tv player.\"\"\"\n _VALID_URL = r'http://videos\\.tf1\\.fr/.*-(?P<id>.*?)\\.html'\n _TEST = {\n 'url': 'http://videos.tf1.fr/auto-moto/citroen-grand-c4-picasso-2013-presentation-officielle-8062060.html',\n 'info_dict': {\n 'id': '10635995',\n 'ext': 'mp4',\n 'title': 'Citro\u00ebn Grand C4 Picasso 2013 : pr\u00e9sentation officielle',\n 'description': 'Vid\u00e9o officielle du nouveau Citro\u00ebn Grand C4 Picasso, lanc\u00e9 \u00e0 l\\'automne 2013.',\n },\n 'params': {\n # Sometimes wat serves the whole file with the --test option\n 'skip_download': True,\n },\n }\n\n def _real_extract(self, url):\n mobj = re.match(self._VALID_URL, url)\n video_id = mobj.group('id')\n webpage = self._download_webpage(url, video_id)\n embed_url = self._html_search_regex(\n r'\"(https://www.wat.tv/embedframe/.*?)\"', webpage, 'embed url')\n embed_page = self._download_webpage(embed_url, video_id,\n 'Downloading embed player page')\n wat_id = self._search_regex(r'UVID=(.*?)&', embed_page, 'wat id')\n wat_info = self._download_json(\n 'http://www.wat.tv/interface/contentv3/%s' % wat_id, video_id)\n return self.url_result(wat_info['media']['url'], 'Wat')\n", "path": "youtube_dl/extractor/tf1.py"}]} | 1,489 | 600 |
gh_patches_debug_23014 | rasdani/github-patches | git_diff | chainer__chainer-529 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
The behavior of Function#parameters= is inconsistent with FunctionSet#parameters=
At aaf2aae14ad683734964590e6ceee9d775d9d7c5, an assertion was introduced into `Function#parameters=`, which requires the argument `values` to be a list-like object (implementing `__len__` method).
However, this assertion seems to be inconsistent with the behavior of `FunctionSet#parameters=`.
`FunctionSet#parameters=` passes the iterator of its argument `params` to its child functions through `Function#parameters=`, and it causes a TypeError exception.
``` python
from chainer import FunctionSet
import chainer.functions as F
func_set = FunctionSet(f=F.Linear(10,10))
params = func_set.parameters
func_set.parameters = params # TypeError: object of type 'tuple_iterator' has no len()
```
</issue>
<code>
[start of chainer/function_set.py]
1 import numpy
2 import six
3 import warnings
4
5 from chainer import cuda
6 from chainer import function
7
8
9 class FunctionSet(object):
10
11 """Set of objects with ``parameters`` and ``gradients`` properties.
12
13 :class:`FunctionSet` is useful to collect parameters and gradients of
14 multiple parameterized :class:`Function` objects. :class:`FunctionSet`
15 itself also implements :attr:`~FunctionSet.parameters` and
16 :attr:`~FunctionSet.gradients`, so it can be nested in another
17 :class:`FunctionSet` object.
18
19 Function registration is done by just adding an attribute to
20 :class:`FunctionSet` object.
21
22 """
23
24 def __init__(self, **functions):
25 """Initializes the function set by given functions.
26
27 Args:
28 **functions: ``dict`` of ``str`` key and :class:`Function` values.
29 The key-value pairs are just set to the :class:`FunctionSet`
30 object as attributes.
31
32 """
33 for name, func in six.iteritems(functions):
34 setattr(self, name, func)
35
36 def collect_parameters(self):
37 """Returns a tuple of parameters and gradients.
38
39 Returns:
40 Tuple (pair) of two tuples. The first element is a tuple of
41 parameter arrays, and the second is a tuple of gradient arrays.
42
43 """
44
45 msg = ("'collect_parameters' is deprecated. "
46 "You can pass FunctionSet itself to 'optimizer.setup'")
47 warnings.warn(msg, FutureWarning)
48 return self
49
50 def __getitem__(self, key):
51 """Returns the :class:`Function` objects by name.
52
53 Args:
54 key (str): Name of the function.
55
56 Returns:
57 ~chainer.Function: Function object.
58
59 .. admonition:: Example
60
61 >>> model = FunctionSet(l1=F.Linear(10, 10), l2=F.Linear(10, 10))
62 >>> l1 = model['l1']
63 """
64
65 return getattr(self, key)
66
67 def to_gpu(self, device=None):
68 """Migrates all parameters and gradients onto GPU.
69
70 This method calls ``to_gpu`` method of each registered object.
71
72 Args:
73 device (int or :class:`cupy.cuda.Device` or ``None``): Device
74 ID of GPU. If ``None`` is given, it uses the current device.
75
76 Returns:
77 self
78
79 """
80 for func in six.itervalues(self.__dict__):
81 if isinstance(func, (function.Function, FunctionSet)):
82 func.to_gpu(device=device)
83 return self
84
85 def to_cpu(self):
86 """Migrates all parameters and gradients onto CPU.
87
88 This method calls ``to_cpu`` method of each registered object.
89
90 Returns:
91 self
92
93 """
94 for func in six.itervalues(self.__dict__):
95 if isinstance(func, (function.Function, FunctionSet)):
96 func.to_cpu()
97 return self
98
99 def copy_parameters_from(self, params):
100 """Copies parameters from another source without reallocation.
101
102 Args:
103 params (Iterable): Iterable of parameter arrays.
104
105 """
106 for dst, src in zip(self.parameters, params):
107 if isinstance(dst, numpy.ndarray):
108 if isinstance(src, numpy.ndarray):
109 numpy.copyto(dst, src)
110 else:
111 dst[:] = src.get()
112 elif isinstance(src, numpy.ndarray):
113 dst.set(src)
114 else:
115 cuda.copy(src, out=dst)
116
117 @property
118 def parameters(self):
119 """Tuple of parameter arrays of all registered functions.
120
121 The order of parameters is consistent with :meth:`gradients` property.
122
123 """
124 return sum((func.parameters for _, func in self._get_sorted_funcs()),
125 ())
126
127 @parameters.setter
128 def parameters(self, params):
129 param_iter = iter(params)
130 for _, func in self._get_sorted_funcs():
131 func.parameters = param_iter
132
133 @property
134 def gradients(self):
135 """Tuple of gradient arrays of all registered functions.
136
137 The order of gradients is consistent with :meth:`parameters` property.
138
139 """
140 return sum((func.gradients for _, func in self._get_sorted_funcs()),
141 ())
142
143 @gradients.setter
144 def gradients(self, grads):
145 grad_iter = iter(grads)
146 for _, func in self._get_sorted_funcs():
147 func.gradients = grad_iter
148
149 def _get_sorted_funcs(self):
150 return sorted(
151 [func_tuple for func_tuple in six.iteritems(self.__dict__)
152 if isinstance(func_tuple[1], (function.Function, FunctionSet))])
153
[end of chainer/function_set.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/function_set.py b/chainer/function_set.py
--- a/chainer/function_set.py
+++ b/chainer/function_set.py
@@ -126,9 +126,16 @@
@parameters.setter
def parameters(self, params):
- param_iter = iter(params)
- for _, func in self._get_sorted_funcs():
- func.parameters = param_iter
+ funcs = self._get_sorted_funcs()
+
+ expected_params_size = sum(len(func.parameters) for _, func in funcs)
+ assert expected_params_size == len(params)
+
+ idx = 0
+ for _, func in funcs:
+ param_size = len(func.parameters)
+ func.parameters = params[idx: idx + param_size]
+ idx += param_size
@property
def gradients(self):
@@ -142,9 +149,16 @@
@gradients.setter
def gradients(self, grads):
- grad_iter = iter(grads)
- for _, func in self._get_sorted_funcs():
- func.gradients = grad_iter
+ funcs = self._get_sorted_funcs()
+
+ expected_grads_size = sum(len(func.gradients) for _, func in funcs)
+ assert expected_grads_size == len(grads)
+
+ idx = 0
+ for _, func in funcs:
+ grad_size = len(func.gradients)
+ func.gradients = grads[idx: idx + grad_size]
+ idx += grad_size
def _get_sorted_funcs(self):
return sorted(
| {"golden_diff": "diff --git a/chainer/function_set.py b/chainer/function_set.py\n--- a/chainer/function_set.py\n+++ b/chainer/function_set.py\n@@ -126,9 +126,16 @@\n \n @parameters.setter\n def parameters(self, params):\n- param_iter = iter(params)\n- for _, func in self._get_sorted_funcs():\n- func.parameters = param_iter\n+ funcs = self._get_sorted_funcs()\n+\n+ expected_params_size = sum(len(func.parameters) for _, func in funcs)\n+ assert expected_params_size == len(params)\n+\n+ idx = 0\n+ for _, func in funcs:\n+ param_size = len(func.parameters)\n+ func.parameters = params[idx: idx + param_size]\n+ idx += param_size\n \n @property\n def gradients(self):\n@@ -142,9 +149,16 @@\n \n @gradients.setter\n def gradients(self, grads):\n- grad_iter = iter(grads)\n- for _, func in self._get_sorted_funcs():\n- func.gradients = grad_iter\n+ funcs = self._get_sorted_funcs()\n+\n+ expected_grads_size = sum(len(func.gradients) for _, func in funcs)\n+ assert expected_grads_size == len(grads)\n+\n+ idx = 0\n+ for _, func in funcs:\n+ grad_size = len(func.gradients)\n+ func.gradients = grads[idx: idx + grad_size]\n+ idx += grad_size\n \n def _get_sorted_funcs(self):\n return sorted(\n", "issue": "The behavior of Function#parameters= is inconsistent with FunctionSet#parameters=\nAt aaf2aae14ad683734964590e6ceee9d775d9d7c5, an assertion was introduced into `Function#parameters=`, which requires the argument `values` to be a list-like object (implementing `__len__` method).\nHowever, this assertion seems to be inconsistent with the behavior of `FunctionSet#parameters=`.\n`FunctionSet#parameters=` passes the iterator of its argument `params` to its child functions through `Function#parameters=`, and it causes a TypeError exception.\n\n``` python\nfrom chainer import FunctionSet\nimport chainer.functions as F\nfunc_set = FunctionSet(f=F.Linear(10,10))\nparams = func_set.parameters\nfunc_set.parameters = params # TypeError: object of type 'tuple_iterator' has no len()\n```\n\n", "before_files": [{"content": "import numpy\nimport six\nimport warnings\n\nfrom chainer import cuda\nfrom chainer import function\n\n\nclass FunctionSet(object):\n\n \"\"\"Set of objects with ``parameters`` and ``gradients`` properties.\n\n :class:`FunctionSet` is useful to collect parameters and gradients of\n multiple parameterized :class:`Function` objects. :class:`FunctionSet`\n itself also implements :attr:`~FunctionSet.parameters` and\n :attr:`~FunctionSet.gradients`, so it can be nested in another\n :class:`FunctionSet` object.\n\n Function registration is done by just adding an attribute to\n :class:`FunctionSet` object.\n\n \"\"\"\n\n def __init__(self, **functions):\n \"\"\"Initializes the function set by given functions.\n\n Args:\n **functions: ``dict`` of ``str`` key and :class:`Function` values.\n The key-value pairs are just set to the :class:`FunctionSet`\n object as attributes.\n\n \"\"\"\n for name, func in six.iteritems(functions):\n setattr(self, name, func)\n\n def collect_parameters(self):\n \"\"\"Returns a tuple of parameters and gradients.\n\n Returns:\n Tuple (pair) of two tuples. The first element is a tuple of\n parameter arrays, and the second is a tuple of gradient arrays.\n\n \"\"\"\n\n msg = (\"'collect_parameters' is deprecated. \"\n \"You can pass FunctionSet itself to 'optimizer.setup'\")\n warnings.warn(msg, FutureWarning)\n return self\n\n def __getitem__(self, key):\n \"\"\"Returns the :class:`Function` objects by name.\n\n Args:\n key (str): Name of the function.\n\n Returns:\n ~chainer.Function: Function object.\n\n .. admonition:: Example\n\n >>> model = FunctionSet(l1=F.Linear(10, 10), l2=F.Linear(10, 10))\n >>> l1 = model['l1']\n \"\"\"\n\n return getattr(self, key)\n\n def to_gpu(self, device=None):\n \"\"\"Migrates all parameters and gradients onto GPU.\n\n This method calls ``to_gpu`` method of each registered object.\n\n Args:\n device (int or :class:`cupy.cuda.Device` or ``None``): Device\n ID of GPU. If ``None`` is given, it uses the current device.\n\n Returns:\n self\n\n \"\"\"\n for func in six.itervalues(self.__dict__):\n if isinstance(func, (function.Function, FunctionSet)):\n func.to_gpu(device=device)\n return self\n\n def to_cpu(self):\n \"\"\"Migrates all parameters and gradients onto CPU.\n\n This method calls ``to_cpu`` method of each registered object.\n\n Returns:\n self\n\n \"\"\"\n for func in six.itervalues(self.__dict__):\n if isinstance(func, (function.Function, FunctionSet)):\n func.to_cpu()\n return self\n\n def copy_parameters_from(self, params):\n \"\"\"Copies parameters from another source without reallocation.\n\n Args:\n params (Iterable): Iterable of parameter arrays.\n\n \"\"\"\n for dst, src in zip(self.parameters, params):\n if isinstance(dst, numpy.ndarray):\n if isinstance(src, numpy.ndarray):\n numpy.copyto(dst, src)\n else:\n dst[:] = src.get()\n elif isinstance(src, numpy.ndarray):\n dst.set(src)\n else:\n cuda.copy(src, out=dst)\n\n @property\n def parameters(self):\n \"\"\"Tuple of parameter arrays of all registered functions.\n\n The order of parameters is consistent with :meth:`gradients` property.\n\n \"\"\"\n return sum((func.parameters for _, func in self._get_sorted_funcs()),\n ())\n\n @parameters.setter\n def parameters(self, params):\n param_iter = iter(params)\n for _, func in self._get_sorted_funcs():\n func.parameters = param_iter\n\n @property\n def gradients(self):\n \"\"\"Tuple of gradient arrays of all registered functions.\n\n The order of gradients is consistent with :meth:`parameters` property.\n\n \"\"\"\n return sum((func.gradients for _, func in self._get_sorted_funcs()),\n ())\n\n @gradients.setter\n def gradients(self, grads):\n grad_iter = iter(grads)\n for _, func in self._get_sorted_funcs():\n func.gradients = grad_iter\n\n def _get_sorted_funcs(self):\n return sorted(\n [func_tuple for func_tuple in six.iteritems(self.__dict__)\n if isinstance(func_tuple[1], (function.Function, FunctionSet))])\n", "path": "chainer/function_set.py"}]} | 2,071 | 340 |
gh_patches_debug_23484 | rasdani/github-patches | git_diff | nilearn__nilearn-3882 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Choose better affine constant for plotting test data
At the time I was "just" refactoring code and started adding fixtures when doing so. So I did not have a close look at the exact content.
Digging into this now I realize we may have some inconsistency.
```python
from nilearn.plotting.img_plotting import MNI152TEMPLATE
mni_affine = MNI152TEMPLATE.get_affine()
print(mni_affine)
```
gives
```
[[ 2. 0. 0. -98.]
[ 0. 2. 0. -134.]
[ 0. 0. 2. -72.]
[ 0. 0. 0. 1.]]
```
which does not quite match that in conf.py
```python
MNI_AFFINE = np.array(
[
[-2.0, 0.0, 0.0, 90.0],
[0.0, 2.0, 0.0, -126.0],
[0.0, 0.0, 2.0, -72.0],
[0.0, 0.0, 0.0, 1.0],
]
)
```
_Originally posted by @Remi-Gau in https://github.com/nilearn/nilearn/issues/3172#issuecomment-1662060133_
</issue>
<code>
[start of nilearn/conftest.py]
1 """Configuration and extra fixtures for pytest."""
2 import nibabel
3 import numpy as np
4 import pytest
5 from nibabel import Nifti1Image
6
7 from nilearn import image
8
9 # we need to import these fixtures even if not used in this module
10 from nilearn.datasets._testing import request_mocker # noqa: F401
11 from nilearn.datasets._testing import temp_nilearn_data_dir # noqa: F401
12
13 collect_ignore = ["datasets/data/convert_templates.py"]
14
15
16 try:
17 import matplotlib # noqa: F401
18 except ImportError:
19 collect_ignore.extend(["plotting", "reporting"])
20 matplotlib = None
21
22
23 def pytest_configure(config):
24 """Use Agg so that no figures pop up."""
25 if matplotlib is not None:
26 matplotlib.use("Agg", force=True)
27
28
29 @pytest.fixture(autouse=True)
30 def no_int64_nifti(monkeypatch):
31 """Prevent creating or writing a Nift1Image containing 64-bit ints.
32
33 It is easy to create such images by mistake because Numpy uses int64 by
34 default, but tools like FSL fail to read them and Nibabel will refuse to
35 write them in the future.
36
37 For tests that do need to manipulate int64 images, it is always possible to
38 disable this fixture by parametrizing a test to override it:
39
40 @pytest.mark.parametrize("no_int64_nifti", [None])
41 def test_behavior_when_user_provides_int64_img():
42 # ...
43
44 But by default it is used automatically so that Nilearn doesn't create such
45 images by mistake.
46
47 """
48 forbidden_types = (np.int64, np.uint64)
49 error_msg = (
50 "Creating or saving an image containing 64-bit ints is forbidden."
51 )
52
53 to_filename = nibabel.nifti1.Nifti1Image.to_filename
54
55 def checked_to_filename(img, filename):
56 assert image.get_data(img).dtype not in forbidden_types, error_msg
57 return to_filename(img, filename)
58
59 monkeypatch.setattr(
60 "nibabel.nifti1.Nifti1Image.to_filename", checked_to_filename
61 )
62
63 init = nibabel.nifti1.Nifti1Image.__init__
64
65 def checked_init(self, dataobj, *args, **kwargs):
66 assert dataobj.dtype not in forbidden_types, error_msg
67 return init(self, dataobj, *args, **kwargs)
68
69 monkeypatch.setattr("nibabel.nifti1.Nifti1Image.__init__", checked_init)
70
71
72 @pytest.fixture(autouse=True)
73 def close_all():
74 """Close all matplotlib figures."""
75 yield
76 if matplotlib is not None:
77 import matplotlib.pyplot as plt
78
79 plt.close("all") # takes < 1 us so just always do it
80
81
82 MNI_AFFINE = np.array(
83 [
84 [-2.0, 0.0, 0.0, 90.0],
85 [0.0, 2.0, 0.0, -126.0],
86 [0.0, 0.0, 2.0, -72.0],
87 [0.0, 0.0, 0.0, 1.0],
88 ]
89 )
90
91
92 @pytest.fixture()
93 def mni_affine():
94 """Return an affine corresponding to 2mm isotropic MNI template."""
95 return MNI_AFFINE
96
97
98 @pytest.fixture()
99 def testdata_3d_for_plotting():
100 """A random 3D image for testing figures."""
101 data_positive = np.zeros((7, 7, 3))
102 rng = np.random.RandomState(42)
103 data_rng = rng.uniform(size=(7, 7, 3))
104 data_positive[1:-1, 2:-1, 1:] = data_rng[1:-1, 2:-1, 1:]
105 img_3d = Nifti1Image(data_positive, MNI_AFFINE)
106 # TODO: return img_3D directly and not a dict
107 return {"img": img_3d}
108
109
110 @pytest.fixture()
111 def testdata_4d_for_plotting():
112 """Random 4D images for testing figures for multivolume data."""
113 rng = np.random.RandomState(42)
114 img_4d = Nifti1Image(rng.uniform(size=(7, 7, 3, 10)), MNI_AFFINE)
115 img_4d_long = Nifti1Image(rng.uniform(size=(7, 7, 3, 1777)), MNI_AFFINE)
116 img_mask = Nifti1Image(np.ones((7, 7, 3), dtype="uint8"), MNI_AFFINE)
117 atlas = np.ones((7, 7, 3), dtype="int32")
118 atlas[2:5, :, :] = 2
119 atlas[5:8, :, :] = 3
120 img_atlas = Nifti1Image(atlas, MNI_AFFINE)
121 atlas_labels = {
122 "gm": 1,
123 "wm": 2,
124 "csf": 3,
125 }
126 # TODO: split into several fixtures
127 return {
128 "img_4d": img_4d,
129 "img_4d_long": img_4d_long,
130 "img_mask": img_mask,
131 "img_atlas": img_atlas,
132 "atlas_labels": atlas_labels,
133 }
134
[end of nilearn/conftest.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/conftest.py b/nilearn/conftest.py
--- a/nilearn/conftest.py
+++ b/nilearn/conftest.py
@@ -81,14 +81,22 @@
MNI_AFFINE = np.array(
[
- [-2.0, 0.0, 0.0, 90.0],
- [0.0, 2.0, 0.0, -126.0],
+ [2.0, 0.0, 0.0, -98.0],
+ [0.0, 2.0, 0.0, -134.0],
[0.0, 0.0, 2.0, -72.0],
[0.0, 0.0, 0.0, 1.0],
]
)
+def _mni_3d_img(affine=MNI_AFFINE):
+ data_positive = np.zeros((7, 7, 3))
+ rng = np.random.RandomState(42)
+ data_rng = rng.rand(7, 7, 3)
+ data_positive[1:-1, 2:-1, 1:] = data_rng[1:-1, 2:-1, 1:]
+ return Nifti1Image(data_positive, affine)
+
+
@pytest.fixture()
def mni_affine():
"""Return an affine corresponding to 2mm isotropic MNI template."""
@@ -96,15 +104,9 @@
@pytest.fixture()
-def testdata_3d_for_plotting():
- """A random 3D image for testing figures."""
- data_positive = np.zeros((7, 7, 3))
- rng = np.random.RandomState(42)
- data_rng = rng.uniform(size=(7, 7, 3))
- data_positive[1:-1, 2:-1, 1:] = data_rng[1:-1, 2:-1, 1:]
- img_3d = Nifti1Image(data_positive, MNI_AFFINE)
- # TODO: return img_3D directly and not a dict
- return {"img": img_3d}
+def mni_3d_img():
+ """Fixture for a random 3D image in MNI space."""
+ return _mni_3d_img()
@pytest.fixture()
| {"golden_diff": "diff --git a/nilearn/conftest.py b/nilearn/conftest.py\n--- a/nilearn/conftest.py\n+++ b/nilearn/conftest.py\n@@ -81,14 +81,22 @@\n \n MNI_AFFINE = np.array(\n [\n- [-2.0, 0.0, 0.0, 90.0],\n- [0.0, 2.0, 0.0, -126.0],\n+ [2.0, 0.0, 0.0, -98.0],\n+ [0.0, 2.0, 0.0, -134.0],\n [0.0, 0.0, 2.0, -72.0],\n [0.0, 0.0, 0.0, 1.0],\n ]\n )\n \n \n+def _mni_3d_img(affine=MNI_AFFINE):\n+ data_positive = np.zeros((7, 7, 3))\n+ rng = np.random.RandomState(42)\n+ data_rng = rng.rand(7, 7, 3)\n+ data_positive[1:-1, 2:-1, 1:] = data_rng[1:-1, 2:-1, 1:]\n+ return Nifti1Image(data_positive, affine)\n+\n+\n @pytest.fixture()\n def mni_affine():\n \"\"\"Return an affine corresponding to 2mm isotropic MNI template.\"\"\"\n@@ -96,15 +104,9 @@\n \n \n @pytest.fixture()\n-def testdata_3d_for_plotting():\n- \"\"\"A random 3D image for testing figures.\"\"\"\n- data_positive = np.zeros((7, 7, 3))\n- rng = np.random.RandomState(42)\n- data_rng = rng.uniform(size=(7, 7, 3))\n- data_positive[1:-1, 2:-1, 1:] = data_rng[1:-1, 2:-1, 1:]\n- img_3d = Nifti1Image(data_positive, MNI_AFFINE)\n- # TODO: return img_3D directly and not a dict\n- return {\"img\": img_3d}\n+def mni_3d_img():\n+ \"\"\"Fixture for a random 3D image in MNI space.\"\"\"\n+ return _mni_3d_img()\n \n \n @pytest.fixture()\n", "issue": "Choose better affine constant for plotting test data\nAt the time I was \"just\" refactoring code and started adding fixtures when doing so. So I did not have a close look at the exact content.\r\n\r\nDigging into this now I realize we may have some inconsistency.\r\n\r\n```python\r\nfrom nilearn.plotting.img_plotting import MNI152TEMPLATE\r\nmni_affine = MNI152TEMPLATE.get_affine()\r\nprint(mni_affine)\r\n```\r\n\r\ngives\r\n```\r\n[[ 2. 0. 0. -98.]\r\n [ 0. 2. 0. -134.]\r\n [ 0. 0. 2. -72.]\r\n [ 0. 0. 0. 1.]]\r\n```\r\n\r\nwhich does not quite match that in conf.py\r\n\r\n```python\r\nMNI_AFFINE = np.array(\r\n [\r\n [-2.0, 0.0, 0.0, 90.0],\r\n [0.0, 2.0, 0.0, -126.0],\r\n [0.0, 0.0, 2.0, -72.0],\r\n [0.0, 0.0, 0.0, 1.0],\r\n ]\r\n)\r\n```\r\n\r\n_Originally posted by @Remi-Gau in https://github.com/nilearn/nilearn/issues/3172#issuecomment-1662060133_\r\n \n", "before_files": [{"content": "\"\"\"Configuration and extra fixtures for pytest.\"\"\"\nimport nibabel\nimport numpy as np\nimport pytest\nfrom nibabel import Nifti1Image\n\nfrom nilearn import image\n\n# we need to import these fixtures even if not used in this module\nfrom nilearn.datasets._testing import request_mocker # noqa: F401\nfrom nilearn.datasets._testing import temp_nilearn_data_dir # noqa: F401\n\ncollect_ignore = [\"datasets/data/convert_templates.py\"]\n\n\ntry:\n import matplotlib # noqa: F401\nexcept ImportError:\n collect_ignore.extend([\"plotting\", \"reporting\"])\n matplotlib = None\n\n\ndef pytest_configure(config):\n \"\"\"Use Agg so that no figures pop up.\"\"\"\n if matplotlib is not None:\n matplotlib.use(\"Agg\", force=True)\n\n\[email protected](autouse=True)\ndef no_int64_nifti(monkeypatch):\n \"\"\"Prevent creating or writing a Nift1Image containing 64-bit ints.\n\n It is easy to create such images by mistake because Numpy uses int64 by\n default, but tools like FSL fail to read them and Nibabel will refuse to\n write them in the future.\n\n For tests that do need to manipulate int64 images, it is always possible to\n disable this fixture by parametrizing a test to override it:\n\n @pytest.mark.parametrize(\"no_int64_nifti\", [None])\n def test_behavior_when_user_provides_int64_img():\n # ...\n\n But by default it is used automatically so that Nilearn doesn't create such\n images by mistake.\n\n \"\"\"\n forbidden_types = (np.int64, np.uint64)\n error_msg = (\n \"Creating or saving an image containing 64-bit ints is forbidden.\"\n )\n\n to_filename = nibabel.nifti1.Nifti1Image.to_filename\n\n def checked_to_filename(img, filename):\n assert image.get_data(img).dtype not in forbidden_types, error_msg\n return to_filename(img, filename)\n\n monkeypatch.setattr(\n \"nibabel.nifti1.Nifti1Image.to_filename\", checked_to_filename\n )\n\n init = nibabel.nifti1.Nifti1Image.__init__\n\n def checked_init(self, dataobj, *args, **kwargs):\n assert dataobj.dtype not in forbidden_types, error_msg\n return init(self, dataobj, *args, **kwargs)\n\n monkeypatch.setattr(\"nibabel.nifti1.Nifti1Image.__init__\", checked_init)\n\n\[email protected](autouse=True)\ndef close_all():\n \"\"\"Close all matplotlib figures.\"\"\"\n yield\n if matplotlib is not None:\n import matplotlib.pyplot as plt\n\n plt.close(\"all\") # takes < 1 us so just always do it\n\n\nMNI_AFFINE = np.array(\n [\n [-2.0, 0.0, 0.0, 90.0],\n [0.0, 2.0, 0.0, -126.0],\n [0.0, 0.0, 2.0, -72.0],\n [0.0, 0.0, 0.0, 1.0],\n ]\n)\n\n\[email protected]()\ndef mni_affine():\n \"\"\"Return an affine corresponding to 2mm isotropic MNI template.\"\"\"\n return MNI_AFFINE\n\n\[email protected]()\ndef testdata_3d_for_plotting():\n \"\"\"A random 3D image for testing figures.\"\"\"\n data_positive = np.zeros((7, 7, 3))\n rng = np.random.RandomState(42)\n data_rng = rng.uniform(size=(7, 7, 3))\n data_positive[1:-1, 2:-1, 1:] = data_rng[1:-1, 2:-1, 1:]\n img_3d = Nifti1Image(data_positive, MNI_AFFINE)\n # TODO: return img_3D directly and not a dict\n return {\"img\": img_3d}\n\n\[email protected]()\ndef testdata_4d_for_plotting():\n \"\"\"Random 4D images for testing figures for multivolume data.\"\"\"\n rng = np.random.RandomState(42)\n img_4d = Nifti1Image(rng.uniform(size=(7, 7, 3, 10)), MNI_AFFINE)\n img_4d_long = Nifti1Image(rng.uniform(size=(7, 7, 3, 1777)), MNI_AFFINE)\n img_mask = Nifti1Image(np.ones((7, 7, 3), dtype=\"uint8\"), MNI_AFFINE)\n atlas = np.ones((7, 7, 3), dtype=\"int32\")\n atlas[2:5, :, :] = 2\n atlas[5:8, :, :] = 3\n img_atlas = Nifti1Image(atlas, MNI_AFFINE)\n atlas_labels = {\n \"gm\": 1,\n \"wm\": 2,\n \"csf\": 3,\n }\n # TODO: split into several fixtures\n return {\n \"img_4d\": img_4d,\n \"img_4d_long\": img_4d_long,\n \"img_mask\": img_mask,\n \"img_atlas\": img_atlas,\n \"atlas_labels\": atlas_labels,\n }\n", "path": "nilearn/conftest.py"}]} | 2,391 | 552 |
gh_patches_debug_29975 | rasdani/github-patches | git_diff | facebookresearch__Mephisto-660 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[Clarifications] Testing in a local environment
Dear All,
I've started working with ParlAI and Mephisto some days ago in order to define an interface for data collection. In particular, I've extend the parlai-chat-demo to meet my task-specific requirements.
I was wondering how to test the interface with users in a local network or by remotely connecting to my server. Thus, I've looked up for existing threads about the same topic: [#409](https://github.com/facebookresearch/Mephisto/issues/409) and [#303 ](https://github.com/facebookresearch/Mephisto/issues/303) as the main examples.
Since I'm no expert in this kind of stuff, I'm not completely sure what are the current networking setups that I can consider at the moment. Therefore, I kindly ask you for a gentle summary/tutorial concerning the particular objective of testing locally/remotely with own server.
To summarize, I would like to know if there's an answer to these main questions:
Q: Is it possible to easily test the interface with other people in a local environment (same network)?
Q: How to do so?
Down below I report a list of additional questions with related comments:
1. My server has a static IP, can I test it locally on the same network? Connecting from the same network to the server brings up a 'disconnected' status in the interface.
2. Can I use the mentioned nginx reverse proxy to access to my interface? What are the steps? I've tried setting it up and then access to the server. I'm able to access to the interface but the connection status is still 'disconnected'.
3. Do I need a specific mephisto configuration for local testing? Up until now I've worked with `"mephisto/architect"="local"` and `"mephisto/provider"="mock"`.
Thanks in advance and apologies if this issue sounds just as a duplicate of some past issues.
Unfortunately, I'm not sure I've done everything right until now.
</issue>
<code>
[start of examples/simple_static_task/static_run_with_onboarding.py]
1 #!/usr/bin/env python3
2
3 # Copyright (c) Facebook, Inc. and its affiliates.
4 # This source code is licensed under the MIT license found in the
5 # LICENSE file in the root directory of this source tree.
6
7 import os
8 from mephisto.operations.operator import Operator
9 from mephisto.operations.utils import get_root_dir
10 from mephisto.tools.scripts import load_db_and_process_config
11 from mephisto.abstractions.blueprints.static_html_task.static_html_blueprint import (
12 BLUEPRINT_TYPE,
13 )
14 from mephisto.abstractions.blueprints.abstract.static_task.static_blueprint import (
15 SharedStaticTaskState,
16 )
17
18 import hydra
19 from omegaconf import DictConfig
20 from dataclasses import dataclass, field
21 from typing import List, Any
22
23 TASK_DIRECTORY = os.path.dirname(os.path.abspath(__file__))
24 CORRECT_ANSWER = "apple"
25
26 defaults = [
27 {"mephisto/blueprint": BLUEPRINT_TYPE},
28 {"mephisto/architect": "local"},
29 {"mephisto/provider": "mock"},
30 {"conf": "onboarding_example"},
31 ]
32
33 from mephisto.operations.hydra_config import RunScriptConfig, register_script_config
34
35
36 @dataclass
37 class TestScriptConfig(RunScriptConfig):
38 defaults: List[Any] = field(default_factory=lambda: defaults)
39 task_dir: str = TASK_DIRECTORY
40 correct_answer: str = CORRECT_ANSWER
41
42
43 register_script_config(name="scriptconfig", module=TestScriptConfig)
44
45
46 @hydra.main(config_path="hydra_configs", config_name="scriptconfig")
47 def main(cfg: DictConfig) -> None:
48 correct_config_answer = cfg.correct_answer
49
50 def onboarding_is_valid(onboarding_data):
51 inputs = onboarding_data["inputs"]
52 outputs = onboarding_data["outputs"]
53 return outputs.get("answer") == correct_config_answer
54
55 shared_state = SharedStaticTaskState(
56 onboarding_data={"correct_answer": correct_config_answer},
57 validate_onboarding=onboarding_is_valid,
58 )
59
60 db, cfg = load_db_and_process_config(cfg)
61 operator = Operator(db)
62
63 operator.validate_and_run_config(cfg.mephisto, shared_state)
64 operator.wait_for_runs_then_shutdown(skip_input=True, log_rate=30)
65
66
67 if __name__ == "__main__":
68 main()
69
[end of examples/simple_static_task/static_run_with_onboarding.py]
[start of mephisto/abstractions/blueprints/abstract/static_task/static_agent_state.py]
1 #!/usr/bin/env python3
2
3 # Copyright (c) Facebook, Inc. and its affiliates.
4 # This source code is licensed under the MIT license found in the
5 # LICENSE file in the root directory of this source tree.
6
7 from typing import List, Dict, Optional, Any, TYPE_CHECKING
8 from mephisto.abstractions.blueprint import AgentState
9 import os
10 import json
11 import time
12 import weakref
13
14 if TYPE_CHECKING:
15 from mephisto.data_model.agent import Agent
16 from mephisto.data_model.packet import Packet
17
18 from mephisto.operations.logger_core import get_logger
19
20 logger = get_logger(name=__name__)
21
22 DATA_FILE = "agent_data.json"
23
24
25 class StaticAgentState(AgentState):
26 """
27 Agent state for static tasks.
28 """
29
30 def _get_empty_state(self) -> Dict[str, Optional[Dict[str, Any]]]:
31 return {
32 "inputs": None,
33 "outputs": None,
34 "times": {"task_start": 0, "task_end": 0},
35 }
36
37 def __init__(self, agent: "Agent"):
38 """
39 Static agent states should store
40 input dict -> output dict pairs to disc
41 """
42 self.agent = weakref.proxy(agent)
43 self.state: Dict[str, Optional[Dict[str, Any]]] = self._get_empty_state()
44 self.load_data()
45
46 def set_init_state(self, data: Any) -> bool:
47 """Set the initial state for this agent"""
48 if self.get_init_state() is not None:
49 # Initial state is already set
50 return False
51 else:
52 self.state["inputs"] = data
53 times_dict = self.state["times"]
54 assert isinstance(times_dict, dict)
55 times_dict["task_start"] = time.time()
56 self.save_data()
57 return True
58
59 def get_init_state(self) -> Optional[Dict[str, Any]]:
60 """
61 Return the initial state for this agent,
62 None if no such state exists
63 """
64 if self.state["inputs"] is None:
65 return None
66 return self.state["inputs"].copy()
67
68 def load_data(self) -> None:
69 """Load data for this agent from disk"""
70 data_dir = self.agent.get_data_dir()
71 data_path = os.path.join(data_dir, DATA_FILE)
72 if os.path.exists(data_path):
73 with open(data_path, "r") as data_file:
74 self.state = json.load(data_file)
75 else:
76 self.state = self._get_empty_state()
77
78 def get_data(self) -> Dict[str, Any]:
79 """Return dict of this agent's state"""
80 return self.state.copy()
81
82 def save_data(self) -> None:
83 """Save static agent data to disk"""
84 data_dir = self.agent.get_data_dir()
85 os.makedirs(data_dir, exist_ok=True)
86 out_filename = os.path.join(data_dir, DATA_FILE)
87 with open(out_filename, "w+") as data_file:
88 json.dump(self.state, data_file)
89 logger.info(f"SAVED_DATA_TO_DISC at {out_filename}")
90
91 def update_data(self, live_data: Dict[str, Any]) -> None:
92 """
93 Process the incoming data packet, and handle
94 updating the state
95 """
96 raise Exception(
97 "Static tasks should only have final act, but updated live data"
98 )
99
100 def update_submit(self, submission_data: Dict[str, Any]) -> None:
101 """Move the submitted output to the local dict"""
102 outputs: Dict[str, Any]
103
104 if submission_data.get("onboarding_data") is not None:
105 outputs = submission_data["onboarding_data"]
106 else:
107 outputs = submission_data["task_data"]
108 times_dict = self.state["times"]
109 assert isinstance(times_dict, dict)
110 times_dict["task_end"] = time.time()
111 if submission_data.get("files") != None:
112 logger.info(f"Got files: {str(submission_data['files'])[:500]}")
113 outputs["files"] = [f["filename"] for f in submission_data["files"]]
114 self.state["outputs"] = outputs
115 self.save_data()
116
117 def get_task_start(self) -> Optional[float]:
118 """
119 Extract out and return the start time recorded for this task.
120 """
121 stored_times = self.state["times"]
122 assert stored_times is not None
123 return stored_times["task_start"]
124
125 def get_task_end(self) -> Optional[float]:
126 """
127 Extract out and return the end time recorded for this task.
128 """
129 stored_times = self.state["times"]
130 assert stored_times is not None
131 return stored_times["task_end"]
132
[end of mephisto/abstractions/blueprints/abstract/static_task/static_agent_state.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/examples/simple_static_task/static_run_with_onboarding.py b/examples/simple_static_task/static_run_with_onboarding.py
--- a/examples/simple_static_task/static_run_with_onboarding.py
+++ b/examples/simple_static_task/static_run_with_onboarding.py
@@ -23,12 +23,7 @@
TASK_DIRECTORY = os.path.dirname(os.path.abspath(__file__))
CORRECT_ANSWER = "apple"
-defaults = [
- {"mephisto/blueprint": BLUEPRINT_TYPE},
- {"mephisto/architect": "local"},
- {"mephisto/provider": "mock"},
- {"conf": "onboarding_example"},
-]
+defaults = ["_self_", {"conf": "onboarding_example"}]
from mephisto.operations.hydra_config import RunScriptConfig, register_script_config
diff --git a/mephisto/abstractions/blueprints/abstract/static_task/static_agent_state.py b/mephisto/abstractions/blueprints/abstract/static_task/static_agent_state.py
--- a/mephisto/abstractions/blueprints/abstract/static_task/static_agent_state.py
+++ b/mephisto/abstractions/blueprints/abstract/static_task/static_agent_state.py
@@ -100,18 +100,13 @@
def update_submit(self, submission_data: Dict[str, Any]) -> None:
"""Move the submitted output to the local dict"""
outputs: Dict[str, Any]
-
- if submission_data.get("onboarding_data") is not None:
- outputs = submission_data["onboarding_data"]
- else:
- outputs = submission_data["task_data"]
+ output_files = submission_data.get("files")
+ if output_files is not None:
+ submission_data["files"] = [f["filename"] for f in submission_data["files"]]
+ self.state["outputs"] = submission_data
times_dict = self.state["times"]
assert isinstance(times_dict, dict)
times_dict["task_end"] = time.time()
- if submission_data.get("files") != None:
- logger.info(f"Got files: {str(submission_data['files'])[:500]}")
- outputs["files"] = [f["filename"] for f in submission_data["files"]]
- self.state["outputs"] = outputs
self.save_data()
def get_task_start(self) -> Optional[float]:
| {"golden_diff": "diff --git a/examples/simple_static_task/static_run_with_onboarding.py b/examples/simple_static_task/static_run_with_onboarding.py\n--- a/examples/simple_static_task/static_run_with_onboarding.py\n+++ b/examples/simple_static_task/static_run_with_onboarding.py\n@@ -23,12 +23,7 @@\n TASK_DIRECTORY = os.path.dirname(os.path.abspath(__file__))\n CORRECT_ANSWER = \"apple\"\n \n-defaults = [\n- {\"mephisto/blueprint\": BLUEPRINT_TYPE},\n- {\"mephisto/architect\": \"local\"},\n- {\"mephisto/provider\": \"mock\"},\n- {\"conf\": \"onboarding_example\"},\n-]\n+defaults = [\"_self_\", {\"conf\": \"onboarding_example\"}]\n \n from mephisto.operations.hydra_config import RunScriptConfig, register_script_config\n \ndiff --git a/mephisto/abstractions/blueprints/abstract/static_task/static_agent_state.py b/mephisto/abstractions/blueprints/abstract/static_task/static_agent_state.py\n--- a/mephisto/abstractions/blueprints/abstract/static_task/static_agent_state.py\n+++ b/mephisto/abstractions/blueprints/abstract/static_task/static_agent_state.py\n@@ -100,18 +100,13 @@\n def update_submit(self, submission_data: Dict[str, Any]) -> None:\n \"\"\"Move the submitted output to the local dict\"\"\"\n outputs: Dict[str, Any]\n-\n- if submission_data.get(\"onboarding_data\") is not None:\n- outputs = submission_data[\"onboarding_data\"]\n- else:\n- outputs = submission_data[\"task_data\"]\n+ output_files = submission_data.get(\"files\")\n+ if output_files is not None:\n+ submission_data[\"files\"] = [f[\"filename\"] for f in submission_data[\"files\"]]\n+ self.state[\"outputs\"] = submission_data\n times_dict = self.state[\"times\"]\n assert isinstance(times_dict, dict)\n times_dict[\"task_end\"] = time.time()\n- if submission_data.get(\"files\") != None:\n- logger.info(f\"Got files: {str(submission_data['files'])[:500]}\")\n- outputs[\"files\"] = [f[\"filename\"] for f in submission_data[\"files\"]]\n- self.state[\"outputs\"] = outputs\n self.save_data()\n \n def get_task_start(self) -> Optional[float]:\n", "issue": "[Clarifications] Testing in a local environment\nDear All,\r\nI've started working with ParlAI and Mephisto some days ago in order to define an interface for data collection. In particular, I've extend the parlai-chat-demo to meet my task-specific requirements.\r\n\r\nI was wondering how to test the interface with users in a local network or by remotely connecting to my server. Thus, I've looked up for existing threads about the same topic: [#409](https://github.com/facebookresearch/Mephisto/issues/409) and [#303 ](https://github.com/facebookresearch/Mephisto/issues/303) as the main examples.\r\n\r\nSince I'm no expert in this kind of stuff, I'm not completely sure what are the current networking setups that I can consider at the moment. Therefore, I kindly ask you for a gentle summary/tutorial concerning the particular objective of testing locally/remotely with own server.\r\n\r\nTo summarize, I would like to know if there's an answer to these main questions:\r\nQ: Is it possible to easily test the interface with other people in a local environment (same network)?\r\nQ: How to do so?\r\n\r\nDown below I report a list of additional questions with related comments:\r\n\r\n1. My server has a static IP, can I test it locally on the same network? Connecting from the same network to the server brings up a 'disconnected' status in the interface.\r\n\r\n2. Can I use the mentioned nginx reverse proxy to access to my interface? What are the steps? I've tried setting it up and then access to the server. I'm able to access to the interface but the connection status is still 'disconnected'.\r\n\r\n3. Do I need a specific mephisto configuration for local testing? Up until now I've worked with `\"mephisto/architect\"=\"local\"` and `\"mephisto/provider\"=\"mock\"`.\r\n\r\nThanks in advance and apologies if this issue sounds just as a duplicate of some past issues.\r\nUnfortunately, I'm not sure I've done everything right until now.\r\n\n", "before_files": [{"content": "#!/usr/bin/env python3\n\n# Copyright (c) Facebook, Inc. and its affiliates.\n# This source code is licensed under the MIT license found in the\n# LICENSE file in the root directory of this source tree.\n\nimport os\nfrom mephisto.operations.operator import Operator\nfrom mephisto.operations.utils import get_root_dir\nfrom mephisto.tools.scripts import load_db_and_process_config\nfrom mephisto.abstractions.blueprints.static_html_task.static_html_blueprint import (\n BLUEPRINT_TYPE,\n)\nfrom mephisto.abstractions.blueprints.abstract.static_task.static_blueprint import (\n SharedStaticTaskState,\n)\n\nimport hydra\nfrom omegaconf import DictConfig\nfrom dataclasses import dataclass, field\nfrom typing import List, Any\n\nTASK_DIRECTORY = os.path.dirname(os.path.abspath(__file__))\nCORRECT_ANSWER = \"apple\"\n\ndefaults = [\n {\"mephisto/blueprint\": BLUEPRINT_TYPE},\n {\"mephisto/architect\": \"local\"},\n {\"mephisto/provider\": \"mock\"},\n {\"conf\": \"onboarding_example\"},\n]\n\nfrom mephisto.operations.hydra_config import RunScriptConfig, register_script_config\n\n\n@dataclass\nclass TestScriptConfig(RunScriptConfig):\n defaults: List[Any] = field(default_factory=lambda: defaults)\n task_dir: str = TASK_DIRECTORY\n correct_answer: str = CORRECT_ANSWER\n\n\nregister_script_config(name=\"scriptconfig\", module=TestScriptConfig)\n\n\[email protected](config_path=\"hydra_configs\", config_name=\"scriptconfig\")\ndef main(cfg: DictConfig) -> None:\n correct_config_answer = cfg.correct_answer\n\n def onboarding_is_valid(onboarding_data):\n inputs = onboarding_data[\"inputs\"]\n outputs = onboarding_data[\"outputs\"]\n return outputs.get(\"answer\") == correct_config_answer\n\n shared_state = SharedStaticTaskState(\n onboarding_data={\"correct_answer\": correct_config_answer},\n validate_onboarding=onboarding_is_valid,\n )\n\n db, cfg = load_db_and_process_config(cfg)\n operator = Operator(db)\n\n operator.validate_and_run_config(cfg.mephisto, shared_state)\n operator.wait_for_runs_then_shutdown(skip_input=True, log_rate=30)\n\n\nif __name__ == \"__main__\":\n main()\n", "path": "examples/simple_static_task/static_run_with_onboarding.py"}, {"content": "#!/usr/bin/env python3\n\n# Copyright (c) Facebook, Inc. and its affiliates.\n# This source code is licensed under the MIT license found in the\n# LICENSE file in the root directory of this source tree.\n\nfrom typing import List, Dict, Optional, Any, TYPE_CHECKING\nfrom mephisto.abstractions.blueprint import AgentState\nimport os\nimport json\nimport time\nimport weakref\n\nif TYPE_CHECKING:\n from mephisto.data_model.agent import Agent\n from mephisto.data_model.packet import Packet\n\nfrom mephisto.operations.logger_core import get_logger\n\nlogger = get_logger(name=__name__)\n\nDATA_FILE = \"agent_data.json\"\n\n\nclass StaticAgentState(AgentState):\n \"\"\"\n Agent state for static tasks.\n \"\"\"\n\n def _get_empty_state(self) -> Dict[str, Optional[Dict[str, Any]]]:\n return {\n \"inputs\": None,\n \"outputs\": None,\n \"times\": {\"task_start\": 0, \"task_end\": 0},\n }\n\n def __init__(self, agent: \"Agent\"):\n \"\"\"\n Static agent states should store\n input dict -> output dict pairs to disc\n \"\"\"\n self.agent = weakref.proxy(agent)\n self.state: Dict[str, Optional[Dict[str, Any]]] = self._get_empty_state()\n self.load_data()\n\n def set_init_state(self, data: Any) -> bool:\n \"\"\"Set the initial state for this agent\"\"\"\n if self.get_init_state() is not None:\n # Initial state is already set\n return False\n else:\n self.state[\"inputs\"] = data\n times_dict = self.state[\"times\"]\n assert isinstance(times_dict, dict)\n times_dict[\"task_start\"] = time.time()\n self.save_data()\n return True\n\n def get_init_state(self) -> Optional[Dict[str, Any]]:\n \"\"\"\n Return the initial state for this agent,\n None if no such state exists\n \"\"\"\n if self.state[\"inputs\"] is None:\n return None\n return self.state[\"inputs\"].copy()\n\n def load_data(self) -> None:\n \"\"\"Load data for this agent from disk\"\"\"\n data_dir = self.agent.get_data_dir()\n data_path = os.path.join(data_dir, DATA_FILE)\n if os.path.exists(data_path):\n with open(data_path, \"r\") as data_file:\n self.state = json.load(data_file)\n else:\n self.state = self._get_empty_state()\n\n def get_data(self) -> Dict[str, Any]:\n \"\"\"Return dict of this agent's state\"\"\"\n return self.state.copy()\n\n def save_data(self) -> None:\n \"\"\"Save static agent data to disk\"\"\"\n data_dir = self.agent.get_data_dir()\n os.makedirs(data_dir, exist_ok=True)\n out_filename = os.path.join(data_dir, DATA_FILE)\n with open(out_filename, \"w+\") as data_file:\n json.dump(self.state, data_file)\n logger.info(f\"SAVED_DATA_TO_DISC at {out_filename}\")\n\n def update_data(self, live_data: Dict[str, Any]) -> None:\n \"\"\"\n Process the incoming data packet, and handle\n updating the state\n \"\"\"\n raise Exception(\n \"Static tasks should only have final act, but updated live data\"\n )\n\n def update_submit(self, submission_data: Dict[str, Any]) -> None:\n \"\"\"Move the submitted output to the local dict\"\"\"\n outputs: Dict[str, Any]\n\n if submission_data.get(\"onboarding_data\") is not None:\n outputs = submission_data[\"onboarding_data\"]\n else:\n outputs = submission_data[\"task_data\"]\n times_dict = self.state[\"times\"]\n assert isinstance(times_dict, dict)\n times_dict[\"task_end\"] = time.time()\n if submission_data.get(\"files\") != None:\n logger.info(f\"Got files: {str(submission_data['files'])[:500]}\")\n outputs[\"files\"] = [f[\"filename\"] for f in submission_data[\"files\"]]\n self.state[\"outputs\"] = outputs\n self.save_data()\n\n def get_task_start(self) -> Optional[float]:\n \"\"\"\n Extract out and return the start time recorded for this task.\n \"\"\"\n stored_times = self.state[\"times\"]\n assert stored_times is not None\n return stored_times[\"task_start\"]\n\n def get_task_end(self) -> Optional[float]:\n \"\"\"\n Extract out and return the end time recorded for this task.\n \"\"\"\n stored_times = self.state[\"times\"]\n assert stored_times is not None\n return stored_times[\"task_end\"]\n", "path": "mephisto/abstractions/blueprints/abstract/static_task/static_agent_state.py"}]} | 2,923 | 511 |
gh_patches_debug_33934 | rasdani/github-patches | git_diff | litestar-org__litestar-2534 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Documentation: Unnecessary use of sync_to_thread=True
The following are calling object constructors with no I/O, so should be right to run sync.
https://github.com/litestar-org/litestar/blob/0d4fe01a9d361e09748f71aa7adf70672b97c822/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py#L120
https://github.com/litestar-org/litestar/blob/0d4fe01a9d361e09748f71aa7adf70672b97c822/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py#L154
https://github.com/litestar-org/litestar/blob/0d4fe01a9d361e09748f71aa7adf70672b97c822/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py#L170
<!-- POLAR PLEDGE BADGE START -->
---
> [!NOTE]
> While we are open for sponsoring on [GitHub Sponsors](https://github.com/sponsors/litestar-org/) and
> [OpenCollective](https://opencollective.com/litestar), we also utilize [Polar.sh](https://polar.sh/) to engage in pledge-based sponsorship.
>
> Check out all issues funded or available for funding [on our Polar.sh Litestar dashboard](https://polar.sh/litestar-org)
> * If you would like to see an issue prioritized, make a pledge towards it!
> * We receive the pledge once the issue is completed & verified
> * This, along with engagement in the community, helps us know which features are a priority to our users.
<a href="https://polar.sh/litestar-org/litestar/issues/2508">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://polar.sh/api/github/litestar-org/litestar/issues/2508/pledge.svg?darkmode=1">
<img alt="Fund with Polar" src="https://polar.sh/api/github/litestar-org/litestar/issues/2508/pledge.svg">
</picture>
</a>
<!-- POLAR PLEDGE BADGE END -->
</issue>
<code>
[start of docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py]
1 from __future__ import annotations
2
3 from typing import TYPE_CHECKING
4
5 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
6
7 from litestar import Litestar, post
8 from litestar.contrib.sqlalchemy.plugins import SQLAlchemySerializationPlugin
9 from litestar.dto import dto_field
10
11 if TYPE_CHECKING:
12 from typing import List
13
14
15 class Base(DeclarativeBase):
16 ...
17
18
19 class TodoItem(Base):
20 __tablename__ = "todo_item"
21 title: Mapped[str] = mapped_column(primary_key=True)
22 done: Mapped[bool]
23 super_secret_value: Mapped[str] = mapped_column(info=dto_field("private"))
24
25
26 @post("/", sync_to_thread=True)
27 def add_item(data: TodoItem) -> List[TodoItem]:
28 data.super_secret_value = "This is a secret"
29 return [data]
30
31
32 app = Litestar(route_handlers=[add_item], plugins=[SQLAlchemySerializationPlugin()])
33
[end of docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py]
[start of docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin.py]
1 from __future__ import annotations
2
3 from typing import TYPE_CHECKING
4
5 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
6
7 from litestar import Litestar, post
8 from litestar.contrib.sqlalchemy.plugins import SQLAlchemySerializationPlugin
9
10 if TYPE_CHECKING:
11 from typing import List
12
13
14 class Base(DeclarativeBase):
15 ...
16
17
18 class TodoItem(Base):
19 __tablename__ = "todo_item"
20 title: Mapped[str] = mapped_column(primary_key=True)
21 done: Mapped[bool]
22
23
24 @post("/", sync_to_thread=True)
25 def add_item(data: TodoItem) -> List[TodoItem]:
26 return [data]
27
28
29 app = Litestar(route_handlers=[add_item], plugins=[SQLAlchemySerializationPlugin()])
30
[end of docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin.py]
[start of docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py]
1 from __future__ import annotations
2
3 from datetime import date
4 from typing import TYPE_CHECKING
5 from uuid import UUID
6
7 from pydantic import BaseModel as _BaseModel
8 from pydantic import TypeAdapter
9 from sqlalchemy import ForeignKey, select
10 from sqlalchemy.orm import Mapped, mapped_column, relationship, selectinload
11
12 from litestar import Litestar, get
13 from litestar.contrib.sqlalchemy.base import UUIDAuditBase, UUIDBase
14 from litestar.contrib.sqlalchemy.plugins.init import SQLAlchemyInitPlugin, SQLAlchemySyncConfig
15 from litestar.contrib.sqlalchemy.repository import SQLAlchemySyncRepository
16 from litestar.controller import Controller
17 from litestar.di import Provide
18 from litestar.handlers.http_handlers.decorators import delete, patch, post
19 from litestar.pagination import OffsetPagination
20 from litestar.params import Parameter
21 from litestar.repository.filters import LimitOffset
22
23 if TYPE_CHECKING:
24 from sqlalchemy.orm import Session
25
26
27 class BaseModel(_BaseModel):
28 """Extend Pydantic's BaseModel to enable ORM mode"""
29
30 model_config = {"from_attributes": True}
31
32
33 # the SQLAlchemy base includes a declarative model for you to use in your models.
34 # The `Base` class includes a `UUID` based primary key (`id`)
35 class AuthorModel(UUIDBase):
36 # we can optionally provide the table name instead of auto-generating it
37 __tablename__ = "author" # type: ignore[assignment]
38 name: Mapped[str]
39 dob: Mapped[date | None]
40 books: Mapped[list[BookModel]] = relationship(back_populates="author", lazy="noload")
41
42
43 # The `AuditBase` class includes the same UUID` based primary key (`id`) and 2
44 # additional columns: `created` and `updated`. `created` is a timestamp of when the
45 # record created, and `updated` is the last time the record was modified.
46 class BookModel(UUIDAuditBase):
47 __tablename__ = "book" # type: ignore[assignment]
48 title: Mapped[str]
49 author_id: Mapped[UUID] = mapped_column(ForeignKey("author.id"))
50 author: Mapped[AuthorModel] = relationship(lazy="joined", innerjoin=True, viewonly=True)
51
52
53 # we will explicitly define the schema instead of using DTO objects for clarity.
54
55
56 class Author(BaseModel):
57 id: UUID | None
58 name: str
59 dob: date | None = None
60
61
62 class AuthorCreate(BaseModel):
63 name: str
64 dob: date | None = None
65
66
67 class AuthorUpdate(BaseModel):
68 name: str | None = None
69 dob: date | None = None
70
71
72 class AuthorRepository(SQLAlchemySyncRepository[AuthorModel]):
73 """Author repository."""
74
75 model_type = AuthorModel
76
77
78 async def provide_authors_repo(db_session: Session) -> AuthorRepository:
79 """This provides the default Authors repository."""
80 return AuthorRepository(session=db_session)
81
82
83 # we can optionally override the default `select` used for the repository to pass in
84 # specific SQL options such as join details
85 async def provide_author_details_repo(db_session: Session) -> AuthorRepository:
86 """This provides a simple example demonstrating how to override the join options
87 for the repository."""
88 return AuthorRepository(
89 statement=select(AuthorModel).options(selectinload(AuthorModel.books)),
90 session=db_session,
91 )
92
93
94 def provide_limit_offset_pagination(
95 current_page: int = Parameter(ge=1, query="currentPage", default=1, required=False),
96 page_size: int = Parameter(
97 query="pageSize",
98 ge=1,
99 default=10,
100 required=False,
101 ),
102 ) -> LimitOffset:
103 """Add offset/limit pagination.
104
105 Return type consumed by `Repository.apply_limit_offset_pagination()`.
106
107 Parameters
108 ----------
109 current_page : int
110 LIMIT to apply to select.
111 page_size : int
112 OFFSET to apply to select.
113 """
114 return LimitOffset(page_size, page_size * (current_page - 1))
115
116
117 class AuthorController(Controller):
118 """Author CRUD"""
119
120 dependencies = {"authors_repo": Provide(provide_authors_repo, sync_to_thread=True)}
121
122 @get(path="/authors")
123 def list_authors(
124 self,
125 authors_repo: AuthorRepository,
126 limit_offset: LimitOffset,
127 ) -> OffsetPagination[Author]:
128 """List authors."""
129 results, total = authors_repo.list_and_count(limit_offset)
130 type_adapter = TypeAdapter(list[Author])
131 return OffsetPagination[Author](
132 items=type_adapter.validate_python(results),
133 total=total,
134 limit=limit_offset.limit,
135 offset=limit_offset.offset,
136 )
137
138 @post(path="/authors")
139 def create_author(
140 self,
141 authors_repo: AuthorRepository,
142 data: AuthorCreate,
143 ) -> Author:
144 """Create a new author."""
145 obj = authors_repo.add(
146 AuthorModel(**data.model_dump(exclude_unset=True, exclude_none=True)),
147 )
148 authors_repo.session.commit()
149 return Author.model_validate(obj)
150
151 # we override the authors_repo to use the version that joins the Books in
152 @get(
153 path="/authors/{author_id:uuid}",
154 dependencies={"authors_repo": Provide(provide_author_details_repo, sync_to_thread=True)},
155 )
156 def get_author(
157 self,
158 authors_repo: AuthorRepository,
159 author_id: UUID = Parameter(
160 title="Author ID",
161 description="The author to retrieve.",
162 ),
163 ) -> Author:
164 """Get an existing author."""
165 obj = authors_repo.get(author_id)
166 return Author.model_validate(obj)
167
168 @patch(
169 path="/authors/{author_id:uuid}",
170 dependencies={"authors_repo": Provide(provide_author_details_repo, sync_to_thread=True)},
171 )
172 def update_author(
173 self,
174 authors_repo: AuthorRepository,
175 data: AuthorUpdate,
176 author_id: UUID = Parameter(
177 title="Author ID",
178 description="The author to update.",
179 ),
180 ) -> Author:
181 """Update an author."""
182 raw_obj = data.model_dump(exclude_unset=True, exclude_none=True)
183 raw_obj.update({"id": author_id})
184 obj = authors_repo.update(AuthorModel(**raw_obj))
185 authors_repo.session.commit()
186 return Author.model_validate(obj)
187
188 @delete(path="/authors/{author_id:uuid}")
189 def delete_author(
190 self,
191 authors_repo: AuthorRepository,
192 author_id: UUID = Parameter(
193 title="Author ID",
194 description="The author to delete.",
195 ),
196 ) -> None:
197 """Delete a author from the system."""
198 _ = authors_repo.delete(author_id)
199 authors_repo.session.commit()
200
201
202 sqlalchemy_config = SQLAlchemySyncConfig(connection_string="sqlite:///test.sqlite") # Create 'db_session' dependency.
203 sqlalchemy_plugin = SQLAlchemyInitPlugin(config=sqlalchemy_config)
204
205
206 def on_startup() -> None:
207 """Initializes the database."""
208 with sqlalchemy_config.get_engine().begin() as conn:
209 UUIDBase.metadata.create_all(conn)
210
211
212 app = Litestar(
213 route_handlers=[AuthorController],
214 on_startup=[on_startup],
215 plugins=[SQLAlchemyInitPlugin(config=sqlalchemy_config)],
216 dependencies={"limit_offset": Provide(provide_limit_offset_pagination)},
217 )
218
[end of docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.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/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin.py b/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin.py
--- a/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin.py
+++ b/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin.py
@@ -21,7 +21,7 @@
done: Mapped[bool]
-@post("/", sync_to_thread=True)
+@post("/", sync_to_thread=False)
def add_item(data: TodoItem) -> List[TodoItem]:
return [data]
diff --git a/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py b/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py
--- a/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py
+++ b/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py
@@ -23,7 +23,7 @@
super_secret_value: Mapped[str] = mapped_column(info=dto_field("private"))
-@post("/", sync_to_thread=True)
+@post("/", sync_to_thread=False)
def add_item(data: TodoItem) -> List[TodoItem]:
data.super_secret_value = "This is a secret"
return [data]
diff --git a/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py b/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py
--- a/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py
+++ b/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py
@@ -117,7 +117,7 @@
class AuthorController(Controller):
"""Author CRUD"""
- dependencies = {"authors_repo": Provide(provide_authors_repo, sync_to_thread=True)}
+ dependencies = {"authors_repo": Provide(provide_authors_repo, sync_to_thread=False)}
@get(path="/authors")
def list_authors(
@@ -151,7 +151,7 @@
# we override the authors_repo to use the version that joins the Books in
@get(
path="/authors/{author_id:uuid}",
- dependencies={"authors_repo": Provide(provide_author_details_repo, sync_to_thread=True)},
+ dependencies={"authors_repo": Provide(provide_author_details_repo, sync_to_thread=False)},
)
def get_author(
self,
@@ -167,7 +167,7 @@
@patch(
path="/authors/{author_id:uuid}",
- dependencies={"authors_repo": Provide(provide_author_details_repo, sync_to_thread=True)},
+ dependencies={"authors_repo": Provide(provide_author_details_repo, sync_to_thread=False)},
)
def update_author(
self,
| {"golden_diff": "diff --git a/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin.py b/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin.py\n--- a/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin.py\n+++ b/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin.py\n@@ -21,7 +21,7 @@\n done: Mapped[bool]\n \n \n-@post(\"/\", sync_to_thread=True)\n+@post(\"/\", sync_to_thread=False)\n def add_item(data: TodoItem) -> List[TodoItem]:\n return [data]\n \ndiff --git a/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py b/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py\n--- a/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py\n+++ b/docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py\n@@ -23,7 +23,7 @@\n super_secret_value: Mapped[str] = mapped_column(info=dto_field(\"private\"))\n \n \n-@post(\"/\", sync_to_thread=True)\n+@post(\"/\", sync_to_thread=False)\n def add_item(data: TodoItem) -> List[TodoItem]:\n data.super_secret_value = \"This is a secret\"\n return [data]\ndiff --git a/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py b/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py\n--- a/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py\n+++ b/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py\n@@ -117,7 +117,7 @@\n class AuthorController(Controller):\n \"\"\"Author CRUD\"\"\"\n \n- dependencies = {\"authors_repo\": Provide(provide_authors_repo, sync_to_thread=True)}\n+ dependencies = {\"authors_repo\": Provide(provide_authors_repo, sync_to_thread=False)}\n \n @get(path=\"/authors\")\n def list_authors(\n@@ -151,7 +151,7 @@\n # we override the authors_repo to use the version that joins the Books in\n @get(\n path=\"/authors/{author_id:uuid}\",\n- dependencies={\"authors_repo\": Provide(provide_author_details_repo, sync_to_thread=True)},\n+ dependencies={\"authors_repo\": Provide(provide_author_details_repo, sync_to_thread=False)},\n )\n def get_author(\n self,\n@@ -167,7 +167,7 @@\n \n @patch(\n path=\"/authors/{author_id:uuid}\",\n- dependencies={\"authors_repo\": Provide(provide_author_details_repo, sync_to_thread=True)},\n+ dependencies={\"authors_repo\": Provide(provide_author_details_repo, sync_to_thread=False)},\n )\n def update_author(\n self,\n", "issue": "Documentation: Unnecessary use of sync_to_thread=True\nThe following are calling object constructors with no I/O, so should be right to run sync.\r\n\r\nhttps://github.com/litestar-org/litestar/blob/0d4fe01a9d361e09748f71aa7adf70672b97c822/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py#L120\r\n\r\nhttps://github.com/litestar-org/litestar/blob/0d4fe01a9d361e09748f71aa7adf70672b97c822/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py#L154\r\n\r\nhttps://github.com/litestar-org/litestar/blob/0d4fe01a9d361e09748f71aa7adf70672b97c822/docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py#L170\r\n\r\n\n\n<!-- POLAR PLEDGE BADGE START -->\n---\n> [!NOTE] \n> While we are open for sponsoring on [GitHub Sponsors](https://github.com/sponsors/litestar-org/) and \n> [OpenCollective](https://opencollective.com/litestar), we also utilize [Polar.sh](https://polar.sh/) to engage in pledge-based sponsorship.\n>\n> Check out all issues funded or available for funding [on our Polar.sh Litestar dashboard](https://polar.sh/litestar-org)\n> * If you would like to see an issue prioritized, make a pledge towards it!\n> * We receive the pledge once the issue is completed & verified\n> * This, along with engagement in the community, helps us know which features are a priority to our users.\n\n<a href=\"https://polar.sh/litestar-org/litestar/issues/2508\">\n<picture>\n <source media=\"(prefers-color-scheme: dark)\" srcset=\"https://polar.sh/api/github/litestar-org/litestar/issues/2508/pledge.svg?darkmode=1\">\n <img alt=\"Fund with Polar\" src=\"https://polar.sh/api/github/litestar-org/litestar/issues/2508/pledge.svg\">\n</picture>\n</a>\n<!-- POLAR PLEDGE BADGE END -->\n\n", "before_files": [{"content": "from __future__ import annotations\n\nfrom typing import TYPE_CHECKING\n\nfrom sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column\n\nfrom litestar import Litestar, post\nfrom litestar.contrib.sqlalchemy.plugins import SQLAlchemySerializationPlugin\nfrom litestar.dto import dto_field\n\nif TYPE_CHECKING:\n from typing import List\n\n\nclass Base(DeclarativeBase):\n ...\n\n\nclass TodoItem(Base):\n __tablename__ = \"todo_item\"\n title: Mapped[str] = mapped_column(primary_key=True)\n done: Mapped[bool]\n super_secret_value: Mapped[str] = mapped_column(info=dto_field(\"private\"))\n\n\n@post(\"/\", sync_to_thread=True)\ndef add_item(data: TodoItem) -> List[TodoItem]:\n data.super_secret_value = \"This is a secret\"\n return [data]\n\n\napp = Litestar(route_handlers=[add_item], plugins=[SQLAlchemySerializationPlugin()])\n", "path": "docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py"}, {"content": "from __future__ import annotations\n\nfrom typing import TYPE_CHECKING\n\nfrom sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column\n\nfrom litestar import Litestar, post\nfrom litestar.contrib.sqlalchemy.plugins import SQLAlchemySerializationPlugin\n\nif TYPE_CHECKING:\n from typing import List\n\n\nclass Base(DeclarativeBase):\n ...\n\n\nclass TodoItem(Base):\n __tablename__ = \"todo_item\"\n title: Mapped[str] = mapped_column(primary_key=True)\n done: Mapped[bool]\n\n\n@post(\"/\", sync_to_thread=True)\ndef add_item(data: TodoItem) -> List[TodoItem]:\n return [data]\n\n\napp = Litestar(route_handlers=[add_item], plugins=[SQLAlchemySerializationPlugin()])\n", "path": "docs/examples/contrib/sqlalchemy/plugins/sqlalchemy_sync_serialization_plugin.py"}, {"content": "from __future__ import annotations\n\nfrom datetime import date\nfrom typing import TYPE_CHECKING\nfrom uuid import UUID\n\nfrom pydantic import BaseModel as _BaseModel\nfrom pydantic import TypeAdapter\nfrom sqlalchemy import ForeignKey, select\nfrom sqlalchemy.orm import Mapped, mapped_column, relationship, selectinload\n\nfrom litestar import Litestar, get\nfrom litestar.contrib.sqlalchemy.base import UUIDAuditBase, UUIDBase\nfrom litestar.contrib.sqlalchemy.plugins.init import SQLAlchemyInitPlugin, SQLAlchemySyncConfig\nfrom litestar.contrib.sqlalchemy.repository import SQLAlchemySyncRepository\nfrom litestar.controller import Controller\nfrom litestar.di import Provide\nfrom litestar.handlers.http_handlers.decorators import delete, patch, post\nfrom litestar.pagination import OffsetPagination\nfrom litestar.params import Parameter\nfrom litestar.repository.filters import LimitOffset\n\nif TYPE_CHECKING:\n from sqlalchemy.orm import Session\n\n\nclass BaseModel(_BaseModel):\n \"\"\"Extend Pydantic's BaseModel to enable ORM mode\"\"\"\n\n model_config = {\"from_attributes\": True}\n\n\n# the SQLAlchemy base includes a declarative model for you to use in your models.\n# The `Base` class includes a `UUID` based primary key (`id`)\nclass AuthorModel(UUIDBase):\n # we can optionally provide the table name instead of auto-generating it\n __tablename__ = \"author\" # type: ignore[assignment]\n name: Mapped[str]\n dob: Mapped[date | None]\n books: Mapped[list[BookModel]] = relationship(back_populates=\"author\", lazy=\"noload\")\n\n\n# The `AuditBase` class includes the same UUID` based primary key (`id`) and 2\n# additional columns: `created` and `updated`. `created` is a timestamp of when the\n# record created, and `updated` is the last time the record was modified.\nclass BookModel(UUIDAuditBase):\n __tablename__ = \"book\" # type: ignore[assignment]\n title: Mapped[str]\n author_id: Mapped[UUID] = mapped_column(ForeignKey(\"author.id\"))\n author: Mapped[AuthorModel] = relationship(lazy=\"joined\", innerjoin=True, viewonly=True)\n\n\n# we will explicitly define the schema instead of using DTO objects for clarity.\n\n\nclass Author(BaseModel):\n id: UUID | None\n name: str\n dob: date | None = None\n\n\nclass AuthorCreate(BaseModel):\n name: str\n dob: date | None = None\n\n\nclass AuthorUpdate(BaseModel):\n name: str | None = None\n dob: date | None = None\n\n\nclass AuthorRepository(SQLAlchemySyncRepository[AuthorModel]):\n \"\"\"Author repository.\"\"\"\n\n model_type = AuthorModel\n\n\nasync def provide_authors_repo(db_session: Session) -> AuthorRepository:\n \"\"\"This provides the default Authors repository.\"\"\"\n return AuthorRepository(session=db_session)\n\n\n# we can optionally override the default `select` used for the repository to pass in\n# specific SQL options such as join details\nasync def provide_author_details_repo(db_session: Session) -> AuthorRepository:\n \"\"\"This provides a simple example demonstrating how to override the join options\n for the repository.\"\"\"\n return AuthorRepository(\n statement=select(AuthorModel).options(selectinload(AuthorModel.books)),\n session=db_session,\n )\n\n\ndef provide_limit_offset_pagination(\n current_page: int = Parameter(ge=1, query=\"currentPage\", default=1, required=False),\n page_size: int = Parameter(\n query=\"pageSize\",\n ge=1,\n default=10,\n required=False,\n ),\n) -> LimitOffset:\n \"\"\"Add offset/limit pagination.\n\n Return type consumed by `Repository.apply_limit_offset_pagination()`.\n\n Parameters\n ----------\n current_page : int\n LIMIT to apply to select.\n page_size : int\n OFFSET to apply to select.\n \"\"\"\n return LimitOffset(page_size, page_size * (current_page - 1))\n\n\nclass AuthorController(Controller):\n \"\"\"Author CRUD\"\"\"\n\n dependencies = {\"authors_repo\": Provide(provide_authors_repo, sync_to_thread=True)}\n\n @get(path=\"/authors\")\n def list_authors(\n self,\n authors_repo: AuthorRepository,\n limit_offset: LimitOffset,\n ) -> OffsetPagination[Author]:\n \"\"\"List authors.\"\"\"\n results, total = authors_repo.list_and_count(limit_offset)\n type_adapter = TypeAdapter(list[Author])\n return OffsetPagination[Author](\n items=type_adapter.validate_python(results),\n total=total,\n limit=limit_offset.limit,\n offset=limit_offset.offset,\n )\n\n @post(path=\"/authors\")\n def create_author(\n self,\n authors_repo: AuthorRepository,\n data: AuthorCreate,\n ) -> Author:\n \"\"\"Create a new author.\"\"\"\n obj = authors_repo.add(\n AuthorModel(**data.model_dump(exclude_unset=True, exclude_none=True)),\n )\n authors_repo.session.commit()\n return Author.model_validate(obj)\n\n # we override the authors_repo to use the version that joins the Books in\n @get(\n path=\"/authors/{author_id:uuid}\",\n dependencies={\"authors_repo\": Provide(provide_author_details_repo, sync_to_thread=True)},\n )\n def get_author(\n self,\n authors_repo: AuthorRepository,\n author_id: UUID = Parameter(\n title=\"Author ID\",\n description=\"The author to retrieve.\",\n ),\n ) -> Author:\n \"\"\"Get an existing author.\"\"\"\n obj = authors_repo.get(author_id)\n return Author.model_validate(obj)\n\n @patch(\n path=\"/authors/{author_id:uuid}\",\n dependencies={\"authors_repo\": Provide(provide_author_details_repo, sync_to_thread=True)},\n )\n def update_author(\n self,\n authors_repo: AuthorRepository,\n data: AuthorUpdate,\n author_id: UUID = Parameter(\n title=\"Author ID\",\n description=\"The author to update.\",\n ),\n ) -> Author:\n \"\"\"Update an author.\"\"\"\n raw_obj = data.model_dump(exclude_unset=True, exclude_none=True)\n raw_obj.update({\"id\": author_id})\n obj = authors_repo.update(AuthorModel(**raw_obj))\n authors_repo.session.commit()\n return Author.model_validate(obj)\n\n @delete(path=\"/authors/{author_id:uuid}\")\n def delete_author(\n self,\n authors_repo: AuthorRepository,\n author_id: UUID = Parameter(\n title=\"Author ID\",\n description=\"The author to delete.\",\n ),\n ) -> None:\n \"\"\"Delete a author from the system.\"\"\"\n _ = authors_repo.delete(author_id)\n authors_repo.session.commit()\n\n\nsqlalchemy_config = SQLAlchemySyncConfig(connection_string=\"sqlite:///test.sqlite\") # Create 'db_session' dependency.\nsqlalchemy_plugin = SQLAlchemyInitPlugin(config=sqlalchemy_config)\n\n\ndef on_startup() -> None:\n \"\"\"Initializes the database.\"\"\"\n with sqlalchemy_config.get_engine().begin() as conn:\n UUIDBase.metadata.create_all(conn)\n\n\napp = Litestar(\n route_handlers=[AuthorController],\n on_startup=[on_startup],\n plugins=[SQLAlchemyInitPlugin(config=sqlalchemy_config)],\n dependencies={\"limit_offset\": Provide(provide_limit_offset_pagination)},\n)\n", "path": "docs/examples/contrib/sqlalchemy/sqlalchemy_sync_repository.py"}]} | 3,695 | 593 |
gh_patches_debug_18731 | rasdani/github-patches | git_diff | MongoEngine__mongoengine-1866 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
no_sub_classes context mgr is failing silently
I noticed that the no_sub_classes context manager is not working at all but its also swallowing exceptions and thus, failing silently. In fact, see below:
```
In [1]: import mongoengine as me
...: me.connect()
...:
...: class Parent(me.Document):
...: name = me.StringField()
...: meta = {'allow_inheritance': True}
...:
...: class SuperParent(Parent):
...: pass
...:
...: Parent(name='John').save()
...: SuperParent(name='Hulk').save()
Out[1]: <SuperParent: SuperParent object>
In [2]:
...: with me.context_managers.no_sub_classes(Parent):
...: print 'before'
...: print Parent.objects().first() # raises InvalidDocument: Cannot encode object: <class '__main__.Parent'> but gets silenced by context
...: print 'after' # Never gets executed
...: print'out of context'
before
out of context
```
This is due to the no_subclasses' \__exit\__ method which is returning something that evaluates to True and by convention, the __exit__ methods of context manager swallows exceptions when doing so (https://stackoverflow.com/a/18399069)
This means that the no_sub_classes is even swallowing the AssertionError that are actually raised within the unit tests. I'll push a PR shortly.
One last thing, the context is patching the main Document class, so it is confusing to have the context manager returning the class. In fact:
```
with no_subclasses(Parent) as ParentNoSubClasses:
print (Parent is ParentNoSubClasses) # True
```
It should only be used like:
```
with no_subclasses(Parent):
print (Parent is ParentNoSubClasses)
```
I'd love to get rid of the "with ... as" but I'm assuming that you are against breaking changes so I won't change this. I'll push a PR to fix the issues mentioned earlier
</issue>
<code>
[start of mongoengine/context_managers.py]
1 from contextlib import contextmanager
2 from pymongo.write_concern import WriteConcern
3 from mongoengine.common import _import_class
4 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
5
6
7 __all__ = ('switch_db', 'switch_collection', 'no_dereference',
8 'no_sub_classes', 'query_counter', 'set_write_concern')
9
10
11 class switch_db(object):
12 """switch_db alias context manager.
13
14 Example ::
15
16 # Register connections
17 register_connection('default', 'mongoenginetest')
18 register_connection('testdb-1', 'mongoenginetest2')
19
20 class Group(Document):
21 name = StringField()
22
23 Group(name='test').save() # Saves in the default db
24
25 with switch_db(Group, 'testdb-1') as Group:
26 Group(name='hello testdb!').save() # Saves in testdb-1
27 """
28
29 def __init__(self, cls, db_alias):
30 """Construct the switch_db context manager
31
32 :param cls: the class to change the registered db
33 :param db_alias: the name of the specific database to use
34 """
35 self.cls = cls
36 self.collection = cls._get_collection()
37 self.db_alias = db_alias
38 self.ori_db_alias = cls._meta.get('db_alias', DEFAULT_CONNECTION_NAME)
39
40 def __enter__(self):
41 """Change the db_alias and clear the cached collection."""
42 self.cls._meta['db_alias'] = self.db_alias
43 self.cls._collection = None
44 return self.cls
45
46 def __exit__(self, t, value, traceback):
47 """Reset the db_alias and collection."""
48 self.cls._meta['db_alias'] = self.ori_db_alias
49 self.cls._collection = self.collection
50
51
52 class switch_collection(object):
53 """switch_collection alias context manager.
54
55 Example ::
56
57 class Group(Document):
58 name = StringField()
59
60 Group(name='test').save() # Saves in the default db
61
62 with switch_collection(Group, 'group1') as Group:
63 Group(name='hello testdb!').save() # Saves in group1 collection
64 """
65
66 def __init__(self, cls, collection_name):
67 """Construct the switch_collection context manager.
68
69 :param cls: the class to change the registered db
70 :param collection_name: the name of the collection to use
71 """
72 self.cls = cls
73 self.ori_collection = cls._get_collection()
74 self.ori_get_collection_name = cls._get_collection_name
75 self.collection_name = collection_name
76
77 def __enter__(self):
78 """Change the _get_collection_name and clear the cached collection."""
79
80 @classmethod
81 def _get_collection_name(cls):
82 return self.collection_name
83
84 self.cls._get_collection_name = _get_collection_name
85 self.cls._collection = None
86 return self.cls
87
88 def __exit__(self, t, value, traceback):
89 """Reset the collection."""
90 self.cls._collection = self.ori_collection
91 self.cls._get_collection_name = self.ori_get_collection_name
92
93
94 class no_dereference(object):
95 """no_dereference context manager.
96
97 Turns off all dereferencing in Documents for the duration of the context
98 manager::
99
100 with no_dereference(Group) as Group:
101 Group.objects.find()
102 """
103
104 def __init__(self, cls):
105 """Construct the no_dereference context manager.
106
107 :param cls: the class to turn dereferencing off on
108 """
109 self.cls = cls
110
111 ReferenceField = _import_class('ReferenceField')
112 GenericReferenceField = _import_class('GenericReferenceField')
113 ComplexBaseField = _import_class('ComplexBaseField')
114
115 self.deref_fields = [k for k, v in self.cls._fields.iteritems()
116 if isinstance(v, (ReferenceField,
117 GenericReferenceField,
118 ComplexBaseField))]
119
120 def __enter__(self):
121 """Change the objects default and _auto_dereference values."""
122 for field in self.deref_fields:
123 self.cls._fields[field]._auto_dereference = False
124 return self.cls
125
126 def __exit__(self, t, value, traceback):
127 """Reset the default and _auto_dereference values."""
128 for field in self.deref_fields:
129 self.cls._fields[field]._auto_dereference = True
130 return self.cls
131
132
133 class no_sub_classes(object):
134 """no_sub_classes context manager.
135
136 Only returns instances of this class and no sub (inherited) classes::
137
138 with no_sub_classes(Group) as Group:
139 Group.objects.find()
140 """
141
142 def __init__(self, cls):
143 """Construct the no_sub_classes context manager.
144
145 :param cls: the class to turn querying sub classes on
146 """
147 self.cls = cls
148
149 def __enter__(self):
150 """Change the objects default and _auto_dereference values."""
151 self.cls._all_subclasses = self.cls._subclasses
152 self.cls._subclasses = (self.cls,)
153 return self.cls
154
155 def __exit__(self, t, value, traceback):
156 """Reset the default and _auto_dereference values."""
157 self.cls._subclasses = self.cls._all_subclasses
158 delattr(self.cls, '_all_subclasses')
159 return self.cls
160
161
162 class query_counter(object):
163 """Query_counter context manager to get the number of queries."""
164
165 def __init__(self):
166 """Construct the query_counter."""
167 self.counter = 0
168 self.db = get_db()
169
170 def __enter__(self):
171 """On every with block we need to drop the profile collection."""
172 self.db.set_profiling_level(0)
173 self.db.system.profile.drop()
174 self.db.set_profiling_level(2)
175 return self
176
177 def __exit__(self, t, value, traceback):
178 """Reset the profiling level."""
179 self.db.set_profiling_level(0)
180
181 def __eq__(self, value):
182 """== Compare querycounter."""
183 counter = self._get_count()
184 return value == counter
185
186 def __ne__(self, value):
187 """!= Compare querycounter."""
188 return not self.__eq__(value)
189
190 def __lt__(self, value):
191 """< Compare querycounter."""
192 return self._get_count() < value
193
194 def __le__(self, value):
195 """<= Compare querycounter."""
196 return self._get_count() <= value
197
198 def __gt__(self, value):
199 """> Compare querycounter."""
200 return self._get_count() > value
201
202 def __ge__(self, value):
203 """>= Compare querycounter."""
204 return self._get_count() >= value
205
206 def __int__(self):
207 """int representation."""
208 return self._get_count()
209
210 def __repr__(self):
211 """repr query_counter as the number of queries."""
212 return u"%s" % self._get_count()
213
214 def _get_count(self):
215 """Get the number of queries."""
216 ignore_query = {'ns': {'$ne': '%s.system.indexes' % self.db.name}}
217 count = self.db.system.profile.find(ignore_query).count() - self.counter
218 self.counter += 1
219 return count
220
221
222 @contextmanager
223 def set_write_concern(collection, write_concerns):
224 combined_concerns = dict(collection.write_concern.document.items())
225 combined_concerns.update(write_concerns)
226 yield collection.with_options(write_concern=WriteConcern(**combined_concerns))
227
[end of mongoengine/context_managers.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/mongoengine/context_managers.py b/mongoengine/context_managers.py
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -145,18 +145,17 @@
:param cls: the class to turn querying sub classes on
"""
self.cls = cls
+ self.cls_initial_subclasses = None
def __enter__(self):
"""Change the objects default and _auto_dereference values."""
- self.cls._all_subclasses = self.cls._subclasses
- self.cls._subclasses = (self.cls,)
+ self.cls_initial_subclasses = self.cls._subclasses
+ self.cls._subclasses = (self.cls._class_name,)
return self.cls
def __exit__(self, t, value, traceback):
"""Reset the default and _auto_dereference values."""
- self.cls._subclasses = self.cls._all_subclasses
- delattr(self.cls, '_all_subclasses')
- return self.cls
+ self.cls._subclasses = self.cls_initial_subclasses
class query_counter(object):
| {"golden_diff": "diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py\n--- a/mongoengine/context_managers.py\n+++ b/mongoengine/context_managers.py\n@@ -145,18 +145,17 @@\n :param cls: the class to turn querying sub classes on\n \"\"\"\n self.cls = cls\n+ self.cls_initial_subclasses = None\n \n def __enter__(self):\n \"\"\"Change the objects default and _auto_dereference values.\"\"\"\n- self.cls._all_subclasses = self.cls._subclasses\n- self.cls._subclasses = (self.cls,)\n+ self.cls_initial_subclasses = self.cls._subclasses\n+ self.cls._subclasses = (self.cls._class_name,)\n return self.cls\n \n def __exit__(self, t, value, traceback):\n \"\"\"Reset the default and _auto_dereference values.\"\"\"\n- self.cls._subclasses = self.cls._all_subclasses\n- delattr(self.cls, '_all_subclasses')\n- return self.cls\n+ self.cls._subclasses = self.cls_initial_subclasses\n \n \n class query_counter(object):\n", "issue": "no_sub_classes context mgr is failing silently\nI noticed that the no_sub_classes context manager is not working at all but its also swallowing exceptions and thus, failing silently. In fact, see below:\r\n```\r\nIn [1]: import mongoengine as me\r\n ...: me.connect()\r\n ...: \r\n ...: class Parent(me.Document):\r\n ...: name = me.StringField()\r\n ...: meta = {'allow_inheritance': True}\r\n ...: \r\n ...: class SuperParent(Parent):\r\n ...: pass\r\n ...: \r\n ...: Parent(name='John').save()\r\n ...: SuperParent(name='Hulk').save()\r\nOut[1]: <SuperParent: SuperParent object>\r\n\r\nIn [2]: \r\n ...: with me.context_managers.no_sub_classes(Parent):\r\n ...: print 'before'\r\n ...: print Parent.objects().first()\t# raises InvalidDocument: Cannot encode object: <class '__main__.Parent'> but gets silenced by context\r\n ...: print 'after'\t\t\t# Never gets executed\r\n ...: print'out of context'\r\nbefore\r\nout of context\r\n```\r\nThis is due to the no_subclasses' \\__exit\\__ method which is returning something that evaluates to True and by convention, the __exit__ methods of context manager swallows exceptions when doing so (https://stackoverflow.com/a/18399069)\r\n\r\nThis means that the no_sub_classes is even swallowing the AssertionError that are actually raised within the unit tests. I'll push a PR shortly.\r\n\r\nOne last thing, the context is patching the main Document class, so it is confusing to have the context manager returning the class. In fact:\r\n```\r\nwith no_subclasses(Parent) as ParentNoSubClasses:\r\n print (Parent is ParentNoSubClasses) # True\r\n```\r\nIt should only be used like:\r\n```\r\nwith no_subclasses(Parent):\r\n print (Parent is ParentNoSubClasses)\r\n```\r\nI'd love to get rid of the \"with ... as\" but I'm assuming that you are against breaking changes so I won't change this. I'll push a PR to fix the issues mentioned earlier\n", "before_files": [{"content": "from contextlib import contextmanager\nfrom pymongo.write_concern import WriteConcern\nfrom mongoengine.common import _import_class\nfrom mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db\n\n\n__all__ = ('switch_db', 'switch_collection', 'no_dereference',\n 'no_sub_classes', 'query_counter', 'set_write_concern')\n\n\nclass switch_db(object):\n \"\"\"switch_db alias context manager.\n\n Example ::\n\n # Register connections\n register_connection('default', 'mongoenginetest')\n register_connection('testdb-1', 'mongoenginetest2')\n\n class Group(Document):\n name = StringField()\n\n Group(name='test').save() # Saves in the default db\n\n with switch_db(Group, 'testdb-1') as Group:\n Group(name='hello testdb!').save() # Saves in testdb-1\n \"\"\"\n\n def __init__(self, cls, db_alias):\n \"\"\"Construct the switch_db context manager\n\n :param cls: the class to change the registered db\n :param db_alias: the name of the specific database to use\n \"\"\"\n self.cls = cls\n self.collection = cls._get_collection()\n self.db_alias = db_alias\n self.ori_db_alias = cls._meta.get('db_alias', DEFAULT_CONNECTION_NAME)\n\n def __enter__(self):\n \"\"\"Change the db_alias and clear the cached collection.\"\"\"\n self.cls._meta['db_alias'] = self.db_alias\n self.cls._collection = None\n return self.cls\n\n def __exit__(self, t, value, traceback):\n \"\"\"Reset the db_alias and collection.\"\"\"\n self.cls._meta['db_alias'] = self.ori_db_alias\n self.cls._collection = self.collection\n\n\nclass switch_collection(object):\n \"\"\"switch_collection alias context manager.\n\n Example ::\n\n class Group(Document):\n name = StringField()\n\n Group(name='test').save() # Saves in the default db\n\n with switch_collection(Group, 'group1') as Group:\n Group(name='hello testdb!').save() # Saves in group1 collection\n \"\"\"\n\n def __init__(self, cls, collection_name):\n \"\"\"Construct the switch_collection context manager.\n\n :param cls: the class to change the registered db\n :param collection_name: the name of the collection to use\n \"\"\"\n self.cls = cls\n self.ori_collection = cls._get_collection()\n self.ori_get_collection_name = cls._get_collection_name\n self.collection_name = collection_name\n\n def __enter__(self):\n \"\"\"Change the _get_collection_name and clear the cached collection.\"\"\"\n\n @classmethod\n def _get_collection_name(cls):\n return self.collection_name\n\n self.cls._get_collection_name = _get_collection_name\n self.cls._collection = None\n return self.cls\n\n def __exit__(self, t, value, traceback):\n \"\"\"Reset the collection.\"\"\"\n self.cls._collection = self.ori_collection\n self.cls._get_collection_name = self.ori_get_collection_name\n\n\nclass no_dereference(object):\n \"\"\"no_dereference context manager.\n\n Turns off all dereferencing in Documents for the duration of the context\n manager::\n\n with no_dereference(Group) as Group:\n Group.objects.find()\n \"\"\"\n\n def __init__(self, cls):\n \"\"\"Construct the no_dereference context manager.\n\n :param cls: the class to turn dereferencing off on\n \"\"\"\n self.cls = cls\n\n ReferenceField = _import_class('ReferenceField')\n GenericReferenceField = _import_class('GenericReferenceField')\n ComplexBaseField = _import_class('ComplexBaseField')\n\n self.deref_fields = [k for k, v in self.cls._fields.iteritems()\n if isinstance(v, (ReferenceField,\n GenericReferenceField,\n ComplexBaseField))]\n\n def __enter__(self):\n \"\"\"Change the objects default and _auto_dereference values.\"\"\"\n for field in self.deref_fields:\n self.cls._fields[field]._auto_dereference = False\n return self.cls\n\n def __exit__(self, t, value, traceback):\n \"\"\"Reset the default and _auto_dereference values.\"\"\"\n for field in self.deref_fields:\n self.cls._fields[field]._auto_dereference = True\n return self.cls\n\n\nclass no_sub_classes(object):\n \"\"\"no_sub_classes context manager.\n\n Only returns instances of this class and no sub (inherited) classes::\n\n with no_sub_classes(Group) as Group:\n Group.objects.find()\n \"\"\"\n\n def __init__(self, cls):\n \"\"\"Construct the no_sub_classes context manager.\n\n :param cls: the class to turn querying sub classes on\n \"\"\"\n self.cls = cls\n\n def __enter__(self):\n \"\"\"Change the objects default and _auto_dereference values.\"\"\"\n self.cls._all_subclasses = self.cls._subclasses\n self.cls._subclasses = (self.cls,)\n return self.cls\n\n def __exit__(self, t, value, traceback):\n \"\"\"Reset the default and _auto_dereference values.\"\"\"\n self.cls._subclasses = self.cls._all_subclasses\n delattr(self.cls, '_all_subclasses')\n return self.cls\n\n\nclass query_counter(object):\n \"\"\"Query_counter context manager to get the number of queries.\"\"\"\n\n def __init__(self):\n \"\"\"Construct the query_counter.\"\"\"\n self.counter = 0\n self.db = get_db()\n\n def __enter__(self):\n \"\"\"On every with block we need to drop the profile collection.\"\"\"\n self.db.set_profiling_level(0)\n self.db.system.profile.drop()\n self.db.set_profiling_level(2)\n return self\n\n def __exit__(self, t, value, traceback):\n \"\"\"Reset the profiling level.\"\"\"\n self.db.set_profiling_level(0)\n\n def __eq__(self, value):\n \"\"\"== Compare querycounter.\"\"\"\n counter = self._get_count()\n return value == counter\n\n def __ne__(self, value):\n \"\"\"!= Compare querycounter.\"\"\"\n return not self.__eq__(value)\n\n def __lt__(self, value):\n \"\"\"< Compare querycounter.\"\"\"\n return self._get_count() < value\n\n def __le__(self, value):\n \"\"\"<= Compare querycounter.\"\"\"\n return self._get_count() <= value\n\n def __gt__(self, value):\n \"\"\"> Compare querycounter.\"\"\"\n return self._get_count() > value\n\n def __ge__(self, value):\n \"\"\">= Compare querycounter.\"\"\"\n return self._get_count() >= value\n\n def __int__(self):\n \"\"\"int representation.\"\"\"\n return self._get_count()\n\n def __repr__(self):\n \"\"\"repr query_counter as the number of queries.\"\"\"\n return u\"%s\" % self._get_count()\n\n def _get_count(self):\n \"\"\"Get the number of queries.\"\"\"\n ignore_query = {'ns': {'$ne': '%s.system.indexes' % self.db.name}}\n count = self.db.system.profile.find(ignore_query).count() - self.counter\n self.counter += 1\n return count\n\n\n@contextmanager\ndef set_write_concern(collection, write_concerns):\n combined_concerns = dict(collection.write_concern.document.items())\n combined_concerns.update(write_concerns)\n yield collection.with_options(write_concern=WriteConcern(**combined_concerns))\n", "path": "mongoengine/context_managers.py"}]} | 3,199 | 249 |
gh_patches_debug_26306 | rasdani/github-patches | git_diff | sql-machine-learning__elasticdl-47 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Use stable hashing in ps client
</issue>
<code>
[start of python/tflib/ps/ps_client.py]
1 import future
2
3
4 # No partition, all in the first ps
5 def no_partition(v, ps_size):
6 return [v]
7
8
9 # Partition v according to the name hashing.
10 def hash_partition(v, ps_size):
11 if v is None:
12 return [None for i in range(ps_size)]
13 if len(v) == 0:
14 raise ValueError('Empty input used in HashPartition.')
15 if ps_size == 1:
16 return [v]
17 if isinstance(v, dict):
18 # (name, data) dict from push
19 results = [{} for i in range(ps_size)]
20 for name, data in v.items():
21 index = hash(name) % ps_size
22 results[index][name] = data
23 elif isinstance(v, list):
24 # name list from pull
25 results = [[] for i in range(ps_size)]
26 for name in v:
27 index = hash(name) % ps_size
28 results[index].append(name)
29 else:
30 raise TypeError('Illegal v type %s, only dict or '
31 'str list is supported.' % str(type(v)))
32 return results
33
34
35 # Multi-thread implementation of PSClientComm
36 class MultiThreadPSClientComm(object):
37 def __init__(self, ps):
38 self._ps = ps
39
40 def push(self, base_step, sub_step, grads):
41 if len(grads) > 0:
42 self._ps.push(base_step, sub_step, grads)
43
44 def pull(self, names=None, min_step=0):
45 return self._ps.pull(names=names, min_step=min_step)
46
47
48 # ParameterSererClient uses PSClientComm for ps data transfer.
49 class ParameterServerClient(object):
50 def __init__(self,
51 ps_configs=None,
52 comm_class=MultiThreadPSClientComm,
53 partition_func=no_partition):
54 self._ps_size = 1 if partition_func == no_partition else len(ps_configs)
55 self._partition_func = partition_func
56 self._clients = [comm_class(ps_configs[i])
57 for i in range(self._ps_size)]
58 self._base_step = [0 for _ in range(self._ps_size)]
59
60 def push(self, sub_step=0, grads=None):
61 partition_result = self._partition_func(grads, self._ps_size)
62 # TODO: multithread optimization, one thread per ps communication.
63 for index, g in enumerate(partition_result):
64 self._clients[index].push(self._base_step[index],
65 sub_step, g)
66
67 def pull(self, min_step=0, names=None):
68 pull_result = {}
69 partition_result = self._partition_func(names, self._ps_size)
70 # TODO: multithread optimization, one thread per ps communication.
71 for index, n in enumerate(partition_result):
72 ps_step, ps_vars = self._clients[index].pull(
73 names=n, min_step=min_step)
74 self._base_step[index] = ps_step
75 pull_result.update(ps_vars)
76 return self.get_min_base_step(), pull_result
77
78 def get_min_base_step(self):
79 return min(self._base_step)
80
[end of python/tflib/ps/ps_client.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/python/tflib/ps/ps_client.py b/python/tflib/ps/ps_client.py
--- a/python/tflib/ps/ps_client.py
+++ b/python/tflib/ps/ps_client.py
@@ -1,5 +1,4 @@
-import future
-
+from binascii import crc32
# No partition, all in the first ps
def no_partition(v, ps_size):
@@ -8,6 +7,10 @@
# Partition v according to the name hashing.
def hash_partition(v, ps_size):
+ # a simple stable string hash
+ def _hash(s):
+ return crc32(s.encode())
+
if v is None:
return [None for i in range(ps_size)]
if len(v) == 0:
@@ -18,13 +21,13 @@
# (name, data) dict from push
results = [{} for i in range(ps_size)]
for name, data in v.items():
- index = hash(name) % ps_size
+ index = _hash(name) % ps_size
results[index][name] = data
elif isinstance(v, list):
# name list from pull
results = [[] for i in range(ps_size)]
for name in v:
- index = hash(name) % ps_size
+ index = _hash(name) % ps_size
results[index].append(name)
else:
raise TypeError('Illegal v type %s, only dict or '
| {"golden_diff": "diff --git a/python/tflib/ps/ps_client.py b/python/tflib/ps/ps_client.py\n--- a/python/tflib/ps/ps_client.py\n+++ b/python/tflib/ps/ps_client.py\n@@ -1,5 +1,4 @@\n-import future\n-\n+from binascii import crc32\n \n # No partition, all in the first ps\n def no_partition(v, ps_size):\n@@ -8,6 +7,10 @@\n \n # Partition v according to the name hashing.\n def hash_partition(v, ps_size):\n+ # a simple stable string hash\n+ def _hash(s):\n+ return crc32(s.encode())\n+\n if v is None:\n return [None for i in range(ps_size)]\n if len(v) == 0:\n@@ -18,13 +21,13 @@\n # (name, data) dict from push\n results = [{} for i in range(ps_size)]\n for name, data in v.items():\n- index = hash(name) % ps_size\n+ index = _hash(name) % ps_size\n results[index][name] = data\n elif isinstance(v, list):\n # name list from pull\n results = [[] for i in range(ps_size)]\n for name in v:\n- index = hash(name) % ps_size\n+ index = _hash(name) % ps_size\n results[index].append(name)\n else:\n raise TypeError('Illegal v type %s, only dict or '\n", "issue": "Use stable hashing in ps client\n\n", "before_files": [{"content": "import future\n\n\n# No partition, all in the first ps\ndef no_partition(v, ps_size):\n return [v]\n\n\n# Partition v according to the name hashing.\ndef hash_partition(v, ps_size):\n if v is None:\n return [None for i in range(ps_size)]\n if len(v) == 0:\n raise ValueError('Empty input used in HashPartition.')\n if ps_size == 1:\n return [v]\n if isinstance(v, dict):\n # (name, data) dict from push\n results = [{} for i in range(ps_size)]\n for name, data in v.items():\n index = hash(name) % ps_size\n results[index][name] = data\n elif isinstance(v, list):\n # name list from pull\n results = [[] for i in range(ps_size)]\n for name in v:\n index = hash(name) % ps_size\n results[index].append(name)\n else:\n raise TypeError('Illegal v type %s, only dict or '\n 'str list is supported.' % str(type(v)))\n return results\n\n\n# Multi-thread implementation of PSClientComm\nclass MultiThreadPSClientComm(object):\n def __init__(self, ps):\n self._ps = ps\n\n def push(self, base_step, sub_step, grads):\n if len(grads) > 0:\n self._ps.push(base_step, sub_step, grads)\n\n def pull(self, names=None, min_step=0):\n return self._ps.pull(names=names, min_step=min_step)\n\n\n# ParameterSererClient uses PSClientComm for ps data transfer.\nclass ParameterServerClient(object):\n def __init__(self,\n ps_configs=None,\n comm_class=MultiThreadPSClientComm,\n partition_func=no_partition):\n self._ps_size = 1 if partition_func == no_partition else len(ps_configs)\n self._partition_func = partition_func\n self._clients = [comm_class(ps_configs[i])\n for i in range(self._ps_size)]\n self._base_step = [0 for _ in range(self._ps_size)]\n\n def push(self, sub_step=0, grads=None):\n partition_result = self._partition_func(grads, self._ps_size)\n # TODO: multithread optimization, one thread per ps communication.\n for index, g in enumerate(partition_result):\n self._clients[index].push(self._base_step[index],\n sub_step, g)\n\n def pull(self, min_step=0, names=None):\n pull_result = {}\n partition_result = self._partition_func(names, self._ps_size)\n # TODO: multithread optimization, one thread per ps communication.\n for index, n in enumerate(partition_result):\n ps_step, ps_vars = self._clients[index].pull(\n names=n, min_step=min_step)\n self._base_step[index] = ps_step\n pull_result.update(ps_vars)\n return self.get_min_base_step(), pull_result\n\n def get_min_base_step(self):\n return min(self._base_step)\n", "path": "python/tflib/ps/ps_client.py"}]} | 1,361 | 330 |
gh_patches_debug_35540 | rasdani/github-patches | git_diff | apache__airflow-9861 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Add unittests for GCSTaskHandler
**Description**
The `GCSTaskHandler` from `airflow.utils.log.gcs_task_handler` does not have a unit test.
**Use case / motivation**
The test is necessary so that we can be able to move the `GCSTaskHandler` to its providers package(`google`)
**Related Issues**
#9386
</issue>
<code>
[start of airflow/providers/google/cloud/log/gcs_task_handler.py]
1 #
2 # Licensed to the Apache Software Foundation (ASF) under one
3 # or more contributor license agreements. See the NOTICE file
4 # distributed with this work for additional information
5 # regarding copyright ownership. The ASF licenses this file
6 # to you under the Apache License, Version 2.0 (the
7 # "License"); you may not use this file except in compliance
8 # with the License. You may obtain a copy of the License at
9 #
10 # http://www.apache.org/licenses/LICENSE-2.0
11 #
12 # Unless required by applicable law or agreed to in writing,
13 # software distributed under the License is distributed on an
14 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15 # KIND, either express or implied. See the License for the
16 # specific language governing permissions and limitations
17 # under the License.
18 import os
19 from urllib.parse import urlparse
20
21 from cached_property import cached_property
22
23 from airflow.configuration import conf
24 from airflow.exceptions import AirflowException
25 from airflow.utils.log.file_task_handler import FileTaskHandler
26 from airflow.utils.log.logging_mixin import LoggingMixin
27
28
29 class GCSTaskHandler(FileTaskHandler, LoggingMixin):
30 """
31 GCSTaskHandler is a python log handler that handles and reads
32 task instance logs. It extends airflow FileTaskHandler and
33 uploads to and reads from GCS remote storage. Upon log reading
34 failure, it reads from host machine's local disk.
35 """
36 def __init__(self, base_log_folder, gcs_log_folder, filename_template):
37 super().__init__(base_log_folder, filename_template)
38 self.remote_base = gcs_log_folder
39 self.log_relative_path = ''
40 self._hook = None
41 self.closed = False
42 self.upload_on_close = True
43
44 @cached_property
45 def hook(self):
46 """
47 Returns GCS hook.
48 """
49 remote_conn_id = conf.get('logging', 'REMOTE_LOG_CONN_ID')
50 try:
51 from airflow.providers.google.cloud.hooks.gcs import GCSHook
52 return GCSHook(
53 google_cloud_storage_conn_id=remote_conn_id
54 )
55 except Exception as e: # pylint: disable=broad-except
56 self.log.error(
57 'Could not create a GoogleCloudStorageHook with connection id '
58 '"%s". %s\n\nPlease make sure that airflow[gcp] is installed '
59 'and the GCS connection exists.', remote_conn_id, str(e)
60 )
61
62 def set_context(self, ti):
63 super().set_context(ti)
64 # Log relative path is used to construct local and remote
65 # log path to upload log files into GCS and read from the
66 # remote location.
67 self.log_relative_path = self._render_filename(ti, ti.try_number)
68 self.upload_on_close = not ti.raw
69
70 def close(self):
71 """
72 Close and upload local log file to remote storage GCS.
73 """
74 # When application exit, system shuts down all handlers by
75 # calling close method. Here we check if logger is already
76 # closed to prevent uploading the log to remote storage multiple
77 # times when `logging.shutdown` is called.
78 if self.closed:
79 return
80
81 super().close()
82
83 if not self.upload_on_close:
84 return
85
86 local_loc = os.path.join(self.local_base, self.log_relative_path)
87 remote_loc = os.path.join(self.remote_base, self.log_relative_path)
88 if os.path.exists(local_loc):
89 # read log and remove old logs to get just the latest additions
90 with open(local_loc, 'r') as logfile:
91 log = logfile.read()
92 self.gcs_write(log, remote_loc)
93
94 # Mark closed so we don't double write if close is called twice
95 self.closed = True
96
97 def _read(self, ti, try_number, metadata=None):
98 """
99 Read logs of given task instance and try_number from GCS.
100 If failed, read the log from task instance host machine.
101
102 :param ti: task instance object
103 :param try_number: task instance try_number to read logs from
104 :param metadata: log metadata,
105 can be used for steaming log reading and auto-tailing.
106 """
107 # Explicitly getting log relative path is necessary as the given
108 # task instance might be different than task instance passed in
109 # in set_context method.
110 log_relative_path = self._render_filename(ti, try_number)
111 remote_loc = os.path.join(self.remote_base, log_relative_path)
112
113 try:
114 remote_log = self.gcs_read(remote_loc)
115 log = '*** Reading remote log from {}.\n{}\n'.format(
116 remote_loc, remote_log)
117 return log, {'end_of_log': True}
118 except Exception as e: # pylint: disable=broad-except
119 log = '*** Unable to read remote log from {}\n*** {}\n\n'.format(
120 remote_loc, str(e))
121 self.log.error(log)
122 local_log, metadata = super()._read(ti, try_number)
123 log += local_log
124 return log, metadata
125
126 def gcs_read(self, remote_log_location):
127 """
128 Returns the log found at the remote_log_location.
129
130 :param remote_log_location: the log's location in remote storage
131 :type remote_log_location: str (path)
132 """
133 bkt, blob = self.parse_gcs_url(remote_log_location)
134 return self.hook.download(bkt, blob).decode('utf-8')
135
136 def gcs_write(self, log, remote_log_location, append=True):
137 """
138 Writes the log to the remote_log_location. Fails silently if no hook
139 was created.
140
141 :param log: the log to write to the remote_log_location
142 :type log: str
143 :param remote_log_location: the log's location in remote storage
144 :type remote_log_location: str (path)
145 :param append: if False, any existing log file is overwritten. If True,
146 the new log is appended to any existing logs.
147 :type append: bool
148 """
149 if append:
150 try:
151 old_log = self.gcs_read(remote_log_location)
152 log = '\n'.join([old_log, log]) if old_log else log
153 except Exception as e: # pylint: disable=broad-except
154 if not hasattr(e, 'resp') or e.resp.get('status') != '404': # pylint: disable=no-member
155 log = '*** Previous log discarded: {}\n\n'.format(str(e)) + log
156
157 try:
158 bkt, blob = self.parse_gcs_url(remote_log_location)
159 from tempfile import NamedTemporaryFile
160 with NamedTemporaryFile(mode='w+') as tmpfile:
161 tmpfile.write(log)
162 # Force the file to be flushed, since we're doing the
163 # upload from within the file context (it hasn't been
164 # closed).
165 tmpfile.flush()
166 self.hook.upload(bkt, blob, tmpfile.name)
167 except Exception as e: # pylint: disable=broad-except
168 self.log.error('Could not write logs to %s: %s', remote_log_location, e)
169
170 @staticmethod
171 def parse_gcs_url(gsurl):
172 """
173 Given a Google Cloud Storage URL (gs://<bucket>/<blob>), returns a
174 tuple containing the corresponding bucket and blob.
175 """
176 parsed_url = urlparse(gsurl)
177 if not parsed_url.netloc:
178 raise AirflowException('Please provide a bucket name')
179 else:
180 bucket = parsed_url.netloc
181 blob = parsed_url.path.strip('/')
182 return bucket, blob
183
[end of airflow/providers/google/cloud/log/gcs_task_handler.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/airflow/providers/google/cloud/log/gcs_task_handler.py b/airflow/providers/google/cloud/log/gcs_task_handler.py
--- a/airflow/providers/google/cloud/log/gcs_task_handler.py
+++ b/airflow/providers/google/cloud/log/gcs_task_handler.py
@@ -133,7 +133,7 @@
bkt, blob = self.parse_gcs_url(remote_log_location)
return self.hook.download(bkt, blob).decode('utf-8')
- def gcs_write(self, log, remote_log_location, append=True):
+ def gcs_write(self, log, remote_log_location):
"""
Writes the log to the remote_log_location. Fails silently if no hook
was created.
@@ -142,28 +142,17 @@
:type log: str
:param remote_log_location: the log's location in remote storage
:type remote_log_location: str (path)
- :param append: if False, any existing log file is overwritten. If True,
- the new log is appended to any existing logs.
- :type append: bool
"""
- if append:
- try:
- old_log = self.gcs_read(remote_log_location)
- log = '\n'.join([old_log, log]) if old_log else log
- except Exception as e: # pylint: disable=broad-except
- if not hasattr(e, 'resp') or e.resp.get('status') != '404': # pylint: disable=no-member
- log = '*** Previous log discarded: {}\n\n'.format(str(e)) + log
+ try:
+ old_log = self.gcs_read(remote_log_location)
+ log = '\n'.join([old_log, log]) if old_log else log
+ except Exception as e: # pylint: disable=broad-except
+ if not hasattr(e, 'resp') or e.resp.get('status') != '404': # pylint: disable=no-member
+ log = '*** Previous log discarded: {}\n\n'.format(str(e)) + log
try:
bkt, blob = self.parse_gcs_url(remote_log_location)
- from tempfile import NamedTemporaryFile
- with NamedTemporaryFile(mode='w+') as tmpfile:
- tmpfile.write(log)
- # Force the file to be flushed, since we're doing the
- # upload from within the file context (it hasn't been
- # closed).
- tmpfile.flush()
- self.hook.upload(bkt, blob, tmpfile.name)
+ self.hook.upload(bkt, blob, data=log)
except Exception as e: # pylint: disable=broad-except
self.log.error('Could not write logs to %s: %s', remote_log_location, e)
| {"golden_diff": "diff --git a/airflow/providers/google/cloud/log/gcs_task_handler.py b/airflow/providers/google/cloud/log/gcs_task_handler.py\n--- a/airflow/providers/google/cloud/log/gcs_task_handler.py\n+++ b/airflow/providers/google/cloud/log/gcs_task_handler.py\n@@ -133,7 +133,7 @@\n bkt, blob = self.parse_gcs_url(remote_log_location)\n return self.hook.download(bkt, blob).decode('utf-8')\n \n- def gcs_write(self, log, remote_log_location, append=True):\n+ def gcs_write(self, log, remote_log_location):\n \"\"\"\n Writes the log to the remote_log_location. Fails silently if no hook\n was created.\n@@ -142,28 +142,17 @@\n :type log: str\n :param remote_log_location: the log's location in remote storage\n :type remote_log_location: str (path)\n- :param append: if False, any existing log file is overwritten. If True,\n- the new log is appended to any existing logs.\n- :type append: bool\n \"\"\"\n- if append:\n- try:\n- old_log = self.gcs_read(remote_log_location)\n- log = '\\n'.join([old_log, log]) if old_log else log\n- except Exception as e: # pylint: disable=broad-except\n- if not hasattr(e, 'resp') or e.resp.get('status') != '404': # pylint: disable=no-member\n- log = '*** Previous log discarded: {}\\n\\n'.format(str(e)) + log\n+ try:\n+ old_log = self.gcs_read(remote_log_location)\n+ log = '\\n'.join([old_log, log]) if old_log else log\n+ except Exception as e: # pylint: disable=broad-except\n+ if not hasattr(e, 'resp') or e.resp.get('status') != '404': # pylint: disable=no-member\n+ log = '*** Previous log discarded: {}\\n\\n'.format(str(e)) + log\n \n try:\n bkt, blob = self.parse_gcs_url(remote_log_location)\n- from tempfile import NamedTemporaryFile\n- with NamedTemporaryFile(mode='w+') as tmpfile:\n- tmpfile.write(log)\n- # Force the file to be flushed, since we're doing the\n- # upload from within the file context (it hasn't been\n- # closed).\n- tmpfile.flush()\n- self.hook.upload(bkt, blob, tmpfile.name)\n+ self.hook.upload(bkt, blob, data=log)\n except Exception as e: # pylint: disable=broad-except\n self.log.error('Could not write logs to %s: %s', remote_log_location, e)\n", "issue": "Add unittests for GCSTaskHandler\n**Description**\r\n\r\nThe `GCSTaskHandler` from `airflow.utils.log.gcs_task_handler` does not have a unit test. \r\n\r\n**Use case / motivation**\r\n\r\nThe test is necessary so that we can be able to move the `GCSTaskHandler` to its providers package(`google`)\r\n\r\n**Related Issues**\r\n#9386 \r\n\n", "before_files": [{"content": "#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License. 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,\n# software distributed under the License is distributed on an\n# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n# KIND, either express or implied. See the License for the\n# specific language governing permissions and limitations\n# under the License.\nimport os\nfrom urllib.parse import urlparse\n\nfrom cached_property import cached_property\n\nfrom airflow.configuration import conf\nfrom airflow.exceptions import AirflowException\nfrom airflow.utils.log.file_task_handler import FileTaskHandler\nfrom airflow.utils.log.logging_mixin import LoggingMixin\n\n\nclass GCSTaskHandler(FileTaskHandler, LoggingMixin):\n \"\"\"\n GCSTaskHandler is a python log handler that handles and reads\n task instance logs. It extends airflow FileTaskHandler and\n uploads to and reads from GCS remote storage. Upon log reading\n failure, it reads from host machine's local disk.\n \"\"\"\n def __init__(self, base_log_folder, gcs_log_folder, filename_template):\n super().__init__(base_log_folder, filename_template)\n self.remote_base = gcs_log_folder\n self.log_relative_path = ''\n self._hook = None\n self.closed = False\n self.upload_on_close = True\n\n @cached_property\n def hook(self):\n \"\"\"\n Returns GCS hook.\n \"\"\"\n remote_conn_id = conf.get('logging', 'REMOTE_LOG_CONN_ID')\n try:\n from airflow.providers.google.cloud.hooks.gcs import GCSHook\n return GCSHook(\n google_cloud_storage_conn_id=remote_conn_id\n )\n except Exception as e: # pylint: disable=broad-except\n self.log.error(\n 'Could not create a GoogleCloudStorageHook with connection id '\n '\"%s\". %s\\n\\nPlease make sure that airflow[gcp] is installed '\n 'and the GCS connection exists.', remote_conn_id, str(e)\n )\n\n def set_context(self, ti):\n super().set_context(ti)\n # Log relative path is used to construct local and remote\n # log path to upload log files into GCS and read from the\n # remote location.\n self.log_relative_path = self._render_filename(ti, ti.try_number)\n self.upload_on_close = not ti.raw\n\n def close(self):\n \"\"\"\n Close and upload local log file to remote storage GCS.\n \"\"\"\n # When application exit, system shuts down all handlers by\n # calling close method. Here we check if logger is already\n # closed to prevent uploading the log to remote storage multiple\n # times when `logging.shutdown` is called.\n if self.closed:\n return\n\n super().close()\n\n if not self.upload_on_close:\n return\n\n local_loc = os.path.join(self.local_base, self.log_relative_path)\n remote_loc = os.path.join(self.remote_base, self.log_relative_path)\n if os.path.exists(local_loc):\n # read log and remove old logs to get just the latest additions\n with open(local_loc, 'r') as logfile:\n log = logfile.read()\n self.gcs_write(log, remote_loc)\n\n # Mark closed so we don't double write if close is called twice\n self.closed = True\n\n def _read(self, ti, try_number, metadata=None):\n \"\"\"\n Read logs of given task instance and try_number from GCS.\n If failed, read the log from task instance host machine.\n\n :param ti: task instance object\n :param try_number: task instance try_number to read logs from\n :param metadata: log metadata,\n can be used for steaming log reading and auto-tailing.\n \"\"\"\n # Explicitly getting log relative path is necessary as the given\n # task instance might be different than task instance passed in\n # in set_context method.\n log_relative_path = self._render_filename(ti, try_number)\n remote_loc = os.path.join(self.remote_base, log_relative_path)\n\n try:\n remote_log = self.gcs_read(remote_loc)\n log = '*** Reading remote log from {}.\\n{}\\n'.format(\n remote_loc, remote_log)\n return log, {'end_of_log': True}\n except Exception as e: # pylint: disable=broad-except\n log = '*** Unable to read remote log from {}\\n*** {}\\n\\n'.format(\n remote_loc, str(e))\n self.log.error(log)\n local_log, metadata = super()._read(ti, try_number)\n log += local_log\n return log, metadata\n\n def gcs_read(self, remote_log_location):\n \"\"\"\n Returns the log found at the remote_log_location.\n\n :param remote_log_location: the log's location in remote storage\n :type remote_log_location: str (path)\n \"\"\"\n bkt, blob = self.parse_gcs_url(remote_log_location)\n return self.hook.download(bkt, blob).decode('utf-8')\n\n def gcs_write(self, log, remote_log_location, append=True):\n \"\"\"\n Writes the log to the remote_log_location. Fails silently if no hook\n was created.\n\n :param log: the log to write to the remote_log_location\n :type log: str\n :param remote_log_location: the log's location in remote storage\n :type remote_log_location: str (path)\n :param append: if False, any existing log file is overwritten. If True,\n the new log is appended to any existing logs.\n :type append: bool\n \"\"\"\n if append:\n try:\n old_log = self.gcs_read(remote_log_location)\n log = '\\n'.join([old_log, log]) if old_log else log\n except Exception as e: # pylint: disable=broad-except\n if not hasattr(e, 'resp') or e.resp.get('status') != '404': # pylint: disable=no-member\n log = '*** Previous log discarded: {}\\n\\n'.format(str(e)) + log\n\n try:\n bkt, blob = self.parse_gcs_url(remote_log_location)\n from tempfile import NamedTemporaryFile\n with NamedTemporaryFile(mode='w+') as tmpfile:\n tmpfile.write(log)\n # Force the file to be flushed, since we're doing the\n # upload from within the file context (it hasn't been\n # closed).\n tmpfile.flush()\n self.hook.upload(bkt, blob, tmpfile.name)\n except Exception as e: # pylint: disable=broad-except\n self.log.error('Could not write logs to %s: %s', remote_log_location, e)\n\n @staticmethod\n def parse_gcs_url(gsurl):\n \"\"\"\n Given a Google Cloud Storage URL (gs://<bucket>/<blob>), returns a\n tuple containing the corresponding bucket and blob.\n \"\"\"\n parsed_url = urlparse(gsurl)\n if not parsed_url.netloc:\n raise AirflowException('Please provide a bucket name')\n else:\n bucket = parsed_url.netloc\n blob = parsed_url.path.strip('/')\n return bucket, blob\n", "path": "airflow/providers/google/cloud/log/gcs_task_handler.py"}]} | 2,706 | 625 |
gh_patches_debug_42731 | rasdani/github-patches | git_diff | napari__napari-5299 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Add ability to force sync slicing
# Description
The `LayerSlicer` should perform asynchronous slicing when all layers being sliced are asynchronously sliceable. In some cases, we might want to temporarily force slicing to be synchronous. For example, we might consider usage like
```python
with viewer.force_sync():
viewer.dims.current_step = (5, 0, 0)
image = viewer.screenshot()
```
where we need to wait for slicing to finish before taking a screenshot.
This task should define public ways to allow synchronous slicing to be forced. This should include a temporary force with the context manager above, and may also include forcing sync slicing for a particular run/session of napari (so that plugins can easily force it once). We may also consider adding a setting that causes sync slicing to always be forced.
## Update
Kim: I started to add this to the initial base slicer layer PR, but ended up taking it out. Its not much code, but might be useful for reference. https://github.com/napari/napari/pull/5170/commits/56d4244112d0bc001e5f82ae31a7e5058cca1e51
</issue>
<code>
[start of napari/components/_layer_slicer.py]
1 from __future__ import annotations
2
3 import logging
4 from concurrent.futures import Executor, Future, ThreadPoolExecutor
5 from threading import RLock
6 from typing import (
7 Callable,
8 Dict,
9 Iterable,
10 Optional,
11 Protocol,
12 Tuple,
13 TypeVar,
14 runtime_checkable,
15 )
16
17 from napari.components import Dims
18 from napari.layers import Layer
19 from napari.utils.events.event import EmitterGroup, Event
20
21 logger = logging.getLogger("napari.components._layer_slicer")
22
23
24 # Layers that can be asynchronously sliced must be able to make
25 # a slice request that can be called and will produce a slice
26 # response. The request and response types will vary per layer
27 # type, which means that the values of the dictionary result of
28 # ``_slice_layers`` cannot be fixed to a single type.
29
30 _SliceResponse = TypeVar('_SliceResponse')
31 _SliceRequest = Callable[[], _SliceResponse]
32
33
34 @runtime_checkable
35 class _AsyncSliceable(Protocol[_SliceResponse]):
36 def _make_slice_request(self, dims: Dims) -> _SliceRequest[_SliceResponse]:
37 ...
38
39
40 class _LayerSlicer:
41 """
42 High level class to control the creation of a slice (via a slice request),
43 submit it (synchronously or asynchronously) to a thread pool, and emit the
44 results when complete.
45
46 Events
47 ------
48 ready
49 emitted after slicing is done with a dict value that maps from layer
50 to slice response. Note that this may be emitted on the main or
51 a non-main thread. If usage of this event relies on something happening
52 on the main thread, actions should be taken to ensure that the callback
53 is also executed on the main thread (e.g. by decorating the callback
54 with `@ensure_main_thread`).
55 """
56
57 def __init__(self):
58 """
59 Attributes
60 ----------
61 _executor : concurrent.futures.ThreadPoolExecutor
62 manager for the slicing threading
63 _layers_to_task : dict
64 task storage for cancellation logic
65 _lock_layers_to_task : threading.RLock
66 lock to guard against changes to `_layers_to_task` when finding,
67 adding, or removing tasks.
68 """
69 self.events = EmitterGroup(source=self, ready=Event)
70 self._executor: Executor = ThreadPoolExecutor(max_workers=1)
71 self._layers_to_task: Dict[Tuple[Layer], Future] = {}
72 self._lock_layers_to_task = RLock()
73
74 def slice_layers_async(
75 self, layers: Iterable[Layer], dims: Dims
76 ) -> Future[dict]:
77 """This should only be called from the main thread.
78
79 Creates a new task and adds it to the _layers_to_task dict. Cancels
80 all tasks currently pending for that layer tuple.
81
82 Submitting multiple layers at one generates multiple requests (stored in a dict),
83 but only ONE task.
84
85 If multiple layers are sliced, any task that contains only one of those
86 layers can safely be cancelled. If a single layer is sliced, it will
87 wait for any existing tasks that include that layer AND another layer,
88 In other words, it will only cancel if the new task will replace the
89 slices of all the layers in the pending task.
90 """
91 # Cancel any tasks that are slicing a subset of the layers
92 # being sliced now. This allows us to slice arbitrary sets of
93 # layers with some sensible and not too complex cancellation
94 # policy.
95 if existing_task := self._find_existing_task(layers):
96 logger.debug('Cancelling task for %s', layers)
97 existing_task.cancel()
98
99 # Not all layer types will initially be asynchronously sliceable.
100 # The following logic gives us a way to handle those in the short
101 # term as we develop, and also in the long term if there are cases
102 # when we want to perform sync slicing anyway.
103 requests = {}
104 for layer in layers:
105 if isinstance(layer, _AsyncSliceable):
106 requests[layer] = layer._make_slice_request(dims)
107 else:
108 layer._slice_dims(dims.point, dims.ndisplay, dims.order)
109 # create task for slicing of each request/layer
110 task = self._executor.submit(self._slice_layers, requests)
111
112 # store task for cancellation logic
113 # this is purposefully done before adding the done callback to ensure
114 # that the task is added before the done callback can be executed
115 with self._lock_layers_to_task:
116 self._layers_to_task[tuple(requests)] = task
117
118 task.add_done_callback(self._on_slice_done)
119
120 return task
121
122 def shutdown(self) -> None:
123 """Should be called from the main thread when this is no longer needed."""
124 self._executor.shutdown()
125
126 def _slice_layers(self, requests: Dict) -> Dict:
127 """
128 Iterates through a dictionary of request objects and call the slice
129 on each individual layer. Can be called from the main or slicing thread.
130
131 Attributes
132 ----------
133 requests: dict[Layer, SliceRequest]
134 Dictionary of request objects to be used for constructing the slice
135
136 Returns
137 -------
138 dict[Layer, SliceResponse]: which contains the results of the slice
139 """
140 return {layer: request() for layer, request in requests.items()}
141
142 def _on_slice_done(self, task: Future[Dict]) -> None:
143 """
144 This is the "done_callback" which is added to each task.
145 Can be called from the main or slicing thread.
146 """
147 if not self._try_to_remove_task(task):
148 logger.debug('Task not found')
149 return
150
151 if task.cancelled():
152 logger.debug('Cancelled task')
153 return
154 result = task.result()
155 self.events.ready(Event('ready', value=result))
156
157 def _try_to_remove_task(self, task: Future[Dict]) -> bool:
158 """
159 Attempt to remove task, return false if task not found, return true
160 if task is found and removed from layers_to_task dict.
161
162 This function provides a lock to ensure that the layers_to_task dict
163 is unmodified during this process.
164 """
165 with self._lock_layers_to_task:
166 for k_layers, v_task in self._layers_to_task.items():
167 if v_task == task:
168 del self._layers_to_task[k_layers]
169 return True
170 return False
171
172 def _find_existing_task(
173 self, layers: Iterable[Layer]
174 ) -> Optional[Future[Dict]]:
175 """Find the task associated with a list of layers. Returns the first
176 task found for which the layers of the task are a subset of the input
177 layers.
178
179 This function provides a lock to ensure that the layers_to_task dict
180 is unmodified during this process.
181 """
182 with self._lock_layers_to_task:
183 layer_set = set(layers)
184 for task_layers, task in self._layers_to_task.items():
185 if set(task_layers).issubset(layer_set):
186 logger.debug(f'Found existing task for {task_layers}')
187 return task
188 return None
189
[end of napari/components/_layer_slicer.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/napari/components/_layer_slicer.py b/napari/components/_layer_slicer.py
--- a/napari/components/_layer_slicer.py
+++ b/napari/components/_layer_slicer.py
@@ -1,7 +1,8 @@
from __future__ import annotations
import logging
-from concurrent.futures import Executor, Future, ThreadPoolExecutor
+from concurrent.futures import Executor, Future, ThreadPoolExecutor, wait
+from contextlib import contextmanager
from threading import RLock
from typing import (
Callable,
@@ -60,6 +61,8 @@
----------
_executor : concurrent.futures.ThreadPoolExecutor
manager for the slicing threading
+ _force_sync: bool
+ if true, forces slicing to execute synchronously
_layers_to_task : dict
task storage for cancellation logic
_lock_layers_to_task : threading.RLock
@@ -68,9 +71,49 @@
"""
self.events = EmitterGroup(source=self, ready=Event)
self._executor: Executor = ThreadPoolExecutor(max_workers=1)
+ self._force_sync = False
self._layers_to_task: Dict[Tuple[Layer], Future] = {}
self._lock_layers_to_task = RLock()
+ @contextmanager
+ def force_sync(self):
+ """Context manager to temporarily force slicing to be synchronous.
+ This should only be used from the main thread.
+
+ >>> layer_slicer = _LayerSlicer()
+ >>> layer = Image(...) # an async-ready layer
+ >>> with layer_slice.force_sync():
+ >>> layer_slicer.slice_layers_async(layers=[layer], dims=Dims())
+ """
+ prev = self._force_sync
+ self._force_sync = True
+ try:
+ yield None
+ finally:
+ self._force_sync = prev
+
+ def wait_until_idle(self, timeout: Optional[float] = None) -> None:
+ """Wait for all slicing tasks to complete before returning.
+
+ Attributes
+ ----------
+ timeout: float or None
+ (Optional) time in seconds to wait before raising TimeoutError. If set as None,
+ there is no limit to the wait time. Defaults to None
+
+ Raises
+ ------
+ TimeoutError: when the timeout limit has been exceeded and the task is
+ not yet complete
+ """
+ futures = self._layers_to_task.values()
+ _, not_done_futures = wait(futures, timeout=timeout)
+
+ if len(not_done_futures) > 0:
+ raise TimeoutError(
+ f'Slicing {len(not_done_futures)} tasks did not complete within timeout ({timeout}s).'
+ )
+
def slice_layers_async(
self, layers: Iterable[Layer], dims: Dims
) -> Future[dict]:
@@ -101,14 +144,20 @@
# term as we develop, and also in the long term if there are cases
# when we want to perform sync slicing anyway.
requests = {}
+ sync_layers = []
for layer in layers:
- if isinstance(layer, _AsyncSliceable):
+ if isinstance(layer, _AsyncSliceable) and not self._force_sync:
requests[layer] = layer._make_slice_request(dims)
else:
- layer._slice_dims(dims.point, dims.ndisplay, dims.order)
+ sync_layers.append(layer)
+
# create task for slicing of each request/layer
task = self._executor.submit(self._slice_layers, requests)
+ # submit the sync layers (purposefully placed after async submission)
+ for layer in sync_layers:
+ layer._slice_dims(dims.point, dims.ndisplay, dims.order)
+
# store task for cancellation logic
# this is purposefully done before adding the done callback to ensure
# that the task is added before the done callback can be executed
| {"golden_diff": "diff --git a/napari/components/_layer_slicer.py b/napari/components/_layer_slicer.py\n--- a/napari/components/_layer_slicer.py\n+++ b/napari/components/_layer_slicer.py\n@@ -1,7 +1,8 @@\n from __future__ import annotations\n \n import logging\n-from concurrent.futures import Executor, Future, ThreadPoolExecutor\n+from concurrent.futures import Executor, Future, ThreadPoolExecutor, wait\n+from contextlib import contextmanager\n from threading import RLock\n from typing import (\n Callable,\n@@ -60,6 +61,8 @@\n ----------\n _executor : concurrent.futures.ThreadPoolExecutor\n manager for the slicing threading\n+ _force_sync: bool\n+ if true, forces slicing to execute synchronously\n _layers_to_task : dict\n task storage for cancellation logic\n _lock_layers_to_task : threading.RLock\n@@ -68,9 +71,49 @@\n \"\"\"\n self.events = EmitterGroup(source=self, ready=Event)\n self._executor: Executor = ThreadPoolExecutor(max_workers=1)\n+ self._force_sync = False\n self._layers_to_task: Dict[Tuple[Layer], Future] = {}\n self._lock_layers_to_task = RLock()\n \n+ @contextmanager\n+ def force_sync(self):\n+ \"\"\"Context manager to temporarily force slicing to be synchronous.\n+ This should only be used from the main thread.\n+\n+ >>> layer_slicer = _LayerSlicer()\n+ >>> layer = Image(...) # an async-ready layer\n+ >>> with layer_slice.force_sync():\n+ >>> layer_slicer.slice_layers_async(layers=[layer], dims=Dims())\n+ \"\"\"\n+ prev = self._force_sync\n+ self._force_sync = True\n+ try:\n+ yield None\n+ finally:\n+ self._force_sync = prev\n+\n+ def wait_until_idle(self, timeout: Optional[float] = None) -> None:\n+ \"\"\"Wait for all slicing tasks to complete before returning.\n+\n+ Attributes\n+ ----------\n+ timeout: float or None\n+ (Optional) time in seconds to wait before raising TimeoutError. If set as None,\n+ there is no limit to the wait time. Defaults to None\n+\n+ Raises\n+ ------\n+ TimeoutError: when the timeout limit has been exceeded and the task is\n+ not yet complete\n+ \"\"\"\n+ futures = self._layers_to_task.values()\n+ _, not_done_futures = wait(futures, timeout=timeout)\n+\n+ if len(not_done_futures) > 0:\n+ raise TimeoutError(\n+ f'Slicing {len(not_done_futures)} tasks did not complete within timeout ({timeout}s).'\n+ )\n+\n def slice_layers_async(\n self, layers: Iterable[Layer], dims: Dims\n ) -> Future[dict]:\n@@ -101,14 +144,20 @@\n # term as we develop, and also in the long term if there are cases\n # when we want to perform sync slicing anyway.\n requests = {}\n+ sync_layers = []\n for layer in layers:\n- if isinstance(layer, _AsyncSliceable):\n+ if isinstance(layer, _AsyncSliceable) and not self._force_sync:\n requests[layer] = layer._make_slice_request(dims)\n else:\n- layer._slice_dims(dims.point, dims.ndisplay, dims.order)\n+ sync_layers.append(layer)\n+\n # create task for slicing of each request/layer\n task = self._executor.submit(self._slice_layers, requests)\n \n+ # submit the sync layers (purposefully placed after async submission)\n+ for layer in sync_layers:\n+ layer._slice_dims(dims.point, dims.ndisplay, dims.order)\n+\n # store task for cancellation logic\n # this is purposefully done before adding the done callback to ensure\n # that the task is added before the done callback can be executed\n", "issue": "Add ability to force sync slicing\n# Description\n\nThe `LayerSlicer` should perform asynchronous slicing when all layers being sliced are asynchronously sliceable. In some cases, we might want to temporarily force slicing to be synchronous. For example, we might consider usage like\n\n```python\nwith viewer.force_sync():\n viewer.dims.current_step = (5, 0, 0)\nimage = viewer.screenshot()\n```\n\nwhere we need to wait for slicing to finish before taking a screenshot.\n\nThis task should define public ways to allow synchronous slicing to be forced. This should include a temporary force with the context manager above, and may also include forcing sync slicing for a particular run/session of napari (so that plugins can easily force it once). We may also consider adding a setting that causes sync slicing to always be forced.\n\n## Update\n\nKim: I started to add this to the initial base slicer layer PR, but ended up taking it out. Its not much code, but might be useful for reference. https://github.com/napari/napari/pull/5170/commits/56d4244112d0bc001e5f82ae31a7e5058cca1e51\n", "before_files": [{"content": "from __future__ import annotations\n\nimport logging\nfrom concurrent.futures import Executor, Future, ThreadPoolExecutor\nfrom threading import RLock\nfrom typing import (\n Callable,\n Dict,\n Iterable,\n Optional,\n Protocol,\n Tuple,\n TypeVar,\n runtime_checkable,\n)\n\nfrom napari.components import Dims\nfrom napari.layers import Layer\nfrom napari.utils.events.event import EmitterGroup, Event\n\nlogger = logging.getLogger(\"napari.components._layer_slicer\")\n\n\n# Layers that can be asynchronously sliced must be able to make\n# a slice request that can be called and will produce a slice\n# response. The request and response types will vary per layer\n# type, which means that the values of the dictionary result of\n# ``_slice_layers`` cannot be fixed to a single type.\n\n_SliceResponse = TypeVar('_SliceResponse')\n_SliceRequest = Callable[[], _SliceResponse]\n\n\n@runtime_checkable\nclass _AsyncSliceable(Protocol[_SliceResponse]):\n def _make_slice_request(self, dims: Dims) -> _SliceRequest[_SliceResponse]:\n ...\n\n\nclass _LayerSlicer:\n \"\"\"\n High level class to control the creation of a slice (via a slice request),\n submit it (synchronously or asynchronously) to a thread pool, and emit the\n results when complete.\n\n Events\n ------\n ready\n emitted after slicing is done with a dict value that maps from layer\n to slice response. Note that this may be emitted on the main or\n a non-main thread. If usage of this event relies on something happening\n on the main thread, actions should be taken to ensure that the callback\n is also executed on the main thread (e.g. by decorating the callback\n with `@ensure_main_thread`).\n \"\"\"\n\n def __init__(self):\n \"\"\"\n Attributes\n ----------\n _executor : concurrent.futures.ThreadPoolExecutor\n manager for the slicing threading\n _layers_to_task : dict\n task storage for cancellation logic\n _lock_layers_to_task : threading.RLock\n lock to guard against changes to `_layers_to_task` when finding,\n adding, or removing tasks.\n \"\"\"\n self.events = EmitterGroup(source=self, ready=Event)\n self._executor: Executor = ThreadPoolExecutor(max_workers=1)\n self._layers_to_task: Dict[Tuple[Layer], Future] = {}\n self._lock_layers_to_task = RLock()\n\n def slice_layers_async(\n self, layers: Iterable[Layer], dims: Dims\n ) -> Future[dict]:\n \"\"\"This should only be called from the main thread.\n\n Creates a new task and adds it to the _layers_to_task dict. Cancels\n all tasks currently pending for that layer tuple.\n\n Submitting multiple layers at one generates multiple requests (stored in a dict),\n but only ONE task.\n\n If multiple layers are sliced, any task that contains only one of those\n layers can safely be cancelled. If a single layer is sliced, it will\n wait for any existing tasks that include that layer AND another layer,\n In other words, it will only cancel if the new task will replace the\n slices of all the layers in the pending task.\n \"\"\"\n # Cancel any tasks that are slicing a subset of the layers\n # being sliced now. This allows us to slice arbitrary sets of\n # layers with some sensible and not too complex cancellation\n # policy.\n if existing_task := self._find_existing_task(layers):\n logger.debug('Cancelling task for %s', layers)\n existing_task.cancel()\n\n # Not all layer types will initially be asynchronously sliceable.\n # The following logic gives us a way to handle those in the short\n # term as we develop, and also in the long term if there are cases\n # when we want to perform sync slicing anyway.\n requests = {}\n for layer in layers:\n if isinstance(layer, _AsyncSliceable):\n requests[layer] = layer._make_slice_request(dims)\n else:\n layer._slice_dims(dims.point, dims.ndisplay, dims.order)\n # create task for slicing of each request/layer\n task = self._executor.submit(self._slice_layers, requests)\n\n # store task for cancellation logic\n # this is purposefully done before adding the done callback to ensure\n # that the task is added before the done callback can be executed\n with self._lock_layers_to_task:\n self._layers_to_task[tuple(requests)] = task\n\n task.add_done_callback(self._on_slice_done)\n\n return task\n\n def shutdown(self) -> None:\n \"\"\"Should be called from the main thread when this is no longer needed.\"\"\"\n self._executor.shutdown()\n\n def _slice_layers(self, requests: Dict) -> Dict:\n \"\"\"\n Iterates through a dictionary of request objects and call the slice\n on each individual layer. Can be called from the main or slicing thread.\n\n Attributes\n ----------\n requests: dict[Layer, SliceRequest]\n Dictionary of request objects to be used for constructing the slice\n\n Returns\n -------\n dict[Layer, SliceResponse]: which contains the results of the slice\n \"\"\"\n return {layer: request() for layer, request in requests.items()}\n\n def _on_slice_done(self, task: Future[Dict]) -> None:\n \"\"\"\n This is the \"done_callback\" which is added to each task.\n Can be called from the main or slicing thread.\n \"\"\"\n if not self._try_to_remove_task(task):\n logger.debug('Task not found')\n return\n\n if task.cancelled():\n logger.debug('Cancelled task')\n return\n result = task.result()\n self.events.ready(Event('ready', value=result))\n\n def _try_to_remove_task(self, task: Future[Dict]) -> bool:\n \"\"\"\n Attempt to remove task, return false if task not found, return true\n if task is found and removed from layers_to_task dict.\n\n This function provides a lock to ensure that the layers_to_task dict\n is unmodified during this process.\n \"\"\"\n with self._lock_layers_to_task:\n for k_layers, v_task in self._layers_to_task.items():\n if v_task == task:\n del self._layers_to_task[k_layers]\n return True\n return False\n\n def _find_existing_task(\n self, layers: Iterable[Layer]\n ) -> Optional[Future[Dict]]:\n \"\"\"Find the task associated with a list of layers. Returns the first\n task found for which the layers of the task are a subset of the input\n layers.\n\n This function provides a lock to ensure that the layers_to_task dict\n is unmodified during this process.\n \"\"\"\n with self._lock_layers_to_task:\n layer_set = set(layers)\n for task_layers, task in self._layers_to_task.items():\n if set(task_layers).issubset(layer_set):\n logger.debug(f'Found existing task for {task_layers}')\n return task\n return None\n", "path": "napari/components/_layer_slicer.py"}]} | 2,779 | 867 |
gh_patches_debug_16162 | rasdani/github-patches | git_diff | readthedocs__readthedocs.org-2721 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Support latest Pygments (for improved Haskell syntax, and more)
### Change Requested
The use of `Pygments==2.2.0` (or newer, potentially) to highlight code.
### Background
As part of a [syntax highlighting problem noted on Haskell-Servant](https://github.com/haskell-servant/servant/issues/359), @teh pushed a [PR for Pygments](https://bitbucket.org/birkenfeld/pygments-main/pull-requests/685/two-haskell-fixes/diff) that was merged a while ago.
I've submitted [a Pygments dependency bump in the Servant codebase](https://github.com/haskell-servant/servant/compare/master...declension:359-upgrade-pygments) which works locally, but as we use https://readthedocs.org for actually hosting, it won't help solve the real problem unless Pygments is upgraded here too...
</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 self.config.pip_install or getattr(settings, 'USE_PIP_INSTALL', False):
47 extra_req_param = ''
48 if self.config.extra_requirements:
49 extra_req_param = '[{0}]'.format(
50 ','.join(self.config.extra_requirements))
51 self.build_env.run(
52 'python',
53 self.venv_bin(filename='pip'),
54 'install',
55 '--ignore-installed',
56 '--cache-dir',
57 self.project.pip_cache_path,
58 '.{0}'.format(extra_req_param),
59 cwd=self.checkout_path,
60 bin_path=self.venv_bin()
61 )
62 else:
63 self.build_env.run(
64 'python',
65 'setup.py',
66 'install',
67 '--force',
68 cwd=self.checkout_path,
69 bin_path=self.venv_bin()
70 )
71
72 def venv_bin(self, filename=None):
73 """Return path to the virtualenv bin path, or a specific binary
74
75 :param filename: If specified, add this filename to the path return
76 :returns: Path to virtualenv bin or filename in virtualenv bin
77 """
78 parts = [self.venv_path(), 'bin']
79 if filename is not None:
80 parts.append(filename)
81 return os.path.join(*parts)
82
83
84 class Virtualenv(PythonEnvironment):
85
86 def venv_path(self):
87 return os.path.join(self.project.doc_path, 'envs', self.version.slug)
88
89 def setup_base(self):
90 site_packages = '--no-site-packages'
91 if self.config.use_system_site_packages:
92 site_packages = '--system-site-packages'
93 env_path = self.venv_path()
94 self.build_env.run(
95 self.config.python_interpreter,
96 '-mvirtualenv',
97 site_packages,
98 '--no-download',
99 env_path,
100 bin_path=None, # Don't use virtualenv bin that doesn't exist yet
101 )
102
103 def install_core_requirements(self):
104 requirements = [
105 'sphinx==1.5.3',
106 'Pygments==2.1.3',
107 'setuptools==28.8.0',
108 'docutils==0.13.1',
109 'mkdocs==0.15.0',
110 'mock==1.0.1',
111 'pillow==2.6.1',
112 ('git+https://github.com/rtfd/readthedocs-sphinx-ext.git'
113 '@0.6-alpha#egg=readthedocs-sphinx-ext'),
114 'sphinx-rtd-theme<0.3',
115 'alabaster>=0.7,<0.8,!=0.7.5',
116 'commonmark==0.5.4',
117 'recommonmark==0.4.0',
118 ]
119
120 cmd = [
121 'python',
122 self.venv_bin(filename='pip'),
123 'install',
124 '--use-wheel',
125 '-U',
126 '--cache-dir',
127 self.project.pip_cache_path,
128 ]
129 if self.config.use_system_site_packages:
130 # Other code expects sphinx-build to be installed inside the
131 # virtualenv. Using the -I option makes sure it gets installed
132 # even if it is already installed system-wide (and
133 # --system-site-packages is used)
134 cmd.append('-I')
135 cmd.extend(requirements)
136 self.build_env.run(
137 *cmd,
138 bin_path=self.venv_bin()
139 )
140
141 def install_user_requirements(self):
142 requirements_file_path = self.config.requirements_file
143 if not requirements_file_path:
144 builder_class = get_builder_class(self.project.documentation_type)
145 docs_dir = (builder_class(build_env=self.build_env, python_env=self)
146 .docs_dir())
147 for path in [docs_dir, '']:
148 for req_file in ['pip_requirements.txt', 'requirements.txt']:
149 test_path = os.path.join(self.checkout_path, path, req_file)
150 if os.path.exists(test_path):
151 requirements_file_path = test_path
152 break
153
154 if requirements_file_path:
155 self.build_env.run(
156 'python',
157 self.venv_bin(filename='pip'),
158 'install',
159 '--exists-action=w',
160 '--cache-dir',
161 self.project.pip_cache_path,
162 '-r{0}'.format(requirements_file_path),
163 cwd=self.checkout_path,
164 bin_path=self.venv_bin()
165 )
166
167
168 class Conda(PythonEnvironment):
169
170 def venv_path(self):
171 return os.path.join(self.project.doc_path, 'conda', self.version.slug)
172
173 def setup_base(self):
174 conda_env_path = os.path.join(self.project.doc_path, 'conda')
175 version_path = os.path.join(conda_env_path, self.version.slug)
176
177 if os.path.exists(version_path):
178 # Re-create conda directory each time to keep fresh state
179 self._log('Removing existing conda directory')
180 shutil.rmtree(version_path)
181 self.build_env.run(
182 'conda',
183 'env',
184 'create',
185 '--name',
186 self.version.slug,
187 '--file',
188 self.config.conda_file,
189 bin_path=None, # Don't use conda bin that doesn't exist yet
190 )
191
192 def install_core_requirements(self):
193
194 # Use conda for requirements it packages
195 requirements = [
196 'sphinx==1.3.5',
197 'Pygments==2.1.1',
198 'docutils==0.12',
199 'mock',
200 'pillow==3.0.0',
201 'sphinx_rtd_theme==0.1.7',
202 'alabaster>=0.7,<0.8,!=0.7.5',
203 ]
204
205 cmd = [
206 'conda',
207 'install',
208 '--yes',
209 '--name',
210 self.version.slug,
211 ]
212 cmd.extend(requirements)
213 self.build_env.run(
214 *cmd
215 )
216
217 # Install pip-only things.
218 pip_requirements = [
219 'mkdocs==0.15.0',
220 ('git+https://github.com/rtfd/readthedocs-sphinx-ext.git'
221 '@0.6-alpha#egg=readthedocs-sphinx-ext'),
222 'commonmark==0.5.4',
223 'recommonmark==0.1.1',
224 ]
225
226 pip_cmd = [
227 'python',
228 self.venv_bin(filename='pip'),
229 'install',
230 '-U',
231 '--cache-dir',
232 self.project.pip_cache_path,
233 ]
234 pip_cmd.extend(pip_requirements)
235 self.build_env.run(
236 *pip_cmd,
237 bin_path=self.venv_bin()
238 )
239
240 def install_user_requirements(self):
241 self.build_env.run(
242 'conda',
243 'env',
244 'update',
245 '--name',
246 self.version.slug,
247 '--file',
248 self.config.conda_file,
249 )
250
[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
@@ -103,7 +103,7 @@
def install_core_requirements(self):
requirements = [
'sphinx==1.5.3',
- 'Pygments==2.1.3',
+ 'Pygments==2.2.0',
'setuptools==28.8.0',
'docutils==0.13.1',
'mkdocs==0.15.0',
@@ -194,7 +194,7 @@
# Use conda for requirements it packages
requirements = [
'sphinx==1.3.5',
- 'Pygments==2.1.1',
+ 'Pygments==2.2.0',
'docutils==0.12',
'mock',
'pillow==3.0.0',
| {"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@@ -103,7 +103,7 @@\n def install_core_requirements(self):\n requirements = [\n 'sphinx==1.5.3',\n- 'Pygments==2.1.3',\n+ 'Pygments==2.2.0',\n 'setuptools==28.8.0',\n 'docutils==0.13.1',\n 'mkdocs==0.15.0',\n@@ -194,7 +194,7 @@\n # Use conda for requirements it packages\n requirements = [\n 'sphinx==1.3.5',\n- 'Pygments==2.1.1',\n+ 'Pygments==2.2.0',\n 'docutils==0.12',\n 'mock',\n 'pillow==3.0.0',\n", "issue": "Support latest Pygments (for improved Haskell syntax, and more)\n### Change Requested\r\nThe use of `Pygments==2.2.0` (or newer, potentially) to highlight code.\r\n\r\n### Background\r\nAs part of a [syntax highlighting problem noted on Haskell-Servant](https://github.com/haskell-servant/servant/issues/359), @teh pushed a [PR for Pygments](https://bitbucket.org/birkenfeld/pygments-main/pull-requests/685/two-haskell-fixes/diff) that was merged a while ago. \r\n\r\nI've submitted [a Pygments dependency bump in the Servant codebase](https://github.com/haskell-servant/servant/compare/master...declension:359-upgrade-pygments) which works locally, but as we use https://readthedocs.org for actually hosting, it won't help solve the real problem unless Pygments is upgraded here too...\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 self.config.pip_install or getattr(settings, 'USE_PIP_INSTALL', False):\n extra_req_param = ''\n if self.config.extra_requirements:\n extra_req_param = '[{0}]'.format(\n ','.join(self.config.extra_requirements))\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 '.{0}'.format(extra_req_param),\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 '--no-download',\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.5.3',\n 'Pygments==2.1.3',\n 'setuptools==28.8.0',\n 'docutils==0.13.1',\n 'mkdocs==0.15.0',\n 'mock==1.0.1',\n 'pillow==2.6.1',\n ('git+https://github.com/rtfd/readthedocs-sphinx-ext.git'\n '@0.6-alpha#egg=readthedocs-sphinx-ext'),\n 'sphinx-rtd-theme<0.3',\n 'alabaster>=0.7,<0.8,!=0.7.5',\n 'commonmark==0.5.4',\n 'recommonmark==0.4.0',\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.5',\n 'Pygments==2.1.1',\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 ('git+https://github.com/rtfd/readthedocs-sphinx-ext.git'\n '@0.6-alpha#egg=readthedocs-sphinx-ext'),\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"}]} | 3,126 | 232 |
gh_patches_debug_52332 | rasdani/github-patches | git_diff | xonsh__xonsh-5328 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Unexpected exception while updating completions
<!--- Provide a general summary of the issue in the Title above -->
When I set $UPDATE_COMPLETIONS_ON_KEYPRESS = True and type for instance /usr/bin/ls -a in terminal, following exception is thrown: "Exception [Errno 13] Permission denied: '/usr/bin/ls.json'"
<!--- If you have a question along the lines of "How do I do this Bash command in xonsh"
please first look over the Bash to Xonsh translation guide: https://xon.sh/bash_to_xsh.html
If you don't find an answer there, please do open an issue! -->
## xonfig
<details>
```
+------------------+----------------------+
| xonsh | 0.13.4 |
| Python | 3.8.10 |
| PLY | 3.11 |
| have readline | True |
| prompt toolkit | 3.0.36 |
| shell type | prompt_toolkit |
| history backend | json |
| pygments | 2.14.0 |
| on posix | True |
| on linux | True |
| distro | ubuntu |
| on wsl | False |
| on darwin | False |
| on windows | False |
| on cygwin | False |
| on msys2 | False |
| is superuser | False |
| default encoding | utf-8 |
| xonsh encoding | utf-8 |
| encoding errors | surrogateescape |
| xontrib | [] |
| RC file 1 | /home/ralis/.xonshrc |
+------------------+----------------------+
```
</details>
## Expected Behavior
<!--- Tell us what should happen -->
The warning should be either more subtle or no completion suggestions should be shown.
## Current Behavior
<!--- Tell us what happens instead of the expected behavior -->
Huge multi-line error is printed.
<!--- If part of your bug report is a traceback, please first enter debug mode before triggering the error
To enter debug mode, set the environment variable `XONSH_DEBUG=1` _before_ starting `xonsh`.
On Linux and OSX, an easy way to to do this is to run `env XONSH_DEBUG=1 xonsh` -->
### Traceback (if applicable)
<details>
```
Unhandled exception in event loop:
File "/home/ralis/.local/lib/python3.8/site-packages/prompt_toolkit/buffer.py", line 1939, in new_coroutine
await coroutine(*a, **kw)
File "/home/ralis/.local/lib/python3.8/site-packages/prompt_toolkit/buffer.py", line 1763, in async_completer
async for completion in async_generator:
File "/home/ralis/.local/lib/python3.8/site-packages/prompt_toolkit/completion/base.py", line 326, in get_completions_async
async for completion in completer.get_completions_async(
File "/home/ralis/.local/lib/python3.8/site-packages/prompt_toolkit/completion/base.py", line 202, in get_completions_async
for item in self.get_completions(document, complete_event):
File "/usr/local/lib/python3.8/dist-packages/xonsh/ptk_shell/completer.py", line 58, in get_completions
completions, plen = self.completer.complete(
File "/usr/local/lib/python3.8/dist-packages/xonsh/completer.py", line 121, in complete
return self.complete_from_context(
File "/usr/local/lib/python3.8/dist-packages/xonsh/completer.py", line 272, in complete_from_context
for comp in self.generate_completions(
File "/usr/local/lib/python3.8/dist-packages/xonsh/completer.py", line 233, in generate_completions
for comp in res:
File "/usr/local/lib/python3.8/dist-packages/xonsh/completers/man.py", line 137, in completions
for desc, opts in _parse_man_page_options(cmd).items():
File "/usr/local/lib/python3.8/dist-packages/xonsh/completers/man.py", line 121, in _parse_man_page_options
path.write_text(json.dumps(options))
File "/usr/lib/python3.8/pathlib.py", line 1255, in write_text
with self.open(mode='w', encoding=encoding, errors=errors) as f:
File "/usr/lib/python3.8/pathlib.py", line 1222, in open
return io.open(self, mode, buffering, encoding, errors, newline,
File "/usr/lib/python3.8/pathlib.py", line 1078, in _opener
return self._accessor.open(self, flags, mode)
Exception [Errno 13] Permission denied: '/usr/bin/ls.json'
```
</details>
## Steps to Reproduce
<!--- Please try to write out a minimal reproducible snippet to trigger the bug, it will help us fix it! -->
```xsh
$UPDATE_COMPLETIONS_ON_KEYPRESS = True
/usr/bin/ls - # exception after typing
```
## For community
⬇️ **Please click the 👍 reaction instead of leaving a `+1` or 👍 comment**
</issue>
<code>
[start of xonsh/completers/man.py]
1 import functools
2 import json
3 import re
4 import shutil
5 import subprocess
6 import textwrap
7 from pathlib import Path
8
9 from xonsh.built_ins import XSH
10 from xonsh.completers.tools import RichCompletion, contextual_command_completer
11 from xonsh.parsers.completion_context import CommandContext
12
13
14 @functools.cache
15 def get_man_completions_path() -> Path:
16 env = XSH.env or {}
17 datadir = Path(env["XONSH_DATA_DIR"]) / "generated_completions" / "man"
18 if datadir.exists() and (not datadir.is_dir()):
19 shutil.move(datadir, datadir.with_suffix(".bkp"))
20 if not datadir.exists():
21 datadir.mkdir(exist_ok=True, parents=True)
22 return datadir
23
24
25 def _get_man_page(cmd: str):
26 """without control characters"""
27 env = XSH.env.detype()
28 manpage = subprocess.Popen(
29 ["man", cmd], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, env=env
30 )
31 # This is a trick to get rid of reverse line feeds
32 return subprocess.check_output(["col", "-b"], stdin=manpage.stdout, env=env)
33
34
35 @functools.cache
36 def _man_option_string_regex():
37 return re.compile(
38 r"(?:(,\s?)|^|(\sor\s))(?P<option>-[\w]|--[\w-]+)(?=\[?(\s|,|=\w+|$))"
39 )
40
41
42 def generate_options_of(cmd: str):
43 out = _get_man_page(cmd)
44 if not out:
45 return
46
47 def get_headers(text: str):
48 """split as header-body based on indent"""
49 if not text:
50 return
51 header = ""
52 body = []
53 for line in textwrap.dedent(text.replace("\n\t", "\n ")).splitlines():
54 if not line.strip():
55 continue
56 if line.startswith((" ", "\t")):
57 body.append(line)
58 else:
59 if header or body:
60 yield header, body
61
62 # found new section
63 header = line.strip()
64 body = []
65 if header or body:
66 yield header, body
67
68 def split_options_string(text: str):
69 text = text.strip()
70 regex = _man_option_string_regex()
71
72 regex.findall(text)
73 options = []
74 for match in regex.finditer(text):
75 option = match.groupdict().pop("option", None)
76 if option:
77 options.append(option)
78 text = text[match.end() :]
79 return options, text.strip()
80
81 def get_option_section():
82 option_sect = dict(get_headers(out.decode()))
83 small_names = {k.lower(): k for k in option_sect}
84 for head in (
85 "options",
86 "command options",
87 "description",
88 ): # prefer sections in this order
89 if head in small_names:
90 title = small_names[head]
91 return "\n".join(option_sect[title])
92
93 def get_options(text):
94 """finally get the options"""
95 # return old section if
96 for opt, lines in get_headers(text):
97 # todo: some have [+-] or such vague notations
98 if opt.startswith("-"):
99 # sometime a single line will have both desc and options
100 option_strings, rest = split_options_string(opt)
101 descs = []
102 if rest:
103 descs.append(rest)
104 if lines:
105 descs.append(textwrap.dedent("\n".join(lines)))
106 if option_strings:
107 yield ". ".join(descs), tuple(option_strings)
108 elif lines:
109 # sometimes the options are nested inside subheaders
110 yield from get_options("\n".join(lines))
111
112 yield from get_options(get_option_section())
113
114
115 @functools.lru_cache(maxsize=10)
116 def _parse_man_page_options(cmd: str) -> "dict[str, tuple[str, ...]]":
117 path = get_man_completions_path() / f"{cmd}.json"
118 if path.exists():
119 return json.loads(path.read_text())
120 options = dict(generate_options_of(cmd))
121 path.write_text(json.dumps(options))
122 return options
123
124
125 @contextual_command_completer
126 def complete_from_man(context: CommandContext):
127 """
128 Completes an option name, based on the contents of the associated man
129 page.
130 """
131
132 if context.arg_index == 0 or not context.prefix.startswith("-"):
133 return
134 cmd = context.args[0].value
135
136 def completions():
137 for desc, opts in _parse_man_page_options(cmd).items():
138 yield RichCompletion(
139 value=opts[-1], display=", ".join(opts), description=desc
140 )
141
142 return completions(), False
143
[end of xonsh/completers/man.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/xonsh/completers/man.py b/xonsh/completers/man.py
--- a/xonsh/completers/man.py
+++ b/xonsh/completers/man.py
@@ -114,7 +114,7 @@
@functools.lru_cache(maxsize=10)
def _parse_man_page_options(cmd: str) -> "dict[str, tuple[str, ...]]":
- path = get_man_completions_path() / f"{cmd}.json"
+ path = get_man_completions_path() / Path(cmd).with_suffix(".json").name
if path.exists():
return json.loads(path.read_text())
options = dict(generate_options_of(cmd))
| {"golden_diff": "diff --git a/xonsh/completers/man.py b/xonsh/completers/man.py\n--- a/xonsh/completers/man.py\n+++ b/xonsh/completers/man.py\n@@ -114,7 +114,7 @@\n \n @functools.lru_cache(maxsize=10)\n def _parse_man_page_options(cmd: str) -> \"dict[str, tuple[str, ...]]\":\n- path = get_man_completions_path() / f\"{cmd}.json\"\n+ path = get_man_completions_path() / Path(cmd).with_suffix(\".json\").name\n if path.exists():\n return json.loads(path.read_text())\n options = dict(generate_options_of(cmd))\n", "issue": "Unexpected exception while updating completions\n<!--- Provide a general summary of the issue in the Title above -->\r\nWhen I set $UPDATE_COMPLETIONS_ON_KEYPRESS = True and type for instance /usr/bin/ls -a in terminal, following exception is thrown: \"Exception [Errno 13] Permission denied: '/usr/bin/ls.json'\"\r\n<!--- If you have a question along the lines of \"How do I do this Bash command in xonsh\"\r\nplease first look over the Bash to Xonsh translation guide: https://xon.sh/bash_to_xsh.html\r\nIf you don't find an answer there, please do open an issue! -->\r\n\r\n## xonfig\r\n\r\n<details>\r\n\r\n```\r\n+------------------+----------------------+\r\n| xonsh | 0.13.4 |\r\n| Python | 3.8.10 |\r\n| PLY | 3.11 |\r\n| have readline | True |\r\n| prompt toolkit | 3.0.36 |\r\n| shell type | prompt_toolkit |\r\n| history backend | json |\r\n| pygments | 2.14.0 |\r\n| on posix | True |\r\n| on linux | True |\r\n| distro | ubuntu |\r\n| on wsl | False |\r\n| on darwin | False |\r\n| on windows | False |\r\n| on cygwin | False |\r\n| on msys2 | False |\r\n| is superuser | False |\r\n| default encoding | utf-8 |\r\n| xonsh encoding | utf-8 |\r\n| encoding errors | surrogateescape |\r\n| xontrib | [] |\r\n| RC file 1 | /home/ralis/.xonshrc |\r\n+------------------+----------------------+\r\n\r\n```\r\n\r\n</details>\r\n\r\n## Expected Behavior\r\n<!--- Tell us what should happen -->\r\nThe warning should be either more subtle or no completion suggestions should be shown.\r\n## Current Behavior\r\n<!--- Tell us what happens instead of the expected behavior -->\r\nHuge multi-line error is printed.\r\n<!--- If part of your bug report is a traceback, please first enter debug mode before triggering the error\r\nTo enter debug mode, set the environment variable `XONSH_DEBUG=1` _before_ starting `xonsh`.\r\nOn Linux and OSX, an easy way to to do this is to run `env XONSH_DEBUG=1 xonsh` -->\r\n\r\n### Traceback (if applicable)\r\n\r\n<details>\r\n\r\n```\r\n\r\nUnhandled exception in event loop:\r\n File \"/home/ralis/.local/lib/python3.8/site-packages/prompt_toolkit/buffer.py\", line 1939, in new_coroutine\r\n await coroutine(*a, **kw)\r\n File \"/home/ralis/.local/lib/python3.8/site-packages/prompt_toolkit/buffer.py\", line 1763, in async_completer\r\n async for completion in async_generator:\r\n File \"/home/ralis/.local/lib/python3.8/site-packages/prompt_toolkit/completion/base.py\", line 326, in get_completions_async\r\n async for completion in completer.get_completions_async(\r\n File \"/home/ralis/.local/lib/python3.8/site-packages/prompt_toolkit/completion/base.py\", line 202, in get_completions_async\r\n for item in self.get_completions(document, complete_event):\r\n File \"/usr/local/lib/python3.8/dist-packages/xonsh/ptk_shell/completer.py\", line 58, in get_completions\r\n completions, plen = self.completer.complete(\r\n File \"/usr/local/lib/python3.8/dist-packages/xonsh/completer.py\", line 121, in complete\r\n return self.complete_from_context(\r\n File \"/usr/local/lib/python3.8/dist-packages/xonsh/completer.py\", line 272, in complete_from_context\r\n for comp in self.generate_completions(\r\n File \"/usr/local/lib/python3.8/dist-packages/xonsh/completer.py\", line 233, in generate_completions\r\n for comp in res:\r\n File \"/usr/local/lib/python3.8/dist-packages/xonsh/completers/man.py\", line 137, in completions\r\n for desc, opts in _parse_man_page_options(cmd).items():\r\n File \"/usr/local/lib/python3.8/dist-packages/xonsh/completers/man.py\", line 121, in _parse_man_page_options\r\n path.write_text(json.dumps(options))\r\n File \"/usr/lib/python3.8/pathlib.py\", line 1255, in write_text\r\n with self.open(mode='w', encoding=encoding, errors=errors) as f:\r\n File \"/usr/lib/python3.8/pathlib.py\", line 1222, in open\r\n return io.open(self, mode, buffering, encoding, errors, newline,\r\n File \"/usr/lib/python3.8/pathlib.py\", line 1078, in _opener\r\n return self._accessor.open(self, flags, mode)\r\n\r\nException [Errno 13] Permission denied: '/usr/bin/ls.json'\r\n\r\n```\r\n\r\n</details>\r\n\r\n## Steps to Reproduce\r\n<!--- Please try to write out a minimal reproducible snippet to trigger the bug, it will help us fix it! -->\r\n```xsh\r\n$UPDATE_COMPLETIONS_ON_KEYPRESS = True\r\n/usr/bin/ls - # exception after typing\r\n```\r\n## For community\r\n\u2b07\ufe0f **Please click the \ud83d\udc4d reaction instead of leaving a `+1` or \ud83d\udc4d comment**\r\n\n", "before_files": [{"content": "import functools\nimport json\nimport re\nimport shutil\nimport subprocess\nimport textwrap\nfrom pathlib import Path\n\nfrom xonsh.built_ins import XSH\nfrom xonsh.completers.tools import RichCompletion, contextual_command_completer\nfrom xonsh.parsers.completion_context import CommandContext\n\n\[email protected]\ndef get_man_completions_path() -> Path:\n env = XSH.env or {}\n datadir = Path(env[\"XONSH_DATA_DIR\"]) / \"generated_completions\" / \"man\"\n if datadir.exists() and (not datadir.is_dir()):\n shutil.move(datadir, datadir.with_suffix(\".bkp\"))\n if not datadir.exists():\n datadir.mkdir(exist_ok=True, parents=True)\n return datadir\n\n\ndef _get_man_page(cmd: str):\n \"\"\"without control characters\"\"\"\n env = XSH.env.detype()\n manpage = subprocess.Popen(\n [\"man\", cmd], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, env=env\n )\n # This is a trick to get rid of reverse line feeds\n return subprocess.check_output([\"col\", \"-b\"], stdin=manpage.stdout, env=env)\n\n\[email protected]\ndef _man_option_string_regex():\n return re.compile(\n r\"(?:(,\\s?)|^|(\\sor\\s))(?P<option>-[\\w]|--[\\w-]+)(?=\\[?(\\s|,|=\\w+|$))\"\n )\n\n\ndef generate_options_of(cmd: str):\n out = _get_man_page(cmd)\n if not out:\n return\n\n def get_headers(text: str):\n \"\"\"split as header-body based on indent\"\"\"\n if not text:\n return\n header = \"\"\n body = []\n for line in textwrap.dedent(text.replace(\"\\n\\t\", \"\\n \")).splitlines():\n if not line.strip():\n continue\n if line.startswith((\" \", \"\\t\")):\n body.append(line)\n else:\n if header or body:\n yield header, body\n\n # found new section\n header = line.strip()\n body = []\n if header or body:\n yield header, body\n\n def split_options_string(text: str):\n text = text.strip()\n regex = _man_option_string_regex()\n\n regex.findall(text)\n options = []\n for match in regex.finditer(text):\n option = match.groupdict().pop(\"option\", None)\n if option:\n options.append(option)\n text = text[match.end() :]\n return options, text.strip()\n\n def get_option_section():\n option_sect = dict(get_headers(out.decode()))\n small_names = {k.lower(): k for k in option_sect}\n for head in (\n \"options\",\n \"command options\",\n \"description\",\n ): # prefer sections in this order\n if head in small_names:\n title = small_names[head]\n return \"\\n\".join(option_sect[title])\n\n def get_options(text):\n \"\"\"finally get the options\"\"\"\n # return old section if\n for opt, lines in get_headers(text):\n # todo: some have [+-] or such vague notations\n if opt.startswith(\"-\"):\n # sometime a single line will have both desc and options\n option_strings, rest = split_options_string(opt)\n descs = []\n if rest:\n descs.append(rest)\n if lines:\n descs.append(textwrap.dedent(\"\\n\".join(lines)))\n if option_strings:\n yield \". \".join(descs), tuple(option_strings)\n elif lines:\n # sometimes the options are nested inside subheaders\n yield from get_options(\"\\n\".join(lines))\n\n yield from get_options(get_option_section())\n\n\[email protected]_cache(maxsize=10)\ndef _parse_man_page_options(cmd: str) -> \"dict[str, tuple[str, ...]]\":\n path = get_man_completions_path() / f\"{cmd}.json\"\n if path.exists():\n return json.loads(path.read_text())\n options = dict(generate_options_of(cmd))\n path.write_text(json.dumps(options))\n return options\n\n\n@contextual_command_completer\ndef complete_from_man(context: CommandContext):\n \"\"\"\n Completes an option name, based on the contents of the associated man\n page.\n \"\"\"\n\n if context.arg_index == 0 or not context.prefix.startswith(\"-\"):\n return\n cmd = context.args[0].value\n\n def completions():\n for desc, opts in _parse_man_page_options(cmd).items():\n yield RichCompletion(\n value=opts[-1], display=\", \".join(opts), description=desc\n )\n\n return completions(), False\n", "path": "xonsh/completers/man.py"}]} | 3,099 | 156 |
gh_patches_debug_27035 | rasdani/github-patches | git_diff | lk-geimfari__mimesis-933 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
PyCharm indicates wrong type for lambda
# Bug report
<!--
Hi, thanks for submitting a bug. We appreciate that.
But, we will need some information about what's wrong to help you.
-->
## What's wrong
While using PyCharm, `lambda` type in `Schema` results in *Expected type 'FunctionType', got '() -> Dict[str, Union[str, Any]]' instead*
<!-- Describe what is not working. Please, attach a traceback. -->
## How is that should be
Is this warning correct? The code runs perfectly fine but maybe the Type maybe be wrong here. On this [SO post](https://stackoverflow.com/a/33833896/12794150) they mentioned using the `from typing import Callable` for type hinting a lambda.
<!-- Describe how it should work. -->
## System information
<!-- Describe system information -->
```
❯ python3 --version
Python 3.8.5
❯ sw_vers
ProductName: macOS
ProductVersion: 11.0
BuildVersion: 20A5354i
```
PyCharm 2020.2.1
</issue>
<code>
[start of mimesis/typing.py]
1 # -*- coding: utf-8 -*-
2
3 """Custom types and shortcuts for annotating Mimesis."""
4
5 import datetime
6 from typing import Any, Callable, Dict, Union
7
8 __all__ = [
9 'JSON',
10 'DateTime',
11 'Timestamp',
12 'Time',
13 'Date',
14 'SchemaType',
15 'Seed',
16 ]
17
18 JSON = Dict[str, Any]
19
20 DateTime = datetime.datetime
21
22 Time = datetime.time
23
24 Date = datetime.date
25
26 Timestamp = Union[str, int]
27
28 Seed = Union[int, str, bytes, bytearray]
29
30 SchemaType = Callable[[], JSON]
31
[end of mimesis/typing.py]
[start of mimesis/schema.py]
1 # -*- coding: utf-8 -*-
2
3 """Implements classes for generating data by schema."""
4
5 from typing import Any, Callable, List, Optional
6
7 from mimesis.exceptions import (
8 UnacceptableField,
9 UndefinedField,
10 UndefinedSchema,
11 UnsupportedField,
12 )
13 from mimesis.providers.generic import Generic
14 from mimesis.typing import JSON, SchemaType, Seed
15
16 __all__ = ['Field', 'Schema']
17
18
19 class AbstractField:
20 """
21 AbstractField is a class for generating data by the name of the method.
22
23 Instance of this object takes any string which represents name
24 of any method of any supported data provider (:class:`~mimesis.Generic`)
25 and the ``**kwargs`` of the method.
26
27 See :class:`~mimesis.schema.AbstractField.__call__` for more details.
28 """
29
30 def __init__(self, locale: str = 'en',
31 seed: Optional[Seed] = None,
32 providers: Optional[Any] = None) -> None:
33 """Initialize field.
34
35 :param locale: Locale
36 :param seed: Seed for random.
37 """
38 self.locale = locale
39 self.seed = seed
40 self._gen = Generic(self.locale, self.seed)
41
42 if providers:
43 self._gen.add_providers(*providers)
44
45 self._table = {} # type: ignore
46
47 def __call__(self, name: Optional[str] = None,
48 key: Optional[Callable] = None, **kwargs) -> Any:
49 """Override standard call.
50
51 This magic method overrides standard call so it takes any string
52 which represents the name of any method of any supported data
53 provider and the ``**kwargs`` of this method.
54
55 .. note:: Some data providers have methods with the same names
56 and in such cases, you can explicitly define that the method
57 belongs to data-provider ``name='provider.name'`` otherwise
58 it will return the data from the first provider which
59 has a method ``name``.
60
61 You can apply a *key function* to the result returned by
62 the method, bt passing a parameter **key** with a callable
63 object which returns the final result.
64
65 :param name: Name of the method.
66 :param key: A key function (or other callable object)
67 which will be applied to result.
68 :param kwargs: Kwargs of method.
69 :return: Value which represented by method.
70 :raises ValueError: if provider not
71 supported or if field not defined.
72 """
73 if name is None:
74 raise UndefinedField()
75
76 def tail_parser(tails: str, obj: Any) -> Any:
77 """Return method from end of tail.
78
79 :param tails: Tail string
80 :param obj: Search tail from this object
81 :return last tailed method
82 """
83 provider_name, method_name = tails.split('.', 1)
84
85 if '.' in method_name:
86 raise UnacceptableField()
87
88 attr = getattr(obj, provider_name)
89 if attr is not None:
90 return getattr(attr, method_name)
91
92 try:
93 if name not in self._table:
94 if '.' not in name:
95 # Fix https://github.com/lk-geimfari/mimesis/issues/619
96 if name == self._gen.choice.Meta.name:
97 self._table[name] = self._gen.choice
98 else:
99 for provider in dir(self._gen):
100 provider = getattr(self._gen, provider)
101 if name in dir(provider):
102 self._table[name] = getattr(provider, name)
103 else:
104 self._table[name] = tail_parser(name, self._gen)
105
106 result = self._table[name](**kwargs)
107 if key and callable(key):
108 return key(result)
109 return result
110 except KeyError:
111 raise UnsupportedField(name)
112
113 def __str__(self):
114 return '{} <{}>'.format(
115 self.__class__.__name__, self.locale)
116
117
118 class Schema:
119 """Class which return list of filled schemas."""
120
121 def __init__(self, schema: SchemaType) -> None:
122 """Initialize schema.
123
124 :param schema: A schema (must be a callable object).
125 """
126 if callable(schema):
127 self.schema = schema
128 else:
129 raise UndefinedSchema()
130
131 def create(self, iterations: int = 1) -> List[JSON]:
132 """Return filled schema.
133
134 Create a list of a filled schemas with elements in
135 an amount of **iterations**.
136
137 :param iterations: Amount of iterations.
138 :return: List of willed schemas.
139 """
140 return [self.schema() for _ in range(iterations)]
141
142
143 # Alias for AbstractField
144 Field = AbstractField
145
[end of mimesis/schema.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/mimesis/schema.py b/mimesis/schema.py
--- a/mimesis/schema.py
+++ b/mimesis/schema.py
@@ -11,7 +11,7 @@
UnsupportedField,
)
from mimesis.providers.generic import Generic
-from mimesis.typing import JSON, Seed
+from mimesis.typing import JSON, SchemaType, Seed
__all__ = ['Field', 'Schema']
@@ -118,10 +118,10 @@
class Schema:
"""Class which return list of filled schemas."""
- def __init__(self, schema: Callable) -> None:
+ def __init__(self, schema: SchemaType) -> None:
"""Initialize schema.
- :param schema: A schema.
+ :param schema: A schema (must be a callable object).
"""
if callable(schema):
self.schema = schema
diff --git a/mimesis/typing.py b/mimesis/typing.py
--- a/mimesis/typing.py
+++ b/mimesis/typing.py
@@ -3,7 +3,7 @@
"""Custom types and shortcuts for annotating Mimesis."""
import datetime
-from typing import Any, Dict, Union
+from typing import Any, Callable, Dict, Union
__all__ = [
'JSON',
@@ -11,6 +11,7 @@
'Timestamp',
'Time',
'Date',
+ 'SchemaType',
'Seed',
]
@@ -25,3 +26,5 @@
Timestamp = Union[str, int]
Seed = Union[int, str, bytes, bytearray]
+
+SchemaType = Callable[[], JSON]
| {"golden_diff": "diff --git a/mimesis/schema.py b/mimesis/schema.py\n--- a/mimesis/schema.py\n+++ b/mimesis/schema.py\n@@ -11,7 +11,7 @@\n UnsupportedField,\n )\n from mimesis.providers.generic import Generic\n-from mimesis.typing import JSON, Seed\n+from mimesis.typing import JSON, SchemaType, Seed\n \n __all__ = ['Field', 'Schema']\n \n@@ -118,10 +118,10 @@\n class Schema:\n \"\"\"Class which return list of filled schemas.\"\"\"\n \n- def __init__(self, schema: Callable) -> None:\n+ def __init__(self, schema: SchemaType) -> None:\n \"\"\"Initialize schema.\n \n- :param schema: A schema.\n+ :param schema: A schema (must be a callable object).\n \"\"\"\n if callable(schema):\n self.schema = schema\ndiff --git a/mimesis/typing.py b/mimesis/typing.py\n--- a/mimesis/typing.py\n+++ b/mimesis/typing.py\n@@ -3,7 +3,7 @@\n \"\"\"Custom types and shortcuts for annotating Mimesis.\"\"\"\n \n import datetime\n-from typing import Any, Dict, Union\n+from typing import Any, Callable, Dict, Union\n \n __all__ = [\n 'JSON',\n@@ -11,6 +11,7 @@\n 'Timestamp',\n 'Time',\n 'Date',\n+ 'SchemaType',\n 'Seed',\n ]\n \n@@ -25,3 +26,5 @@\n Timestamp = Union[str, int]\n \n Seed = Union[int, str, bytes, bytearray]\n+\n+SchemaType = Callable[[], JSON]\n", "issue": "PyCharm indicates wrong type for lambda\n# Bug report\r\n\r\n<!--\r\nHi, thanks for submitting a bug. We appreciate that.\r\n\r\nBut, we will need some information about what's wrong to help you.\r\n-->\r\n\r\n## What's wrong\r\n\r\nWhile using PyCharm, `lambda` type in `Schema` results in *Expected type 'FunctionType', got '() -> Dict[str, Union[str, Any]]' instead*\r\n\r\n\r\n<!-- Describe what is not working. Please, attach a traceback. -->\r\n\r\n## How is that should be\r\nIs this warning correct? The code runs perfectly fine but maybe the Type maybe be wrong here. On this [SO post](https://stackoverflow.com/a/33833896/12794150) they mentioned using the `from typing import Callable` for type hinting a lambda.\r\n<!-- Describe how it should work. -->\r\n\r\n## System information\r\n\r\n<!-- Describe system information -->\r\n```\r\n\u276f python3 --version\r\nPython 3.8.5\r\n\r\n\u276f sw_vers\r\nProductName:\tmacOS\r\nProductVersion:\t11.0\r\nBuildVersion:\t20A5354i\r\n```\r\nPyCharm 2020.2.1\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n\n\"\"\"Custom types and shortcuts for annotating Mimesis.\"\"\"\n\nimport datetime\nfrom typing import Any, Callable, Dict, Union\n\n__all__ = [\n 'JSON',\n 'DateTime',\n 'Timestamp',\n 'Time',\n 'Date',\n 'SchemaType',\n 'Seed',\n]\n\nJSON = Dict[str, Any]\n\nDateTime = datetime.datetime\n\nTime = datetime.time\n\nDate = datetime.date\n\nTimestamp = Union[str, int]\n\nSeed = Union[int, str, bytes, bytearray]\n\nSchemaType = Callable[[], JSON]\n", "path": "mimesis/typing.py"}, {"content": "# -*- coding: utf-8 -*-\n\n\"\"\"Implements classes for generating data by schema.\"\"\"\n\nfrom typing import Any, Callable, List, Optional\n\nfrom mimesis.exceptions import (\n UnacceptableField,\n UndefinedField,\n UndefinedSchema,\n UnsupportedField,\n)\nfrom mimesis.providers.generic import Generic\nfrom mimesis.typing import JSON, SchemaType, Seed\n\n__all__ = ['Field', 'Schema']\n\n\nclass AbstractField:\n \"\"\"\n AbstractField is a class for generating data by the name of the method.\n\n Instance of this object takes any string which represents name\n of any method of any supported data provider (:class:`~mimesis.Generic`)\n and the ``**kwargs`` of the method.\n\n See :class:`~mimesis.schema.AbstractField.__call__` for more details.\n \"\"\"\n\n def __init__(self, locale: str = 'en',\n seed: Optional[Seed] = None,\n providers: Optional[Any] = None) -> None:\n \"\"\"Initialize field.\n\n :param locale: Locale\n :param seed: Seed for random.\n \"\"\"\n self.locale = locale\n self.seed = seed\n self._gen = Generic(self.locale, self.seed)\n\n if providers:\n self._gen.add_providers(*providers)\n\n self._table = {} # type: ignore\n\n def __call__(self, name: Optional[str] = None,\n key: Optional[Callable] = None, **kwargs) -> Any:\n \"\"\"Override standard call.\n\n This magic method overrides standard call so it takes any string\n which represents the name of any method of any supported data\n provider and the ``**kwargs`` of this method.\n\n .. note:: Some data providers have methods with the same names\n and in such cases, you can explicitly define that the method\n belongs to data-provider ``name='provider.name'`` otherwise\n it will return the data from the first provider which\n has a method ``name``.\n\n You can apply a *key function* to the result returned by\n the method, bt passing a parameter **key** with a callable\n object which returns the final result.\n\n :param name: Name of the method.\n :param key: A key function (or other callable object)\n which will be applied to result.\n :param kwargs: Kwargs of method.\n :return: Value which represented by method.\n :raises ValueError: if provider not\n supported or if field not defined.\n \"\"\"\n if name is None:\n raise UndefinedField()\n\n def tail_parser(tails: str, obj: Any) -> Any:\n \"\"\"Return method from end of tail.\n\n :param tails: Tail string\n :param obj: Search tail from this object\n :return last tailed method\n \"\"\"\n provider_name, method_name = tails.split('.', 1)\n\n if '.' in method_name:\n raise UnacceptableField()\n\n attr = getattr(obj, provider_name)\n if attr is not None:\n return getattr(attr, method_name)\n\n try:\n if name not in self._table:\n if '.' not in name:\n # Fix https://github.com/lk-geimfari/mimesis/issues/619\n if name == self._gen.choice.Meta.name:\n self._table[name] = self._gen.choice\n else:\n for provider in dir(self._gen):\n provider = getattr(self._gen, provider)\n if name in dir(provider):\n self._table[name] = getattr(provider, name)\n else:\n self._table[name] = tail_parser(name, self._gen)\n\n result = self._table[name](**kwargs)\n if key and callable(key):\n return key(result)\n return result\n except KeyError:\n raise UnsupportedField(name)\n\n def __str__(self):\n return '{} <{}>'.format(\n self.__class__.__name__, self.locale)\n\n\nclass Schema:\n \"\"\"Class which return list of filled schemas.\"\"\"\n\n def __init__(self, schema: SchemaType) -> None:\n \"\"\"Initialize schema.\n\n :param schema: A schema (must be a callable object).\n \"\"\"\n if callable(schema):\n self.schema = schema\n else:\n raise UndefinedSchema()\n\n def create(self, iterations: int = 1) -> List[JSON]:\n \"\"\"Return filled schema.\n\n Create a list of a filled schemas with elements in\n an amount of **iterations**.\n\n :param iterations: Amount of iterations.\n :return: List of willed schemas.\n \"\"\"\n return [self.schema() for _ in range(iterations)]\n\n\n# Alias for AbstractField\nField = AbstractField\n", "path": "mimesis/schema.py"}]} | 2,413 | 368 |
gh_patches_debug_35173 | rasdani/github-patches | git_diff | SCons__scons-4023 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Can't subst \$( in Textfile
**Describe the bug**
Generating .NET Core csproj files I needed to insert this string literal into the output
`NETCore\bin\$(Platform)\$(Configuration)\`
But there does not seem to be any way to output the sequence `\$(`
To reproduce clone this:
https://github.com/datalogics-robb/quote-test-scons
run `scons` to generate GenFile.csproj and observe this string in the output:
`NETCore\bin\$Platform)\$Configuration)\`
SCons version 4.2.0
CPython 3.9.[67] tested on Mac/Linux
</issue>
<code>
[start of SCons/Tool/textfile.py]
1 # -*- python -*-
2 #
3 # __COPYRIGHT__
4 #
5 # Permission is hereby granted, free of charge, to any person obtaining
6 # a copy of this software and associated documentation files (the
7 # "Software"), to deal in the Software without restriction, including
8 # without limitation the rights to use, copy, modify, merge, publish,
9 # distribute, sublicense, and/or sell copies of the Software, and to
10 # permit persons to whom the Software is furnished to do so, subject to
11 # the following conditions:
12 #
13 # The above copyright notice and this permission notice shall be included
14 # in all copies or substantial portions of the Software.
15 #
16 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
17 # KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
18 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
20 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23 #
24
25 __doc__ = """
26 Textfile/Substfile builder for SCons.
27
28 Create file 'target' which typically is a textfile. The 'source'
29 may be any combination of strings, Nodes, or lists of same. A
30 'linesep' will be put between any part written and defaults to
31 os.linesep.
32
33 The only difference between the Textfile builder and the Substfile
34 builder is that strings are converted to Value() nodes for the
35 former and File() nodes for the latter. To insert files in the
36 former or strings in the latter, wrap them in a File() or Value(),
37 respectively.
38
39 The values of SUBST_DICT first have any construction variables
40 expanded (its keys are not expanded). If a value of SUBST_DICT is
41 a python callable function, it is called and the result is expanded
42 as the value. Values are substituted in a "random" order; if any
43 substitution could be further expanded by another substitution, it
44 is unpredictable whether the expansion will occur.
45 """
46
47 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
48
49 import SCons
50
51
52 from SCons.Node import Node
53 from SCons.Node.Python import Value
54 from SCons.Util import is_String, is_Sequence, is_Dict, to_bytes
55
56
57 TEXTFILE_FILE_WRITE_MODE = 'w'
58
59 LINESEP = '\n'
60
61 def _do_subst(node, subs):
62 """
63 Fetch the node contents and replace all instances of the keys with
64 their values. For example, if subs is
65 {'%VERSION%': '1.2345', '%BASE%': 'MyProg', '%prefix%': '/bin'},
66 then all instances of %VERSION% in the file will be replaced with
67 1.2345 and so forth.
68 """
69 contents = node.get_text_contents()
70 if subs:
71 for (k, val) in subs:
72 contents = contents.replace(k, val)
73
74 if 'b' in TEXTFILE_FILE_WRITE_MODE:
75 try:
76 contents = bytearray(contents, 'utf-8')
77 except TypeError:
78 # TODO: this should not happen, get_text_contents returns text
79 contents = bytearray(contents)
80
81 return contents
82
83
84 def _action(target, source, env):
85
86 # prepare the line separator
87 linesep = env['LINESEPARATOR']
88 if linesep is None:
89 linesep = LINESEP # os.linesep
90 elif is_String(linesep):
91 pass
92 elif isinstance(linesep, Value):
93 linesep = linesep.get_text_contents()
94 else:
95 raise SCons.Errors.UserError('unexpected type/class for LINESEPARATOR: %s'
96 % repr(linesep), None)
97
98 if 'b' in TEXTFILE_FILE_WRITE_MODE:
99 linesep = to_bytes(linesep)
100
101 # create a dictionary to use for the substitutions
102 if 'SUBST_DICT' not in env:
103 subs = None # no substitutions
104 else:
105 subst_dict = env['SUBST_DICT']
106 if is_Dict(subst_dict):
107 subst_dict = list(subst_dict.items())
108 elif is_Sequence(subst_dict):
109 pass
110 else:
111 raise SCons.Errors.UserError('SUBST_DICT must be dict or sequence')
112 subs = []
113 for (k, value) in subst_dict:
114 if callable(value):
115 value = value()
116 if is_String(value):
117 value = env.subst(value)
118 else:
119 value = str(value)
120 subs.append((k, value))
121
122 # write the file
123 try:
124 target_file = open(target[0].get_path(), TEXTFILE_FILE_WRITE_MODE, newline='')
125 except (OSError, IOError) as e:
126 raise SCons.Errors.UserError("Can't write target file %s [%s]" % (target[0],e))
127
128 # separate lines by 'linesep' only if linesep is not empty
129 lsep = None
130 for line in source:
131 if lsep:
132 target_file.write(lsep)
133
134 target_file.write(_do_subst(line, subs))
135 lsep = linesep
136 target_file.close()
137
138
139 def _strfunc(target, source, env):
140 return "Creating '%s'" % target[0]
141
142
143 def _convert_list_R(newlist, sources):
144 for elem in sources:
145 if is_Sequence(elem):
146 _convert_list_R(newlist, elem)
147 elif isinstance(elem, Node):
148 newlist.append(elem)
149 else:
150 newlist.append(Value(elem))
151
152
153 def _convert_list(target, source, env):
154 if len(target) != 1:
155 raise SCons.Errors.UserError("Only one target file allowed")
156 newlist = []
157 _convert_list_R(newlist, source)
158 return target, newlist
159
160
161 _common_varlist = ['SUBST_DICT', 'LINESEPARATOR']
162
163 _text_varlist = _common_varlist + ['TEXTFILEPREFIX', 'TEXTFILESUFFIX']
164 _text_builder = SCons.Builder.Builder(
165 action=SCons.Action.Action(_action, _strfunc, varlist=_text_varlist),
166 source_factory=Value,
167 emitter=_convert_list,
168 prefix='$TEXTFILEPREFIX',
169 suffix='$TEXTFILESUFFIX',
170 )
171
172 _subst_varlist = _common_varlist + ['SUBSTFILEPREFIX', 'SUBSTFILESUFFIX']
173 _subst_builder = SCons.Builder.Builder(
174 action=SCons.Action.Action(_action, _strfunc, varlist=_subst_varlist),
175 source_factory=SCons.Node.FS.File,
176 emitter=_convert_list,
177 prefix='$SUBSTFILEPREFIX',
178 suffix='$SUBSTFILESUFFIX',
179 src_suffix=['.in'],
180 )
181
182
183 def generate(env):
184 env['LINESEPARATOR'] = LINESEP # os.linesep
185 env['BUILDERS']['Textfile'] = _text_builder
186 env['TEXTFILEPREFIX'] = ''
187 env['TEXTFILESUFFIX'] = '.txt'
188 env['BUILDERS']['Substfile'] = _subst_builder
189 env['SUBSTFILEPREFIX'] = ''
190 env['SUBSTFILESUFFIX'] = ''
191
192
193 def exists(env):
194 return 1
195
196 # Local Variables:
197 # tab-width:4
198 # indent-tabs-mode:nil
199 # End:
200 # vim: set expandtab tabstop=4 shiftwidth=4:
201
[end of SCons/Tool/textfile.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/SCons/Tool/textfile.py b/SCons/Tool/textfile.py
--- a/SCons/Tool/textfile.py
+++ b/SCons/Tool/textfile.py
@@ -1,6 +1,6 @@
-# -*- python -*-
+# MIT License
#
-# __COPYRIGHT__
+# Copyright The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -20,9 +20,8 @@
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-__doc__ = """
+"""
Textfile/Substfile builder for SCons.
Create file 'target' which typically is a textfile. The 'source'
@@ -44,8 +43,6 @@
is unpredictable whether the expansion will occur.
"""
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
import SCons
@@ -58,6 +55,7 @@
LINESEP = '\n'
+
def _do_subst(node, subs):
"""
Fetch the node contents and replace all instances of the keys with
@@ -86,7 +84,7 @@
# prepare the line separator
linesep = env['LINESEPARATOR']
if linesep is None:
- linesep = LINESEP # os.linesep
+ linesep = LINESEP # os.linesep
elif is_String(linesep):
pass
elif isinstance(linesep, Value):
@@ -114,7 +112,7 @@
if callable(value):
value = value()
if is_String(value):
- value = env.subst(value)
+ value = env.subst(value, raw=1)
else:
value = str(value)
subs.append((k, value))
| {"golden_diff": "diff --git a/SCons/Tool/textfile.py b/SCons/Tool/textfile.py\n--- a/SCons/Tool/textfile.py\n+++ b/SCons/Tool/textfile.py\n@@ -1,6 +1,6 @@\n-# -*- python -*-\n+# MIT License\n #\n-# __COPYRIGHT__\n+# Copyright The SCons Foundation\n #\n # Permission is hereby granted, free of charge, to any person obtaining\n # a copy of this software and associated documentation files (the\n@@ -20,9 +20,8 @@\n # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\n # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\n # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n-#\n \n-__doc__ = \"\"\"\n+\"\"\"\n Textfile/Substfile builder for SCons.\n \n Create file 'target' which typically is a textfile. The 'source'\n@@ -44,8 +43,6 @@\n is unpredictable whether the expansion will occur.\n \"\"\"\n \n-__revision__ = \"__FILE__ __REVISION__ __DATE__ __DEVELOPER__\"\n-\n import SCons\n \n \n@@ -58,6 +55,7 @@\n \n LINESEP = '\\n'\n \n+\n def _do_subst(node, subs):\n \"\"\"\n Fetch the node contents and replace all instances of the keys with\n@@ -86,7 +84,7 @@\n # prepare the line separator\n linesep = env['LINESEPARATOR']\n if linesep is None:\n- linesep = LINESEP # os.linesep\n+ linesep = LINESEP # os.linesep\n elif is_String(linesep):\n pass\n elif isinstance(linesep, Value):\n@@ -114,7 +112,7 @@\n if callable(value):\n value = value()\n if is_String(value):\n- value = env.subst(value)\n+ value = env.subst(value, raw=1)\n else:\n value = str(value)\n subs.append((k, value))\n", "issue": "Can't subst \\$( in Textfile\n**Describe the bug**\r\nGenerating .NET Core csproj files I needed to insert this string literal into the output\r\n `NETCore\\bin\\$(Platform)\\$(Configuration)\\`\r\n\r\nBut there does not seem to be any way to output the sequence `\\$(`\r\n\r\nTo reproduce clone this:\r\n https://github.com/datalogics-robb/quote-test-scons\r\n\r\nrun `scons` to generate GenFile.csproj and observe this string in the output:\r\n`NETCore\\bin\\$Platform)\\$Configuration)\\`\r\n\r\nSCons version 4.2.0\r\nCPython 3.9.[67] tested on Mac/Linux\r\n\n", "before_files": [{"content": "# -*- python -*-\n#\n# __COPYRIGHT__\n#\n# Permission is hereby granted, free of charge, to any person obtaining\n# a copy of this software and associated documentation files (the\n# \"Software\"), to deal in the Software without restriction, including\n# without limitation the rights to use, copy, modify, merge, publish,\n# distribute, sublicense, and/or sell copies of the Software, and to\n# permit persons to whom the Software is furnished to do so, subject to\n# the following conditions:\n#\n# The above copyright notice and this permission notice shall be included\n# in all copies or substantial portions of the Software.\n#\n# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY\n# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\n# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\n# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\n# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n#\n\n__doc__ = \"\"\"\nTextfile/Substfile builder for SCons.\n\n Create file 'target' which typically is a textfile. The 'source'\n may be any combination of strings, Nodes, or lists of same. A\n 'linesep' will be put between any part written and defaults to\n os.linesep.\n\n The only difference between the Textfile builder and the Substfile\n builder is that strings are converted to Value() nodes for the\n former and File() nodes for the latter. To insert files in the\n former or strings in the latter, wrap them in a File() or Value(),\n respectively.\n\n The values of SUBST_DICT first have any construction variables\n expanded (its keys are not expanded). If a value of SUBST_DICT is\n a python callable function, it is called and the result is expanded\n as the value. Values are substituted in a \"random\" order; if any\n substitution could be further expanded by another substitution, it\n is unpredictable whether the expansion will occur.\n\"\"\"\n\n__revision__ = \"__FILE__ __REVISION__ __DATE__ __DEVELOPER__\"\n\nimport SCons\n\n\nfrom SCons.Node import Node\nfrom SCons.Node.Python import Value\nfrom SCons.Util import is_String, is_Sequence, is_Dict, to_bytes\n\n\nTEXTFILE_FILE_WRITE_MODE = 'w'\n\nLINESEP = '\\n'\n\ndef _do_subst(node, subs):\n \"\"\"\n Fetch the node contents and replace all instances of the keys with\n their values. For example, if subs is\n {'%VERSION%': '1.2345', '%BASE%': 'MyProg', '%prefix%': '/bin'},\n then all instances of %VERSION% in the file will be replaced with\n 1.2345 and so forth.\n \"\"\"\n contents = node.get_text_contents()\n if subs:\n for (k, val) in subs:\n contents = contents.replace(k, val)\n\n if 'b' in TEXTFILE_FILE_WRITE_MODE:\n try:\n contents = bytearray(contents, 'utf-8')\n except TypeError:\n # TODO: this should not happen, get_text_contents returns text\n contents = bytearray(contents)\n\n return contents\n\n\ndef _action(target, source, env):\n\n # prepare the line separator\n linesep = env['LINESEPARATOR']\n if linesep is None:\n linesep = LINESEP # os.linesep\n elif is_String(linesep):\n pass\n elif isinstance(linesep, Value):\n linesep = linesep.get_text_contents()\n else:\n raise SCons.Errors.UserError('unexpected type/class for LINESEPARATOR: %s'\n % repr(linesep), None)\n\n if 'b' in TEXTFILE_FILE_WRITE_MODE:\n linesep = to_bytes(linesep)\n\n # create a dictionary to use for the substitutions\n if 'SUBST_DICT' not in env:\n subs = None # no substitutions\n else:\n subst_dict = env['SUBST_DICT']\n if is_Dict(subst_dict):\n subst_dict = list(subst_dict.items())\n elif is_Sequence(subst_dict):\n pass\n else:\n raise SCons.Errors.UserError('SUBST_DICT must be dict or sequence')\n subs = []\n for (k, value) in subst_dict:\n if callable(value):\n value = value()\n if is_String(value):\n value = env.subst(value)\n else:\n value = str(value)\n subs.append((k, value))\n\n # write the file\n try:\n target_file = open(target[0].get_path(), TEXTFILE_FILE_WRITE_MODE, newline='')\n except (OSError, IOError) as e:\n raise SCons.Errors.UserError(\"Can't write target file %s [%s]\" % (target[0],e))\n\n # separate lines by 'linesep' only if linesep is not empty\n lsep = None\n for line in source:\n if lsep:\n target_file.write(lsep)\n\n target_file.write(_do_subst(line, subs))\n lsep = linesep\n target_file.close()\n\n\ndef _strfunc(target, source, env):\n return \"Creating '%s'\" % target[0]\n\n\ndef _convert_list_R(newlist, sources):\n for elem in sources:\n if is_Sequence(elem):\n _convert_list_R(newlist, elem)\n elif isinstance(elem, Node):\n newlist.append(elem)\n else:\n newlist.append(Value(elem))\n\n\ndef _convert_list(target, source, env):\n if len(target) != 1:\n raise SCons.Errors.UserError(\"Only one target file allowed\")\n newlist = []\n _convert_list_R(newlist, source)\n return target, newlist\n\n\n_common_varlist = ['SUBST_DICT', 'LINESEPARATOR']\n\n_text_varlist = _common_varlist + ['TEXTFILEPREFIX', 'TEXTFILESUFFIX']\n_text_builder = SCons.Builder.Builder(\n action=SCons.Action.Action(_action, _strfunc, varlist=_text_varlist),\n source_factory=Value,\n emitter=_convert_list,\n prefix='$TEXTFILEPREFIX',\n suffix='$TEXTFILESUFFIX',\n)\n\n_subst_varlist = _common_varlist + ['SUBSTFILEPREFIX', 'SUBSTFILESUFFIX']\n_subst_builder = SCons.Builder.Builder(\n action=SCons.Action.Action(_action, _strfunc, varlist=_subst_varlist),\n source_factory=SCons.Node.FS.File,\n emitter=_convert_list,\n prefix='$SUBSTFILEPREFIX',\n suffix='$SUBSTFILESUFFIX',\n src_suffix=['.in'],\n)\n\n\ndef generate(env):\n env['LINESEPARATOR'] = LINESEP # os.linesep\n env['BUILDERS']['Textfile'] = _text_builder\n env['TEXTFILEPREFIX'] = ''\n env['TEXTFILESUFFIX'] = '.txt'\n env['BUILDERS']['Substfile'] = _subst_builder\n env['SUBSTFILEPREFIX'] = ''\n env['SUBSTFILESUFFIX'] = ''\n\n\ndef exists(env):\n return 1\n\n# Local Variables:\n# tab-width:4\n# indent-tabs-mode:nil\n# End:\n# vim: set expandtab tabstop=4 shiftwidth=4:\n", "path": "SCons/Tool/textfile.py"}]} | 2,781 | 445 |
gh_patches_debug_8341 | rasdani/github-patches | git_diff | getnikola__nikola-2157 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
${messages("xxx")} not working in post-list template
When I use ${messages("xxx")} tag inside post-list template. I get an error during site compilation.
Error message is the following : File "/opt/nikola/projects/konilabs-web/cache/.mako.tmp/post_list_thumb.tmpl.py", line 72, in render_content __M_writer(unicode(messages("Read More"))) TypeError: 'Undefined' object is not callable
</issue>
<code>
[start of nikola/plugins/compile/rest/post_list.py]
1 # -*- coding: utf-8 -*-
2
3 # Copyright © 2013-2015 Udo Spallek, Roberto Alsina and others.
4
5 # Permission is hereby granted, free of charge, to any
6 # person obtaining a copy of this software and associated
7 # documentation files (the "Software"), to deal in the
8 # Software without restriction, including without limitation
9 # the rights to use, copy, modify, merge, publish,
10 # distribute, sublicense, and/or sell copies of the
11 # Software, and to permit persons to whom the Software is
12 # furnished to do so, subject to the following conditions:
13 #
14 # The above copyright notice and this permission notice
15 # shall be included in all copies or substantial portions of
16 # the Software.
17 #
18 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
19 # KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
20 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
21 # PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
22 # OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
23 # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
24 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
25 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26
27 """Post list directive for reStructuredText."""
28
29 from __future__ import unicode_literals
30
31 import os
32 import uuid
33 import natsort
34
35 from docutils import nodes
36 from docutils.parsers.rst import Directive, directives
37
38 from nikola import utils
39 from nikola.plugin_categories import RestExtension
40
41 # WARNING: the directive name is post-list
42 # (with a DASH instead of an UNDERSCORE)
43
44
45 class Plugin(RestExtension):
46 """Plugin for reST post-list directive."""
47
48 name = "rest_post_list"
49
50 def set_site(self, site):
51 """Set Nikola site."""
52 self.site = site
53 directives.register_directive('post-list', PostList)
54 PostList.site = site
55 return super(Plugin, self).set_site(site)
56
57
58 class PostList(Directive):
59 """Provide a reStructuredText directive to create a list of posts.
60
61 Post List
62 =========
63 :Directive Arguments: None.
64 :Directive Options: lang, start, stop, reverse, sort, tags, categories, slugs, all, template, id
65 :Directive Content: None.
66
67 The posts appearing in the list can be filtered by options.
68 *List slicing* is provided with the *start*, *stop* and *reverse* options.
69
70 The following not required options are recognized:
71
72 ``start`` : integer
73 The index of the first post to show.
74 A negative value like ``-3`` will show the *last* three posts in the
75 post-list.
76 Defaults to None.
77
78 ``stop`` : integer
79 The index of the last post to show.
80 A value negative value like ``-1`` will show every post, but not the
81 *last* in the post-list.
82 Defaults to None.
83
84 ``reverse`` : flag
85 Reverse the order of the post-list.
86 Defaults is to not reverse the order of posts.
87
88 ``sort``: string
89 Sort post list by one of each post's attributes, usually ``title`` or a
90 custom ``priority``. Defaults to None (chronological sorting).
91
92 ``tags`` : string [, string...]
93 Filter posts to show only posts having at least one of the ``tags``.
94 Defaults to None.
95
96 ``categories`` : string [, string...]
97 Filter posts to show only posts having one of the ``categories``.
98 Defaults to None.
99
100 ``slugs`` : string [, string...]
101 Filter posts to show only posts having at least one of the ``slugs``.
102 Defaults to None.
103
104 ``all`` : flag
105 Shows all posts and pages in the post list.
106 Defaults to show only posts with set *use_in_feeds*.
107
108 ``lang`` : string
109 The language of post *titles* and *links*.
110 Defaults to default language.
111
112 ``template`` : string
113 The name of an alternative template to render the post-list.
114 Defaults to ``post_list_directive.tmpl``
115
116 ``id`` : string
117 A manual id for the post list.
118 Defaults to a random name composed by 'post_list_' + uuid.uuid4().hex.
119 """
120
121 option_spec = {
122 'start': int,
123 'stop': int,
124 'reverse': directives.flag,
125 'sort': directives.unchanged,
126 'tags': directives.unchanged,
127 'categories': directives.unchanged,
128 'slugs': directives.unchanged,
129 'all': directives.flag,
130 'lang': directives.unchanged,
131 'template': directives.path,
132 'id': directives.unchanged,
133 }
134
135 def run(self):
136 """Run post-list directive."""
137 start = self.options.get('start')
138 stop = self.options.get('stop')
139 reverse = self.options.get('reverse', False)
140 tags = self.options.get('tags')
141 tags = [t.strip().lower() for t in tags.split(',')] if tags else []
142 categories = self.options.get('categories')
143 categories = [c.strip().lower() for c in categories.split(',')] if categories else []
144 slugs = self.options.get('slugs')
145 slugs = [s.strip() for s in slugs.split(',')] if slugs else []
146 show_all = self.options.get('all', False)
147 lang = self.options.get('lang', utils.LocaleBorg().current_lang)
148 template = self.options.get('template', 'post_list_directive.tmpl')
149 sort = self.options.get('sort')
150 if self.site.invariant: # for testing purposes
151 post_list_id = self.options.get('id', 'post_list_' + 'fixedvaluethatisnotauuid')
152 else:
153 post_list_id = self.options.get('id', 'post_list_' + uuid.uuid4().hex)
154
155 filtered_timeline = []
156 posts = []
157 step = -1 if reverse is None else None
158 if show_all is None:
159 timeline = [p for p in self.site.timeline]
160 else:
161 timeline = [p for p in self.site.timeline if p.use_in_feeds]
162
163 if categories:
164 timeline = [p for p in timeline if p.meta('category', lang=lang).lower() in categories]
165
166 for post in timeline:
167 if tags:
168 cont = True
169 tags_lower = [t.lower() for t in post.tags]
170 for tag in tags:
171 if tag in tags_lower:
172 cont = False
173
174 if cont:
175 continue
176
177 filtered_timeline.append(post)
178
179 if sort:
180 filtered_timeline = natsort.natsorted(filtered_timeline, key=lambda post: post.meta[lang][sort], alg=natsort.ns.F | natsort.ns.IC)
181
182 for post in filtered_timeline[start:stop:step]:
183 if slugs:
184 cont = True
185 for slug in slugs:
186 if slug == post.meta('slug'):
187 cont = False
188
189 if cont:
190 continue
191
192 bp = post.translated_base_path(lang)
193 if os.path.exists(bp):
194 self.state.document.settings.record_dependencies.add(bp)
195
196 posts += [post]
197
198 if not posts:
199 return []
200 self.state.document.settings.record_dependencies.add("####MAGIC####TIMELINE")
201
202 template_data = {
203 'lang': lang,
204 'posts': posts,
205 # Need to provide str, not TranslatableSetting (Issue #2104)
206 'date_format': self.site.GLOBAL_CONTEXT.get('date_format')[lang],
207 'post_list_id': post_list_id,
208 }
209 output = self.site.template_system.render_template(
210 template, None, template_data)
211 return [nodes.raw('', output, format='html')]
212
[end of nikola/plugins/compile/rest/post_list.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/nikola/plugins/compile/rest/post_list.py b/nikola/plugins/compile/rest/post_list.py
--- a/nikola/plugins/compile/rest/post_list.py
+++ b/nikola/plugins/compile/rest/post_list.py
@@ -205,6 +205,7 @@
# Need to provide str, not TranslatableSetting (Issue #2104)
'date_format': self.site.GLOBAL_CONTEXT.get('date_format')[lang],
'post_list_id': post_list_id,
+ 'messages': self.site.MESSAGES,
}
output = self.site.template_system.render_template(
template, None, template_data)
| {"golden_diff": "diff --git a/nikola/plugins/compile/rest/post_list.py b/nikola/plugins/compile/rest/post_list.py\n--- a/nikola/plugins/compile/rest/post_list.py\n+++ b/nikola/plugins/compile/rest/post_list.py\n@@ -205,6 +205,7 @@\n # Need to provide str, not TranslatableSetting (Issue #2104)\n 'date_format': self.site.GLOBAL_CONTEXT.get('date_format')[lang],\n 'post_list_id': post_list_id,\n+ 'messages': self.site.MESSAGES,\n }\n output = self.site.template_system.render_template(\n template, None, template_data)\n", "issue": "${messages(\"xxx\")} not working in post-list template\nWhen I use ${messages(\"xxx\")} tag inside post-list template. I get an error during site compilation.\n\nError message is the following : File \"/opt/nikola/projects/konilabs-web/cache/.mako.tmp/post_list_thumb.tmpl.py\", line 72, in render_content __M_writer(unicode(messages(\"Read More\"))) TypeError: 'Undefined' object is not callable \n\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n\n# Copyright \u00a9 2013-2015 Udo Spallek, Roberto Alsina and others.\n\n# Permission is hereby granted, free of charge, to any\n# person obtaining a copy of this software and associated\n# documentation files (the \"Software\"), to deal in the\n# Software without restriction, including without limitation\n# the rights to use, copy, modify, merge, publish,\n# distribute, sublicense, and/or sell copies of the\n# Software, and to permit persons to whom the Software is\n# furnished to do so, subject to the following conditions:\n#\n# The above copyright notice and this permission notice\n# shall be included in all copies or substantial portions of\n# the Software.\n#\n# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY\n# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR\n# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS\n# OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR\n# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\n# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\n# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\n\"\"\"Post list directive for reStructuredText.\"\"\"\n\nfrom __future__ import unicode_literals\n\nimport os\nimport uuid\nimport natsort\n\nfrom docutils import nodes\nfrom docutils.parsers.rst import Directive, directives\n\nfrom nikola import utils\nfrom nikola.plugin_categories import RestExtension\n\n# WARNING: the directive name is post-list\n# (with a DASH instead of an UNDERSCORE)\n\n\nclass Plugin(RestExtension):\n \"\"\"Plugin for reST post-list directive.\"\"\"\n\n name = \"rest_post_list\"\n\n def set_site(self, site):\n \"\"\"Set Nikola site.\"\"\"\n self.site = site\n directives.register_directive('post-list', PostList)\n PostList.site = site\n return super(Plugin, self).set_site(site)\n\n\nclass PostList(Directive):\n \"\"\"Provide a reStructuredText directive to create a list of posts.\n\n Post List\n =========\n :Directive Arguments: None.\n :Directive Options: lang, start, stop, reverse, sort, tags, categories, slugs, all, template, id\n :Directive Content: None.\n\n The posts appearing in the list can be filtered by options.\n *List slicing* is provided with the *start*, *stop* and *reverse* options.\n\n The following not required options are recognized:\n\n ``start`` : integer\n The index of the first post to show.\n A negative value like ``-3`` will show the *last* three posts in the\n post-list.\n Defaults to None.\n\n ``stop`` : integer\n The index of the last post to show.\n A value negative value like ``-1`` will show every post, but not the\n *last* in the post-list.\n Defaults to None.\n\n ``reverse`` : flag\n Reverse the order of the post-list.\n Defaults is to not reverse the order of posts.\n\n ``sort``: string\n Sort post list by one of each post's attributes, usually ``title`` or a\n custom ``priority``. Defaults to None (chronological sorting).\n\n ``tags`` : string [, string...]\n Filter posts to show only posts having at least one of the ``tags``.\n Defaults to None.\n\n ``categories`` : string [, string...]\n Filter posts to show only posts having one of the ``categories``.\n Defaults to None.\n\n ``slugs`` : string [, string...]\n Filter posts to show only posts having at least one of the ``slugs``.\n Defaults to None.\n\n ``all`` : flag\n Shows all posts and pages in the post list.\n Defaults to show only posts with set *use_in_feeds*.\n\n ``lang`` : string\n The language of post *titles* and *links*.\n Defaults to default language.\n\n ``template`` : string\n The name of an alternative template to render the post-list.\n Defaults to ``post_list_directive.tmpl``\n\n ``id`` : string\n A manual id for the post list.\n Defaults to a random name composed by 'post_list_' + uuid.uuid4().hex.\n \"\"\"\n\n option_spec = {\n 'start': int,\n 'stop': int,\n 'reverse': directives.flag,\n 'sort': directives.unchanged,\n 'tags': directives.unchanged,\n 'categories': directives.unchanged,\n 'slugs': directives.unchanged,\n 'all': directives.flag,\n 'lang': directives.unchanged,\n 'template': directives.path,\n 'id': directives.unchanged,\n }\n\n def run(self):\n \"\"\"Run post-list directive.\"\"\"\n start = self.options.get('start')\n stop = self.options.get('stop')\n reverse = self.options.get('reverse', False)\n tags = self.options.get('tags')\n tags = [t.strip().lower() for t in tags.split(',')] if tags else []\n categories = self.options.get('categories')\n categories = [c.strip().lower() for c in categories.split(',')] if categories else []\n slugs = self.options.get('slugs')\n slugs = [s.strip() for s in slugs.split(',')] if slugs else []\n show_all = self.options.get('all', False)\n lang = self.options.get('lang', utils.LocaleBorg().current_lang)\n template = self.options.get('template', 'post_list_directive.tmpl')\n sort = self.options.get('sort')\n if self.site.invariant: # for testing purposes\n post_list_id = self.options.get('id', 'post_list_' + 'fixedvaluethatisnotauuid')\n else:\n post_list_id = self.options.get('id', 'post_list_' + uuid.uuid4().hex)\n\n filtered_timeline = []\n posts = []\n step = -1 if reverse is None else None\n if show_all is None:\n timeline = [p for p in self.site.timeline]\n else:\n timeline = [p for p in self.site.timeline if p.use_in_feeds]\n\n if categories:\n timeline = [p for p in timeline if p.meta('category', lang=lang).lower() in categories]\n\n for post in timeline:\n if tags:\n cont = True\n tags_lower = [t.lower() for t in post.tags]\n for tag in tags:\n if tag in tags_lower:\n cont = False\n\n if cont:\n continue\n\n filtered_timeline.append(post)\n\n if sort:\n filtered_timeline = natsort.natsorted(filtered_timeline, key=lambda post: post.meta[lang][sort], alg=natsort.ns.F | natsort.ns.IC)\n\n for post in filtered_timeline[start:stop:step]:\n if slugs:\n cont = True\n for slug in slugs:\n if slug == post.meta('slug'):\n cont = False\n\n if cont:\n continue\n\n bp = post.translated_base_path(lang)\n if os.path.exists(bp):\n self.state.document.settings.record_dependencies.add(bp)\n\n posts += [post]\n\n if not posts:\n return []\n self.state.document.settings.record_dependencies.add(\"####MAGIC####TIMELINE\")\n\n template_data = {\n 'lang': lang,\n 'posts': posts,\n # Need to provide str, not TranslatableSetting (Issue #2104)\n 'date_format': self.site.GLOBAL_CONTEXT.get('date_format')[lang],\n 'post_list_id': post_list_id,\n }\n output = self.site.template_system.render_template(\n template, None, template_data)\n return [nodes.raw('', output, format='html')]\n", "path": "nikola/plugins/compile/rest/post_list.py"}]} | 2,862 | 142 |
gh_patches_debug_12798 | rasdani/github-patches | git_diff | spotify__luigi-893 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
RemoteFileSystem uses wrong path separator
The RemoteFileSystem uses the client path separators instead of the remote system path separators.
That means that when trying to write to a Linux RemoteTarget from a Windows Client, the path will be broken (backslashes instead of slashes as path separators, leading to wrong path names).
</issue>
<code>
[start of luigi/contrib/ssh.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 Light-weight remote execution library and utilities.
19
20 There are some examples in the unittest, but
21 I added another more luigi-specific in the examples directory (examples/ssh_remote_execution.py
22
23 :class:`RemoteContext` is meant to provide functionality similar to that of the standard library subprocess module,
24 but where the commands executed are run on a remote machine instead,
25 without the user having to think about prefixing everything with "ssh" and credentials etc.
26
27 Using this mini library (which is just a convenience wrapper for subprocess),
28 :class:`RemoteTarget` is created to let you stream data from a remotely stored file using
29 the luigi :class:`~luigi.target.FileSystemTarget` semantics.
30
31 As a bonus, :class:`RemoteContext` also provides a really cool feature that let's you
32 set up ssh tunnels super easily using a python context manager (there is an example
33 in the integration part of unittests).
34
35 This can be super convenient when you want secure communication using a non-secure
36 protocol or circumvent firewalls (as long as they are open for ssh traffic).
37 """
38
39 import contextlib
40 import os
41 import random
42 import subprocess
43
44 import luigi
45 import luigi.format
46 import luigi.target
47
48
49 class RemoteContext(object):
50
51 def __init__(self, host, username=None, key_file=None, connect_timeout=None, port=None):
52 self.host = host
53 self.username = username
54 self.key_file = key_file
55 self.connect_timeout = connect_timeout
56 self.port = port
57
58 def __repr__(self):
59 return '%s(%r, %r, %r, %r, %r)' % (
60 type(self).__name__, self.host, self.username, self.key_file, self.connect_timeout, self.port)
61
62 def __eq__(self, other):
63 return repr(self) == repr(other)
64
65 def __hash__(self):
66 return hash(repr(self))
67
68 def _host_ref(self):
69 if self.username:
70 return "{0}@{1}".format(self.username, self.host)
71 else:
72 return self.host
73
74 def _prepare_cmd(self, cmd):
75 connection_cmd = ["ssh", self._host_ref(),
76 "-S", "none", # disable ControlMaster since it causes all sorts of weird behaviour with subprocesses...
77 "-o", "BatchMode=yes", # no password prompts etc
78 ]
79 if self.port:
80 connection_cmd.extend(["-p", self.port])
81
82 if self.connect_timeout is not None:
83 connection_cmd += ['-o', 'ConnectTimeout=%d' % self.connect_timeout]
84
85 if self.key_file:
86 connection_cmd.extend(["-i", self.key_file])
87 return connection_cmd + cmd
88
89 def Popen(self, cmd, **kwargs):
90 """
91 Remote Popen.
92 """
93 prefixed_cmd = self._prepare_cmd(cmd)
94 return subprocess.Popen(prefixed_cmd, **kwargs)
95
96 def check_output(self, cmd):
97 """
98 Execute a shell command remotely and return the output.
99
100 Simplified version of Popen when you only want the output as a string and detect any errors.
101 """
102 p = self.Popen(cmd, stdout=subprocess.PIPE)
103 output, _ = p.communicate()
104 if p.returncode != 0:
105 raise subprocess.CalledProcessError(p.returncode, cmd)
106 return output
107
108 @contextlib.contextmanager
109 def tunnel(self, local_port, remote_port=None, remote_host="localhost"):
110 """
111 Open a tunnel between localhost:local_port and remote_host:remote_port via the host specified by this context.
112
113 Remember to close() the returned "tunnel" object in order to clean up
114 after yourself when you are done with the tunnel.
115 """
116 tunnel_host = "{0}:{1}:{2}".format(local_port, remote_host, remote_port)
117 proc = self.Popen(
118 # cat so we can shut down gracefully by closing stdin
119 ["-L", tunnel_host, "echo -n ready && cat"],
120 stdin=subprocess.PIPE,
121 stdout=subprocess.PIPE,
122 )
123 # make sure to get the data so we know the connection is established
124 ready = proc.stdout.read(5)
125 assert ready == b"ready", "Didn't get ready from remote echo"
126 yield # user code executed here
127 proc.communicate()
128 assert proc.returncode == 0, "Tunnel process did an unclean exit (returncode %s)" % (proc.returncode,)
129
130
131 class RemoteFileSystem(luigi.target.FileSystem):
132
133 def __init__(self, host, username=None, key_file=None, port=None):
134 self.remote_context = RemoteContext(host, username, key_file, port)
135
136 def exists(self, path):
137 """
138 Return `True` if file or directory at `path` exist, False otherwise.
139 """
140 try:
141 self.remote_context.check_output(["test", "-e", path])
142 except subprocess.CalledProcessError as e:
143 if e.returncode == 1:
144 return False
145 else:
146 raise
147 return True
148
149 def remove(self, path, recursive=True):
150 """
151 Remove file or directory at location `path`.
152 """
153 if recursive:
154 cmd = ["rm", "-r", path]
155 else:
156 cmd = ["rm", path]
157
158 self.remote_context.check_output(cmd)
159
160 def _scp(self, src, dest):
161 cmd = ["scp", "-q", "-B", "-C", "-o", "ControlMaster=no"]
162 if self.remote_context.key_file:
163 cmd.extend(["-i", self.remote_context.key_file])
164 if self.remote_context.port:
165 cmd.extend(["-P", self.remote_context.port])
166 if os.path.isdir(src):
167 cmd.extend(["-r"])
168 cmd.extend([src, dest])
169 p = subprocess.Popen(cmd)
170 output, _ = p.communicate()
171 if p.returncode != 0:
172 raise subprocess.CalledProcessError(p.returncode, cmd)
173
174 def put(self, local_path, path):
175 # create parent folder if not exists
176 normpath = os.path.normpath(path)
177 folder = os.path.dirname(normpath)
178 if folder and not self.exists(folder):
179 self.remote_context.check_output(['mkdir', '-p', folder])
180
181 tmp_path = path + '-luigi-tmp-%09d' % random.randrange(0, 1e10)
182 self._scp(local_path, "%s:%s" % (self.remote_context._host_ref(), tmp_path))
183 self.remote_context.check_output(['mv', tmp_path, path])
184
185 def get(self, path, local_path):
186 # Create folder if it does not exist
187 normpath = os.path.normpath(local_path)
188 folder = os.path.dirname(normpath)
189 if folder and not os.path.exists(folder):
190 os.makedirs(folder)
191
192 tmp_local_path = local_path + '-luigi-tmp-%09d' % random.randrange(0, 1e10)
193 self._scp("%s:%s" % (self.remote_context._host_ref(), path), tmp_local_path)
194 os.rename(tmp_local_path, local_path)
195
196
197 class AtomicRemoteFileWriter(luigi.format.OutputPipeProcessWrapper):
198
199 def __init__(self, fs, path):
200 self._fs = fs
201 self.path = path
202
203 # create parent folder if not exists
204 normpath = os.path.normpath(self.path)
205 folder = os.path.dirname(normpath)
206 if folder and not self.fs.exists(folder):
207 self.fs.remote_context.check_output(['mkdir', '-p', folder])
208
209 self.__tmp_path = self.path + '-luigi-tmp-%09d' % random.randrange(0, 1e10)
210 super(AtomicRemoteFileWriter, self).__init__(
211 self.fs.remote_context._prepare_cmd(['cat', '>', self.__tmp_path]))
212
213 def __del__(self):
214 super(AtomicRemoteFileWriter, self).__del__()
215 if self.fs.exists(self.__tmp_path):
216 self.fs.remote_context.check_output(['rm', self.__tmp_path])
217
218 def close(self):
219 super(AtomicRemoteFileWriter, self).close()
220 self.fs.remote_context.check_output(['mv', self.__tmp_path, self.path])
221
222 @property
223 def tmp_path(self):
224 return self.__tmp_path
225
226 @property
227 def fs(self):
228 return self._fs
229
230
231 class RemoteTarget(luigi.target.FileSystemTarget):
232 """
233 Target used for reading from remote files.
234
235 The target is implemented using ssh commands streaming data over the network.
236 """
237
238 def __init__(self, path, host, format=None, username=None, key_file=None, port=None):
239 super(RemoteTarget, self).__init__(path)
240 if format is None:
241 format = luigi.format.get_default_format()
242 self.format = format
243 self._fs = RemoteFileSystem(host, username, key_file, port)
244
245 @property
246 def fs(self):
247 return self._fs
248
249 def open(self, mode='r'):
250 if mode == 'w':
251 file_writer = AtomicRemoteFileWriter(self.fs, self.path)
252 if self.format:
253 return self.format.pipe_writer(file_writer)
254 else:
255 return file_writer
256 elif mode == 'r':
257 file_reader = luigi.format.InputPipeProcessWrapper(
258 self.fs.remote_context._prepare_cmd(["cat", self.path]))
259 if self.format:
260 return self.format.pipe_reader(file_reader)
261 else:
262 return file_reader
263 else:
264 raise Exception("mode must be r/w")
265
266 def put(self, local_path):
267 self.fs.put(local_path, self.path)
268
269 def get(self, local_path):
270 self.fs.get(self.path, local_path)
271
[end of luigi/contrib/ssh.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/contrib/ssh.py b/luigi/contrib/ssh.py
--- a/luigi/contrib/ssh.py
+++ b/luigi/contrib/ssh.py
@@ -40,6 +40,7 @@
import os
import random
import subprocess
+import posixpath
import luigi
import luigi.format
@@ -173,7 +174,7 @@
def put(self, local_path, path):
# create parent folder if not exists
- normpath = os.path.normpath(path)
+ normpath = posixpath.normpath(path)
folder = os.path.dirname(normpath)
if folder and not self.exists(folder):
self.remote_context.check_output(['mkdir', '-p', folder])
| {"golden_diff": "diff --git a/luigi/contrib/ssh.py b/luigi/contrib/ssh.py\n--- a/luigi/contrib/ssh.py\n+++ b/luigi/contrib/ssh.py\n@@ -40,6 +40,7 @@\n import os\n import random\n import subprocess\n+import posixpath\n \n import luigi\n import luigi.format\n@@ -173,7 +174,7 @@\n \n def put(self, local_path, path):\n # create parent folder if not exists\n- normpath = os.path.normpath(path)\n+ normpath = posixpath.normpath(path)\n folder = os.path.dirname(normpath)\n if folder and not self.exists(folder):\n self.remote_context.check_output(['mkdir', '-p', folder])\n", "issue": "RemoteFileSystem uses wrong path separator\nThe RemoteFileSystem uses the client path separators instead of the remote system path separators.\n\nThat means that when trying to write to a Linux RemoteTarget from a Windows Client, the path will be broken (backslashes instead of slashes as path separators, leading to wrong path names).\n\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\"\"\"\nLight-weight remote execution library and utilities.\n\nThere are some examples in the unittest, but\nI added another more luigi-specific in the examples directory (examples/ssh_remote_execution.py\n\n:class:`RemoteContext` is meant to provide functionality similar to that of the standard library subprocess module,\nbut where the commands executed are run on a remote machine instead,\nwithout the user having to think about prefixing everything with \"ssh\" and credentials etc.\n\nUsing this mini library (which is just a convenience wrapper for subprocess),\n:class:`RemoteTarget` is created to let you stream data from a remotely stored file using\nthe luigi :class:`~luigi.target.FileSystemTarget` semantics.\n\nAs a bonus, :class:`RemoteContext` also provides a really cool feature that let's you\nset up ssh tunnels super easily using a python context manager (there is an example\nin the integration part of unittests).\n\nThis can be super convenient when you want secure communication using a non-secure\nprotocol or circumvent firewalls (as long as they are open for ssh traffic).\n\"\"\"\n\nimport contextlib\nimport os\nimport random\nimport subprocess\n\nimport luigi\nimport luigi.format\nimport luigi.target\n\n\nclass RemoteContext(object):\n\n def __init__(self, host, username=None, key_file=None, connect_timeout=None, port=None):\n self.host = host\n self.username = username\n self.key_file = key_file\n self.connect_timeout = connect_timeout\n self.port = port\n\n def __repr__(self):\n return '%s(%r, %r, %r, %r, %r)' % (\n type(self).__name__, self.host, self.username, self.key_file, self.connect_timeout, self.port)\n\n def __eq__(self, other):\n return repr(self) == repr(other)\n\n def __hash__(self):\n return hash(repr(self))\n\n def _host_ref(self):\n if self.username:\n return \"{0}@{1}\".format(self.username, self.host)\n else:\n return self.host\n\n def _prepare_cmd(self, cmd):\n connection_cmd = [\"ssh\", self._host_ref(),\n \"-S\", \"none\", # disable ControlMaster since it causes all sorts of weird behaviour with subprocesses...\n \"-o\", \"BatchMode=yes\", # no password prompts etc\n ]\n if self.port:\n connection_cmd.extend([\"-p\", self.port])\n\n if self.connect_timeout is not None:\n connection_cmd += ['-o', 'ConnectTimeout=%d' % self.connect_timeout]\n\n if self.key_file:\n connection_cmd.extend([\"-i\", self.key_file])\n return connection_cmd + cmd\n\n def Popen(self, cmd, **kwargs):\n \"\"\"\n Remote Popen.\n \"\"\"\n prefixed_cmd = self._prepare_cmd(cmd)\n return subprocess.Popen(prefixed_cmd, **kwargs)\n\n def check_output(self, cmd):\n \"\"\"\n Execute a shell command remotely and return the output.\n\n Simplified version of Popen when you only want the output as a string and detect any errors.\n \"\"\"\n p = self.Popen(cmd, stdout=subprocess.PIPE)\n output, _ = p.communicate()\n if p.returncode != 0:\n raise subprocess.CalledProcessError(p.returncode, cmd)\n return output\n\n @contextlib.contextmanager\n def tunnel(self, local_port, remote_port=None, remote_host=\"localhost\"):\n \"\"\"\n Open a tunnel between localhost:local_port and remote_host:remote_port via the host specified by this context.\n\n Remember to close() the returned \"tunnel\" object in order to clean up\n after yourself when you are done with the tunnel.\n \"\"\"\n tunnel_host = \"{0}:{1}:{2}\".format(local_port, remote_host, remote_port)\n proc = self.Popen(\n # cat so we can shut down gracefully by closing stdin\n [\"-L\", tunnel_host, \"echo -n ready && cat\"],\n stdin=subprocess.PIPE,\n stdout=subprocess.PIPE,\n )\n # make sure to get the data so we know the connection is established\n ready = proc.stdout.read(5)\n assert ready == b\"ready\", \"Didn't get ready from remote echo\"\n yield # user code executed here\n proc.communicate()\n assert proc.returncode == 0, \"Tunnel process did an unclean exit (returncode %s)\" % (proc.returncode,)\n\n\nclass RemoteFileSystem(luigi.target.FileSystem):\n\n def __init__(self, host, username=None, key_file=None, port=None):\n self.remote_context = RemoteContext(host, username, key_file, port)\n\n def exists(self, path):\n \"\"\"\n Return `True` if file or directory at `path` exist, False otherwise.\n \"\"\"\n try:\n self.remote_context.check_output([\"test\", \"-e\", path])\n except subprocess.CalledProcessError as e:\n if e.returncode == 1:\n return False\n else:\n raise\n return True\n\n def remove(self, path, recursive=True):\n \"\"\"\n Remove file or directory at location `path`.\n \"\"\"\n if recursive:\n cmd = [\"rm\", \"-r\", path]\n else:\n cmd = [\"rm\", path]\n\n self.remote_context.check_output(cmd)\n\n def _scp(self, src, dest):\n cmd = [\"scp\", \"-q\", \"-B\", \"-C\", \"-o\", \"ControlMaster=no\"]\n if self.remote_context.key_file:\n cmd.extend([\"-i\", self.remote_context.key_file])\n if self.remote_context.port:\n cmd.extend([\"-P\", self.remote_context.port])\n if os.path.isdir(src):\n cmd.extend([\"-r\"])\n cmd.extend([src, dest])\n p = subprocess.Popen(cmd)\n output, _ = p.communicate()\n if p.returncode != 0:\n raise subprocess.CalledProcessError(p.returncode, cmd)\n\n def put(self, local_path, path):\n # create parent folder if not exists\n normpath = os.path.normpath(path)\n folder = os.path.dirname(normpath)\n if folder and not self.exists(folder):\n self.remote_context.check_output(['mkdir', '-p', folder])\n\n tmp_path = path + '-luigi-tmp-%09d' % random.randrange(0, 1e10)\n self._scp(local_path, \"%s:%s\" % (self.remote_context._host_ref(), tmp_path))\n self.remote_context.check_output(['mv', tmp_path, path])\n\n def get(self, path, local_path):\n # Create folder if it does not exist\n normpath = os.path.normpath(local_path)\n folder = os.path.dirname(normpath)\n if folder and not os.path.exists(folder):\n os.makedirs(folder)\n\n tmp_local_path = local_path + '-luigi-tmp-%09d' % random.randrange(0, 1e10)\n self._scp(\"%s:%s\" % (self.remote_context._host_ref(), path), tmp_local_path)\n os.rename(tmp_local_path, local_path)\n\n\nclass AtomicRemoteFileWriter(luigi.format.OutputPipeProcessWrapper):\n\n def __init__(self, fs, path):\n self._fs = fs\n self.path = path\n\n # create parent folder if not exists\n normpath = os.path.normpath(self.path)\n folder = os.path.dirname(normpath)\n if folder and not self.fs.exists(folder):\n self.fs.remote_context.check_output(['mkdir', '-p', folder])\n\n self.__tmp_path = self.path + '-luigi-tmp-%09d' % random.randrange(0, 1e10)\n super(AtomicRemoteFileWriter, self).__init__(\n self.fs.remote_context._prepare_cmd(['cat', '>', self.__tmp_path]))\n\n def __del__(self):\n super(AtomicRemoteFileWriter, self).__del__()\n if self.fs.exists(self.__tmp_path):\n self.fs.remote_context.check_output(['rm', self.__tmp_path])\n\n def close(self):\n super(AtomicRemoteFileWriter, self).close()\n self.fs.remote_context.check_output(['mv', self.__tmp_path, self.path])\n\n @property\n def tmp_path(self):\n return self.__tmp_path\n\n @property\n def fs(self):\n return self._fs\n\n\nclass RemoteTarget(luigi.target.FileSystemTarget):\n \"\"\"\n Target used for reading from remote files.\n\n The target is implemented using ssh commands streaming data over the network.\n \"\"\"\n\n def __init__(self, path, host, format=None, username=None, key_file=None, port=None):\n super(RemoteTarget, self).__init__(path)\n if format is None:\n format = luigi.format.get_default_format()\n self.format = format\n self._fs = RemoteFileSystem(host, username, key_file, port)\n\n @property\n def fs(self):\n return self._fs\n\n def open(self, mode='r'):\n if mode == 'w':\n file_writer = AtomicRemoteFileWriter(self.fs, self.path)\n if self.format:\n return self.format.pipe_writer(file_writer)\n else:\n return file_writer\n elif mode == 'r':\n file_reader = luigi.format.InputPipeProcessWrapper(\n self.fs.remote_context._prepare_cmd([\"cat\", self.path]))\n if self.format:\n return self.format.pipe_reader(file_reader)\n else:\n return file_reader\n else:\n raise Exception(\"mode must be r/w\")\n\n def put(self, local_path):\n self.fs.put(local_path, self.path)\n\n def get(self, local_path):\n self.fs.get(self.path, local_path)\n", "path": "luigi/contrib/ssh.py"}]} | 3,528 | 167 |
gh_patches_debug_8627 | rasdani/github-patches | git_diff | HypothesisWorks__hypothesis-809 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Pushing to master in deploy isn't working
As far as I can tell the deploy process is just completely failing to push to master every time and succeeding at pushing the tag every time. This suggests the problem is not github flakiness like I believed.
Notes:
* I could swear I've seen this working at least once, but maybe I'm misremembering.
* The command it's running *does* work locally
* It's running as me, so it should be allowed to push to master due to my admin privileges
I'm not really sure what's going on. I'll make a speculative pull request shortly to try and fix it, but it's hard to debug and I'm mostly just guessing at this point.
</issue>
<code>
[start of scripts/hypothesistooling.py]
1 # coding=utf-8
2 #
3 # This file is part of Hypothesis, which may be found at
4 # https://github.com/HypothesisWorks/hypothesis-python
5 #
6 # Most of this work is copyright (C) 2013-2017 David R. MacIver
7 # ([email protected]), but it contains contributions by others. See
8 # CONTRIBUTING.rst for a full list of people who may hold copyright, and
9 # consult the git log if you need to determine who owns an individual
10 # contribution.
11 #
12 # This Source Code Form is subject to the terms of the Mozilla Public License,
13 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
14 # obtain one at http://mozilla.org/MPL/2.0/.
15 #
16 # END HEADER
17
18 from __future__ import division, print_function, absolute_import
19
20 import os
21 import re
22 import sys
23 import subprocess
24 from datetime import datetime, timedelta
25
26
27 def current_branch():
28 return subprocess.check_output([
29 'git', 'rev-parse', '--abbrev-ref', 'HEAD'
30 ]).decode('ascii').strip()
31
32
33 def tags():
34 result = [t.decode('ascii') for t in subprocess.check_output([
35 'git', 'tag'
36 ]).split(b"\n")]
37 assert len(set(result)) == len(result)
38 return set(result)
39
40
41 ROOT = subprocess.check_output([
42 'git', 'rev-parse', '--show-toplevel']).decode('ascii').strip()
43 SRC = os.path.join(ROOT, 'src')
44
45 assert os.path.exists(SRC)
46
47
48 __version__ = None
49 __version_info__ = None
50
51 VERSION_FILE = os.path.join(ROOT, 'src/hypothesis/version.py')
52
53 with open(VERSION_FILE) as o:
54 exec(o.read())
55
56 assert __version__ is not None
57 assert __version_info__ is not None
58
59
60 def latest_version():
61 versions = []
62
63 for t in tags():
64 # All versions get tags but not all tags are versions (and there are
65 # a large number of historic tags with a different format for versions)
66 # so we parse each tag as a triple of ints (MAJOR, MINOR, PATCH)
67 # and skip any tag that doesn't match that.
68 assert t == t.strip()
69 parts = t.split('.')
70 if len(parts) != 3:
71 continue
72 try:
73 v = tuple(map(int, parts))
74 except ValueError:
75 continue
76
77 versions.append((v, t))
78
79 _, latest = max(versions)
80
81 assert latest in tags()
82 return latest
83
84
85 def hash_for_name(name):
86 return subprocess.check_output([
87 'git', 'rev-parse', name
88 ]).decode('ascii').strip()
89
90
91 def is_ancestor(a, b):
92 check = subprocess.call([
93 'git', 'merge-base', '--is-ancestor', a, b
94 ])
95 assert 0 <= check <= 1
96 return check == 0
97
98
99 CHANGELOG_FILE = os.path.join(ROOT, 'docs', 'changes.rst')
100
101
102 def changelog():
103 with open(CHANGELOG_FILE) as i:
104 return i.read()
105
106
107 def merge_base(a, b):
108 return subprocess.check_output([
109 'git', 'merge-base', a, b,
110 ]).strip()
111
112
113 def has_source_changes(version=None):
114 if version is None:
115 version = latest_version()
116
117 # Check where we branched off from the version. We're only interested
118 # in whether *we* introduced any source changes, so we check diff from
119 # there rather than the diff to the other side.
120 point_of_divergence = merge_base('HEAD', version)
121
122 return subprocess.call([
123 'git', 'diff', '--exit-code', point_of_divergence, 'HEAD', '--', SRC,
124 ]) != 0
125
126
127 def has_uncommitted_changes(filename):
128 return subprocess.call([
129 'git', 'diff', '--exit-code', filename
130 ]) != 0
131
132
133 def git(*args):
134 subprocess.check_call(('git',) + args)
135
136
137 def create_tag_and_push():
138 assert __version__ not in tags()
139 git('config', 'user.name', 'Travis CI on behalf of David R. MacIver')
140 git('config', 'user.email', '[email protected]')
141 git('config', 'core.sshCommand', 'ssh -i deploy_key')
142 git(
143 'remote', 'add', 'ssh-origin',
144 '[email protected]:HypothesisWorks/hypothesis-python.git'
145 )
146 git('tag', __version__)
147
148 for command in [
149 'git push ssh-origin --tags',
150 'git push ssh-origin HEAD:master',
151 ]:
152 subprocess.check_call([
153 'ssh-agent', 'sh', '-c',
154 'chmod 0600 deploy_key && ' +
155 'ssh-add deploy_key && ' +
156 command
157 ])
158
159
160 def build_jobs():
161 """Query the Travis API to find out what the state of the other build jobs
162 is.
163
164 Note: This usage of Travis has been somewhat reverse engineered due
165 to a certain dearth of documentation as to what values what takes
166 when.
167
168 """
169 import requests
170
171 build_id = os.environ['TRAVIS_BUILD_ID']
172
173 url = 'https://api.travis-ci.org/builds/%s' % (build_id,)
174 data = requests.get(url, headers={
175 'Accept': 'application/vnd.travis-ci.2+json'
176 }).json()
177
178 matrix = data['jobs']
179
180 jobs = {}
181
182 for m in matrix:
183 name = m['config']['env'].replace('TASK=', '')
184 status = m['state']
185 jobs.setdefault(status, []).append(name)
186 return jobs
187
188
189 def modified_files():
190 files = set()
191 for command in [
192 ['git', 'diff', '--name-only', '--diff-filter=d',
193 latest_version(), 'HEAD'],
194 ['git', 'diff', '--name-only']
195 ]:
196 diff_output = subprocess.check_output(command).decode('ascii')
197 for l in diff_output.split('\n'):
198 filepath = l.strip()
199 if filepath:
200 assert os.path.exists(filepath)
201 files.add(filepath)
202 return files
203
204
205 def all_files():
206 return subprocess.check_output(['git', 'ls-files']).decode(
207 'ascii').splitlines()
208
209
210 RELEASE_FILE = os.path.join(ROOT, 'RELEASE.rst')
211
212
213 def has_release():
214 return os.path.exists(RELEASE_FILE)
215
216
217 CHANGELOG_BORDER = re.compile(r"^-+$")
218 CHANGELOG_HEADER = re.compile(r"^\d+\.\d+\.\d+ - \d\d\d\d-\d\d-\d\d$")
219 RELEASE_TYPE = re.compile(r"^RELEASE_TYPE: +(major|minor|patch)")
220
221
222 MAJOR = 'major'
223 MINOR = 'minor'
224 PATCH = 'patch'
225
226 VALID_RELEASE_TYPES = (MAJOR, MINOR, PATCH)
227
228
229 def parse_release_file():
230 with open(RELEASE_FILE) as i:
231 release_contents = i.read()
232
233 release_lines = release_contents.split('\n')
234
235 m = RELEASE_TYPE.match(release_lines[0])
236 if m is not None:
237 release_type = m.group(1)
238 if release_type not in VALID_RELEASE_TYPES:
239 print('Unrecognised release type %r' % (release_type,))
240 sys.exit(1)
241 del release_lines[0]
242 release_contents = '\n'.join(release_lines).strip()
243 else:
244 print(
245 'RELEASE.rst does not start by specifying release type. The first '
246 'line of the file should be RELEASE_TYPE: followed by one of '
247 'major, minor, or patch, to specify the type of release that '
248 'this is (i.e. which version number to increment). Instead the '
249 'first line was %r' % (release_lines[0],)
250 )
251 sys.exit(1)
252
253 return release_type, release_contents
254
255
256 def update_changelog_and_version():
257 global __version_info__
258 global __version__
259
260 with open(CHANGELOG_FILE) as i:
261 contents = i.read()
262 assert '\r' not in contents
263 lines = contents.split('\n')
264 assert contents == '\n'.join(lines)
265 for i, l in enumerate(lines):
266 if CHANGELOG_BORDER.match(l):
267 assert CHANGELOG_HEADER.match(lines[i + 1]), repr(lines[i + 1])
268 assert CHANGELOG_BORDER.match(lines[i + 2]), repr(lines[i + 2])
269 beginning = '\n'.join(lines[:i])
270 rest = '\n'.join(lines[i:])
271 assert '\n'.join((beginning, rest)) == contents
272 break
273
274 release_type, release_contents = parse_release_file()
275
276 new_version = list(__version_info__)
277 bump = VALID_RELEASE_TYPES.index(release_type)
278 new_version[bump] += 1
279 for i in range(bump + 1, len(new_version)):
280 new_version[i] = 0
281 new_version = tuple(new_version)
282 new_version_string = '.'.join(map(str, new_version))
283
284 __version_info__ = new_version
285 __version__ = new_version_string
286
287 with open(VERSION_FILE) as i:
288 version_lines = i.read().split('\n')
289
290 for i, l in enumerate(version_lines):
291 if 'version_info' in l:
292 version_lines[i] = '__version_info__ = %r' % (new_version,)
293 break
294
295 with open(VERSION_FILE, 'w') as o:
296 o.write('\n'.join(version_lines))
297
298 now = datetime.utcnow()
299
300 date = max([
301 d.strftime('%Y-%m-%d') for d in (now, now + timedelta(hours=1))
302 ])
303
304 heading_for_new_version = ' - '.join((new_version_string, date))
305 border_for_new_version = '-' * len(heading_for_new_version)
306
307 new_changelog_parts = [
308 beginning.strip(),
309 '',
310 border_for_new_version,
311 heading_for_new_version,
312 border_for_new_version,
313 '',
314 release_contents,
315 '',
316 rest
317 ]
318
319 with open(CHANGELOG_FILE, 'w') as o:
320 o.write('\n'.join(new_changelog_parts))
321
322
323 def update_for_pending_release():
324 update_changelog_and_version()
325
326 git('rm', RELEASE_FILE)
327 git('add', CHANGELOG_FILE, VERSION_FILE)
328
329 git(
330 'commit',
331 '-m', 'Bump version to %s and update changelog' % (__version__,)
332 )
333
[end of scripts/hypothesistooling.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/hypothesistooling.py b/scripts/hypothesistooling.py
--- a/scripts/hypothesistooling.py
+++ b/scripts/hypothesistooling.py
@@ -145,16 +145,13 @@
)
git('tag', __version__)
- for command in [
- 'git push ssh-origin --tags',
- 'git push ssh-origin HEAD:master',
- ]:
- subprocess.check_call([
- 'ssh-agent', 'sh', '-c',
- 'chmod 0600 deploy_key && ' +
- 'ssh-add deploy_key && ' +
- command
- ])
+ subprocess.check_call([
+ 'ssh-agent', 'sh', '-c',
+ 'chmod 0600 deploy_key && ' +
+ 'ssh-add deploy_key && ' +
+ 'git push ssh-origin HEAD:master &&'
+ 'git push ssh-origin --tags'
+ ])
def build_jobs():
| {"golden_diff": "diff --git a/scripts/hypothesistooling.py b/scripts/hypothesistooling.py\n--- a/scripts/hypothesistooling.py\n+++ b/scripts/hypothesistooling.py\n@@ -145,16 +145,13 @@\n )\n git('tag', __version__)\n \n- for command in [\n- 'git push ssh-origin --tags',\n- 'git push ssh-origin HEAD:master',\n- ]:\n- subprocess.check_call([\n- 'ssh-agent', 'sh', '-c',\n- 'chmod 0600 deploy_key && ' +\n- 'ssh-add deploy_key && ' +\n- command\n- ])\n+ subprocess.check_call([\n+ 'ssh-agent', 'sh', '-c',\n+ 'chmod 0600 deploy_key && ' +\n+ 'ssh-add deploy_key && ' +\n+ 'git push ssh-origin HEAD:master &&'\n+ 'git push ssh-origin --tags'\n+ ])\n \n \n def build_jobs():\n", "issue": "Pushing to master in deploy isn't working\nAs far as I can tell the deploy process is just completely failing to push to master every time and succeeding at pushing the tag every time. This suggests the problem is not github flakiness like I believed.\r\n\r\nNotes:\r\n\r\n* I could swear I've seen this working at least once, but maybe I'm misremembering.\r\n* The command it's running *does* work locally\r\n* It's running as me, so it should be allowed to push to master due to my admin privileges\r\n\r\nI'm not really sure what's going on. I'll make a speculative pull request shortly to try and fix it, but it's hard to debug and I'm mostly just guessing at this point.\n", "before_files": [{"content": "# coding=utf-8\n#\n# This file is part of Hypothesis, which may be found at\n# https://github.com/HypothesisWorks/hypothesis-python\n#\n# Most of this work is copyright (C) 2013-2017 David R. MacIver\n# ([email protected]), but it contains contributions by others. See\n# CONTRIBUTING.rst for a full list of people who may hold copyright, and\n# consult the git log if you need to determine who owns an individual\n# contribution.\n#\n# This Source Code Form is subject to the terms of the Mozilla Public License,\n# v. 2.0. If a copy of the MPL was not distributed with this file, You can\n# obtain one at http://mozilla.org/MPL/2.0/.\n#\n# END HEADER\n\nfrom __future__ import division, print_function, absolute_import\n\nimport os\nimport re\nimport sys\nimport subprocess\nfrom datetime import datetime, timedelta\n\n\ndef current_branch():\n return subprocess.check_output([\n 'git', 'rev-parse', '--abbrev-ref', 'HEAD'\n ]).decode('ascii').strip()\n\n\ndef tags():\n result = [t.decode('ascii') for t in subprocess.check_output([\n 'git', 'tag'\n ]).split(b\"\\n\")]\n assert len(set(result)) == len(result)\n return set(result)\n\n\nROOT = subprocess.check_output([\n 'git', 'rev-parse', '--show-toplevel']).decode('ascii').strip()\nSRC = os.path.join(ROOT, 'src')\n\nassert os.path.exists(SRC)\n\n\n__version__ = None\n__version_info__ = None\n\nVERSION_FILE = os.path.join(ROOT, 'src/hypothesis/version.py')\n\nwith open(VERSION_FILE) as o:\n exec(o.read())\n\nassert __version__ is not None\nassert __version_info__ is not None\n\n\ndef latest_version():\n versions = []\n\n for t in tags():\n # All versions get tags but not all tags are versions (and there are\n # a large number of historic tags with a different format for versions)\n # so we parse each tag as a triple of ints (MAJOR, MINOR, PATCH)\n # and skip any tag that doesn't match that.\n assert t == t.strip()\n parts = t.split('.')\n if len(parts) != 3:\n continue\n try:\n v = tuple(map(int, parts))\n except ValueError:\n continue\n\n versions.append((v, t))\n\n _, latest = max(versions)\n\n assert latest in tags()\n return latest\n\n\ndef hash_for_name(name):\n return subprocess.check_output([\n 'git', 'rev-parse', name\n ]).decode('ascii').strip()\n\n\ndef is_ancestor(a, b):\n check = subprocess.call([\n 'git', 'merge-base', '--is-ancestor', a, b\n ])\n assert 0 <= check <= 1\n return check == 0\n\n\nCHANGELOG_FILE = os.path.join(ROOT, 'docs', 'changes.rst')\n\n\ndef changelog():\n with open(CHANGELOG_FILE) as i:\n return i.read()\n\n\ndef merge_base(a, b):\n return subprocess.check_output([\n 'git', 'merge-base', a, b,\n ]).strip()\n\n\ndef has_source_changes(version=None):\n if version is None:\n version = latest_version()\n\n # Check where we branched off from the version. We're only interested\n # in whether *we* introduced any source changes, so we check diff from\n # there rather than the diff to the other side.\n point_of_divergence = merge_base('HEAD', version)\n\n return subprocess.call([\n 'git', 'diff', '--exit-code', point_of_divergence, 'HEAD', '--', SRC,\n ]) != 0\n\n\ndef has_uncommitted_changes(filename):\n return subprocess.call([\n 'git', 'diff', '--exit-code', filename\n ]) != 0\n\n\ndef git(*args):\n subprocess.check_call(('git',) + args)\n\n\ndef create_tag_and_push():\n assert __version__ not in tags()\n git('config', 'user.name', 'Travis CI on behalf of David R. MacIver')\n git('config', 'user.email', '[email protected]')\n git('config', 'core.sshCommand', 'ssh -i deploy_key')\n git(\n 'remote', 'add', 'ssh-origin',\n '[email protected]:HypothesisWorks/hypothesis-python.git'\n )\n git('tag', __version__)\n\n for command in [\n 'git push ssh-origin --tags',\n 'git push ssh-origin HEAD:master',\n ]:\n subprocess.check_call([\n 'ssh-agent', 'sh', '-c',\n 'chmod 0600 deploy_key && ' +\n 'ssh-add deploy_key && ' +\n command\n ])\n\n\ndef build_jobs():\n \"\"\"Query the Travis API to find out what the state of the other build jobs\n is.\n\n Note: This usage of Travis has been somewhat reverse engineered due\n to a certain dearth of documentation as to what values what takes\n when.\n\n \"\"\"\n import requests\n\n build_id = os.environ['TRAVIS_BUILD_ID']\n\n url = 'https://api.travis-ci.org/builds/%s' % (build_id,)\n data = requests.get(url, headers={\n 'Accept': 'application/vnd.travis-ci.2+json'\n }).json()\n\n matrix = data['jobs']\n\n jobs = {}\n\n for m in matrix:\n name = m['config']['env'].replace('TASK=', '')\n status = m['state']\n jobs.setdefault(status, []).append(name)\n return jobs\n\n\ndef modified_files():\n files = set()\n for command in [\n ['git', 'diff', '--name-only', '--diff-filter=d',\n latest_version(), 'HEAD'],\n ['git', 'diff', '--name-only']\n ]:\n diff_output = subprocess.check_output(command).decode('ascii')\n for l in diff_output.split('\\n'):\n filepath = l.strip()\n if filepath:\n assert os.path.exists(filepath)\n files.add(filepath)\n return files\n\n\ndef all_files():\n return subprocess.check_output(['git', 'ls-files']).decode(\n 'ascii').splitlines()\n\n\nRELEASE_FILE = os.path.join(ROOT, 'RELEASE.rst')\n\n\ndef has_release():\n return os.path.exists(RELEASE_FILE)\n\n\nCHANGELOG_BORDER = re.compile(r\"^-+$\")\nCHANGELOG_HEADER = re.compile(r\"^\\d+\\.\\d+\\.\\d+ - \\d\\d\\d\\d-\\d\\d-\\d\\d$\")\nRELEASE_TYPE = re.compile(r\"^RELEASE_TYPE: +(major|minor|patch)\")\n\n\nMAJOR = 'major'\nMINOR = 'minor'\nPATCH = 'patch'\n\nVALID_RELEASE_TYPES = (MAJOR, MINOR, PATCH)\n\n\ndef parse_release_file():\n with open(RELEASE_FILE) as i:\n release_contents = i.read()\n\n release_lines = release_contents.split('\\n')\n\n m = RELEASE_TYPE.match(release_lines[0])\n if m is not None:\n release_type = m.group(1)\n if release_type not in VALID_RELEASE_TYPES:\n print('Unrecognised release type %r' % (release_type,))\n sys.exit(1)\n del release_lines[0]\n release_contents = '\\n'.join(release_lines).strip()\n else:\n print(\n 'RELEASE.rst does not start by specifying release type. The first '\n 'line of the file should be RELEASE_TYPE: followed by one of '\n 'major, minor, or patch, to specify the type of release that '\n 'this is (i.e. which version number to increment). Instead the '\n 'first line was %r' % (release_lines[0],)\n )\n sys.exit(1)\n\n return release_type, release_contents\n\n\ndef update_changelog_and_version():\n global __version_info__\n global __version__\n\n with open(CHANGELOG_FILE) as i:\n contents = i.read()\n assert '\\r' not in contents\n lines = contents.split('\\n')\n assert contents == '\\n'.join(lines)\n for i, l in enumerate(lines):\n if CHANGELOG_BORDER.match(l):\n assert CHANGELOG_HEADER.match(lines[i + 1]), repr(lines[i + 1])\n assert CHANGELOG_BORDER.match(lines[i + 2]), repr(lines[i + 2])\n beginning = '\\n'.join(lines[:i])\n rest = '\\n'.join(lines[i:])\n assert '\\n'.join((beginning, rest)) == contents\n break\n\n release_type, release_contents = parse_release_file()\n\n new_version = list(__version_info__)\n bump = VALID_RELEASE_TYPES.index(release_type)\n new_version[bump] += 1\n for i in range(bump + 1, len(new_version)):\n new_version[i] = 0\n new_version = tuple(new_version)\n new_version_string = '.'.join(map(str, new_version))\n\n __version_info__ = new_version\n __version__ = new_version_string\n\n with open(VERSION_FILE) as i:\n version_lines = i.read().split('\\n')\n\n for i, l in enumerate(version_lines):\n if 'version_info' in l:\n version_lines[i] = '__version_info__ = %r' % (new_version,)\n break\n\n with open(VERSION_FILE, 'w') as o:\n o.write('\\n'.join(version_lines))\n\n now = datetime.utcnow()\n\n date = max([\n d.strftime('%Y-%m-%d') for d in (now, now + timedelta(hours=1))\n ])\n\n heading_for_new_version = ' - '.join((new_version_string, date))\n border_for_new_version = '-' * len(heading_for_new_version)\n\n new_changelog_parts = [\n beginning.strip(),\n '',\n border_for_new_version,\n heading_for_new_version,\n border_for_new_version,\n '',\n release_contents,\n '',\n rest\n ]\n\n with open(CHANGELOG_FILE, 'w') as o:\n o.write('\\n'.join(new_changelog_parts))\n\n\ndef update_for_pending_release():\n update_changelog_and_version()\n\n git('rm', RELEASE_FILE)\n git('add', CHANGELOG_FILE, VERSION_FILE)\n\n git(\n 'commit',\n '-m', 'Bump version to %s and update changelog' % (__version__,)\n )\n", "path": "scripts/hypothesistooling.py"}]} | 3,881 | 223 |
gh_patches_debug_669 | rasdani/github-patches | git_diff | vacanza__python-holidays-1699 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Update branch names
Rename:
- `master` -> `main`
- `beta` -> `dev`
</issue>
<code>
[start of scripts/generate_release_notes.py]
1 #!/usr/bin/env python3
2
3 # python-holidays
4 # ---------------
5 # A fast, efficient Python library for generating country, province and state
6 # specific sets of holidays on the fly. It aims to make determining whether a
7 # specific date is a holiday as fast and flexible as possible.
8 #
9 # Authors: dr-prodigy <[email protected]> (c) 2017-2023
10 # ryanss <[email protected]> (c) 2014-2017
11 # Website: https://github.com/dr-prodigy/python-holidays
12 # License: MIT (see LICENSE file)
13
14 import argparse
15 import re
16 import sys
17 from datetime import date
18 from pathlib import Path
19 from typing import Dict, Set
20
21 from git import Repo
22 from github import Github
23 from github.GithubException import UnknownObjectException
24
25 sys.path.append(f"{Path.cwd()}")
26 import holidays # noqa: E402
27
28 BRANCH_NAME = "beta"
29 HEADER_TEMPLATE = """
30 Version {version}
31 ============
32
33 Released {month} {day}, {year}
34 """
35 IGNORED_CONTRIBUTORS = {"dependabot[bot]", "github-actions[bot]"}
36 REPOSITORY_NAME = "vacanza/python-holidays"
37
38
39 class ReleaseNotesGenerator:
40 """
41 Generates release notes based on local git commits and GitHub PRs metadata.
42
43 Usage example: scripts/generate_release_notes.py
44 """
45
46 def __init__(self) -> None:
47 arg_parser = argparse.ArgumentParser()
48 arg_parser.add_argument(
49 "-a",
50 "--author-only",
51 action="extend",
52 default=[],
53 help="Add only author as a contributor for this PR",
54 nargs="+",
55 type=int,
56 )
57 arg_parser.add_argument(
58 "-c",
59 "--cut-off-at",
60 help="Cut off at PR",
61 required=False,
62 type=int,
63 )
64 arg_parser.add_argument(
65 "-e",
66 "--exclude",
67 action="extend",
68 default=[],
69 help="Exclude this PR from the release notes",
70 nargs="+",
71 type=int,
72 )
73 arg_parser.add_argument(
74 "-v",
75 "--verbose",
76 action="store_true",
77 default=False,
78 help="Verbose output",
79 )
80 self.args = arg_parser.parse_args()
81
82 self.local_repo = Repo(Path.cwd())
83 self.remote_repo = Github(self.github_token).get_repo(REPOSITORY_NAME)
84
85 self.previous_commits: Set[str] = set()
86 self.pull_requests: Dict[int, str] = {}
87
88 self.tag = holidays.__version__
89
90 try:
91 latest_tag = self.remote_repo.get_tags()[0]
92 self.latest_tag_name = latest_tag.name
93 self.previous_commits.add(latest_tag.commit.sha)
94 except IndexError:
95 self.latest_tag_name = None
96
97 @property
98 def github_token(self, path=Path(".github_token")):
99 """Return GitHub access token."""
100 return path.read_text(encoding="UTF-8").strip()
101
102 @property
103 def is_ready(self):
104 """Perform environment checks and input validation."""
105 current_branch = str(self.local_repo.active_branch)
106 if current_branch != BRANCH_NAME:
107 exit(
108 f"Switch to '{BRANCH_NAME}' first (currently in "
109 f"'{current_branch}'). Use 'git switch {BRANCH_NAME}'."
110 )
111
112 return True
113
114 @property
115 def sorted_pull_requests(self):
116 def custom_order(pr):
117 pr = re.findall(r"^(.*) \(#\d+ .*\)$", pr)[0]
118
119 if re.findall(r"^(Introduce|Refactor)", pr) or re.findall(r"Add .* support", pr):
120 weight = 10
121 elif re.findall(r"^Add .* holidays$", pr):
122 weight = 20
123 elif re.findall(r"(^Localize|localization$)", pr):
124 weight = 30
125 elif re.findall(r"^Fix", pr):
126 weight = 40
127 elif re.findall(r"^(Change|Improve|Optimize|Update|Upgrade)", pr):
128 weight = 50
129 else:
130 weight = 100
131
132 return (weight, pr)
133
134 return sorted(self.pull_requests.values(), key=custom_order)
135
136 def add_pull_request(self, pull_request):
137 """Add pull request information to the release notes dict."""
138 author = pull_request.user.login if pull_request.user else None
139 if author in IGNORED_CONTRIBUTORS:
140 print((f"Skipping #{pull_request.number} {pull_request.title}" f" by {author}"))
141 return None
142
143 # Skip failed release attempt PRs, version upgrades.
144 pr_title = pull_request.title
145 skip_titles = (f"v.{self.tag}", "Bump", "Revert")
146 for skip_title in skip_titles:
147 if pr_title.startswith(skip_title):
148 return None
149
150 # Get contributors (expand from commits by default).
151 contributors = set()
152 if pull_request.number not in self.args.author_only:
153 for commit in pull_request.get_commits():
154 if commit.author:
155 contributors.add(commit.author.login)
156
157 if author in contributors:
158 contributors.remove(author)
159 contributors = (f"@{c}" for c in [author] + sorted(contributors, key=str.lower))
160 self.pull_requests[pull_request.number] = (
161 f"{pull_request.title} (#{pull_request.number} by " f"{', '.join(contributors)})"
162 )
163
164 def generate_release_notes(self):
165 """Generate release notes contents."""
166 print("Processing pull requests...")
167 self.get_new_pull_requests()
168 self.get_old_pull_requests()
169 print("Done!")
170
171 def get_new_pull_requests(self):
172 """Get PRs created after the latest release.
173
174 This operation also populates a set of previous release commits.
175 """
176 cut_off_at = self.args.cut_off_at
177 excluded_pr_numbers = set(self.args.exclude)
178 for pull_request in self.remote_repo.get_pulls(state="closed"):
179 # Stop getting pull requests after previous release tag or specific PR number.
180 cut_off = cut_off_at and pull_request.number == cut_off_at
181 if cut_off or pull_request.title == self.latest_tag_name:
182 # Get previous release commits SHAs.
183 for commit in pull_request.get_commits():
184 self.previous_commits.add(commit.sha)
185 break
186
187 # Skip closed unmerged PRs.
188 if not pull_request.merged:
189 continue
190
191 if pull_request.number in excluded_pr_numbers:
192 if self.args.verbose:
193 print(f"Excluding PR #{pull_request.number} as requested")
194 continue
195
196 if self.args.verbose:
197 messages = [f"Fetching PR #{pull_request.number}"]
198 if pull_request.number in self.args.author_only:
199 messages.append("(keeping PR author as a sole contributor)")
200 print(" ".join(messages))
201
202 self.add_pull_request(pull_request)
203
204 def get_old_pull_requests(self):
205 """Get PRs created before the latest release."""
206 pull_request_numbers = set()
207 for commit in self.local_repo.iter_commits():
208 if commit.hexsha in self.previous_commits:
209 break
210
211 try:
212 pull_request_number = re.findall(
213 r"#(\d{3,})",
214 commit.message,
215 )[0]
216 pull_request_numbers.add(int(pull_request_number))
217 except IndexError:
218 continue
219
220 # Fetch old PRs metadata only. Skip all known PRs.
221 pull_request_numbers -= set(self.pull_requests.keys())
222 pull_request_numbers -= set(self.args.exclude)
223 for pull_request_number in pull_request_numbers:
224 if self.args.verbose:
225 messages = [f"Fetching PR #{pull_request_number}"]
226 if pull_request_number in self.args.author_only:
227 messages.append("(keeping PR author as a sole contributor)")
228 print(" ".join(messages))
229
230 try:
231 self.add_pull_request(self.remote_repo.get_pull(pull_request_number))
232 # 3rd party contributions to forks.
233 except UnknownObjectException:
234 pass
235
236 def print_release_notes(self):
237 """Print generated release notes."""
238 print("")
239 if self.pull_requests:
240 today = date.today()
241 print(
242 HEADER_TEMPLATE.format(
243 day=today.day,
244 month=today.strftime("%B"),
245 version=self.tag,
246 year=today.year,
247 )
248 )
249 print("\n".join((f"- {pr}" for pr in self.sorted_pull_requests)))
250
251 else:
252 print(f"No changes since {self.latest_tag_name} release.")
253
254
255 if __name__ == "__main__":
256 rng = ReleaseNotesGenerator()
257 if rng.is_ready:
258 rng.generate_release_notes()
259 rng.print_release_notes()
260
[end of scripts/generate_release_notes.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/generate_release_notes.py b/scripts/generate_release_notes.py
--- a/scripts/generate_release_notes.py
+++ b/scripts/generate_release_notes.py
@@ -25,7 +25,7 @@
sys.path.append(f"{Path.cwd()}")
import holidays # noqa: E402
-BRANCH_NAME = "beta"
+BRANCH_NAME = "dev"
HEADER_TEMPLATE = """
Version {version}
============
| {"golden_diff": "diff --git a/scripts/generate_release_notes.py b/scripts/generate_release_notes.py\n--- a/scripts/generate_release_notes.py\n+++ b/scripts/generate_release_notes.py\n@@ -25,7 +25,7 @@\n sys.path.append(f\"{Path.cwd()}\")\n import holidays # noqa: E402\n \n-BRANCH_NAME = \"beta\"\n+BRANCH_NAME = \"dev\"\n HEADER_TEMPLATE = \"\"\"\n Version {version}\n ============\n", "issue": "Update branch names\nRename:\r\n - `master` -> `main`\r\n - `beta` -> `dev`\r\n\n", "before_files": [{"content": "#!/usr/bin/env python3\n\n# python-holidays\n# ---------------\n# A fast, efficient Python library for generating country, province and state\n# specific sets of holidays on the fly. It aims to make determining whether a\n# specific date is a holiday as fast and flexible as possible.\n#\n# Authors: dr-prodigy <[email protected]> (c) 2017-2023\n# ryanss <[email protected]> (c) 2014-2017\n# Website: https://github.com/dr-prodigy/python-holidays\n# License: MIT (see LICENSE file)\n\nimport argparse\nimport re\nimport sys\nfrom datetime import date\nfrom pathlib import Path\nfrom typing import Dict, Set\n\nfrom git import Repo\nfrom github import Github\nfrom github.GithubException import UnknownObjectException\n\nsys.path.append(f\"{Path.cwd()}\")\nimport holidays # noqa: E402\n\nBRANCH_NAME = \"beta\"\nHEADER_TEMPLATE = \"\"\"\nVersion {version}\n============\n\nReleased {month} {day}, {year}\n\"\"\"\nIGNORED_CONTRIBUTORS = {\"dependabot[bot]\", \"github-actions[bot]\"}\nREPOSITORY_NAME = \"vacanza/python-holidays\"\n\n\nclass ReleaseNotesGenerator:\n \"\"\"\n Generates release notes based on local git commits and GitHub PRs metadata.\n\n Usage example: scripts/generate_release_notes.py\n \"\"\"\n\n def __init__(self) -> None:\n arg_parser = argparse.ArgumentParser()\n arg_parser.add_argument(\n \"-a\",\n \"--author-only\",\n action=\"extend\",\n default=[],\n help=\"Add only author as a contributor for this PR\",\n nargs=\"+\",\n type=int,\n )\n arg_parser.add_argument(\n \"-c\",\n \"--cut-off-at\",\n help=\"Cut off at PR\",\n required=False,\n type=int,\n )\n arg_parser.add_argument(\n \"-e\",\n \"--exclude\",\n action=\"extend\",\n default=[],\n help=\"Exclude this PR from the release notes\",\n nargs=\"+\",\n type=int,\n )\n arg_parser.add_argument(\n \"-v\",\n \"--verbose\",\n action=\"store_true\",\n default=False,\n help=\"Verbose output\",\n )\n self.args = arg_parser.parse_args()\n\n self.local_repo = Repo(Path.cwd())\n self.remote_repo = Github(self.github_token).get_repo(REPOSITORY_NAME)\n\n self.previous_commits: Set[str] = set()\n self.pull_requests: Dict[int, str] = {}\n\n self.tag = holidays.__version__\n\n try:\n latest_tag = self.remote_repo.get_tags()[0]\n self.latest_tag_name = latest_tag.name\n self.previous_commits.add(latest_tag.commit.sha)\n except IndexError:\n self.latest_tag_name = None\n\n @property\n def github_token(self, path=Path(\".github_token\")):\n \"\"\"Return GitHub access token.\"\"\"\n return path.read_text(encoding=\"UTF-8\").strip()\n\n @property\n def is_ready(self):\n \"\"\"Perform environment checks and input validation.\"\"\"\n current_branch = str(self.local_repo.active_branch)\n if current_branch != BRANCH_NAME:\n exit(\n f\"Switch to '{BRANCH_NAME}' first (currently in \"\n f\"'{current_branch}'). Use 'git switch {BRANCH_NAME}'.\"\n )\n\n return True\n\n @property\n def sorted_pull_requests(self):\n def custom_order(pr):\n pr = re.findall(r\"^(.*) \\(#\\d+ .*\\)$\", pr)[0]\n\n if re.findall(r\"^(Introduce|Refactor)\", pr) or re.findall(r\"Add .* support\", pr):\n weight = 10\n elif re.findall(r\"^Add .* holidays$\", pr):\n weight = 20\n elif re.findall(r\"(^Localize|localization$)\", pr):\n weight = 30\n elif re.findall(r\"^Fix\", pr):\n weight = 40\n elif re.findall(r\"^(Change|Improve|Optimize|Update|Upgrade)\", pr):\n weight = 50\n else:\n weight = 100\n\n return (weight, pr)\n\n return sorted(self.pull_requests.values(), key=custom_order)\n\n def add_pull_request(self, pull_request):\n \"\"\"Add pull request information to the release notes dict.\"\"\"\n author = pull_request.user.login if pull_request.user else None\n if author in IGNORED_CONTRIBUTORS:\n print((f\"Skipping #{pull_request.number} {pull_request.title}\" f\" by {author}\"))\n return None\n\n # Skip failed release attempt PRs, version upgrades.\n pr_title = pull_request.title\n skip_titles = (f\"v.{self.tag}\", \"Bump\", \"Revert\")\n for skip_title in skip_titles:\n if pr_title.startswith(skip_title):\n return None\n\n # Get contributors (expand from commits by default).\n contributors = set()\n if pull_request.number not in self.args.author_only:\n for commit in pull_request.get_commits():\n if commit.author:\n contributors.add(commit.author.login)\n\n if author in contributors:\n contributors.remove(author)\n contributors = (f\"@{c}\" for c in [author] + sorted(contributors, key=str.lower))\n self.pull_requests[pull_request.number] = (\n f\"{pull_request.title} (#{pull_request.number} by \" f\"{', '.join(contributors)})\"\n )\n\n def generate_release_notes(self):\n \"\"\"Generate release notes contents.\"\"\"\n print(\"Processing pull requests...\")\n self.get_new_pull_requests()\n self.get_old_pull_requests()\n print(\"Done!\")\n\n def get_new_pull_requests(self):\n \"\"\"Get PRs created after the latest release.\n\n This operation also populates a set of previous release commits.\n \"\"\"\n cut_off_at = self.args.cut_off_at\n excluded_pr_numbers = set(self.args.exclude)\n for pull_request in self.remote_repo.get_pulls(state=\"closed\"):\n # Stop getting pull requests after previous release tag or specific PR number.\n cut_off = cut_off_at and pull_request.number == cut_off_at\n if cut_off or pull_request.title == self.latest_tag_name:\n # Get previous release commits SHAs.\n for commit in pull_request.get_commits():\n self.previous_commits.add(commit.sha)\n break\n\n # Skip closed unmerged PRs.\n if not pull_request.merged:\n continue\n\n if pull_request.number in excluded_pr_numbers:\n if self.args.verbose:\n print(f\"Excluding PR #{pull_request.number} as requested\")\n continue\n\n if self.args.verbose:\n messages = [f\"Fetching PR #{pull_request.number}\"]\n if pull_request.number in self.args.author_only:\n messages.append(\"(keeping PR author as a sole contributor)\")\n print(\" \".join(messages))\n\n self.add_pull_request(pull_request)\n\n def get_old_pull_requests(self):\n \"\"\"Get PRs created before the latest release.\"\"\"\n pull_request_numbers = set()\n for commit in self.local_repo.iter_commits():\n if commit.hexsha in self.previous_commits:\n break\n\n try:\n pull_request_number = re.findall(\n r\"#(\\d{3,})\",\n commit.message,\n )[0]\n pull_request_numbers.add(int(pull_request_number))\n except IndexError:\n continue\n\n # Fetch old PRs metadata only. Skip all known PRs.\n pull_request_numbers -= set(self.pull_requests.keys())\n pull_request_numbers -= set(self.args.exclude)\n for pull_request_number in pull_request_numbers:\n if self.args.verbose:\n messages = [f\"Fetching PR #{pull_request_number}\"]\n if pull_request_number in self.args.author_only:\n messages.append(\"(keeping PR author as a sole contributor)\")\n print(\" \".join(messages))\n\n try:\n self.add_pull_request(self.remote_repo.get_pull(pull_request_number))\n # 3rd party contributions to forks.\n except UnknownObjectException:\n pass\n\n def print_release_notes(self):\n \"\"\"Print generated release notes.\"\"\"\n print(\"\")\n if self.pull_requests:\n today = date.today()\n print(\n HEADER_TEMPLATE.format(\n day=today.day,\n month=today.strftime(\"%B\"),\n version=self.tag,\n year=today.year,\n )\n )\n print(\"\\n\".join((f\"- {pr}\" for pr in self.sorted_pull_requests)))\n\n else:\n print(f\"No changes since {self.latest_tag_name} release.\")\n\n\nif __name__ == \"__main__\":\n rng = ReleaseNotesGenerator()\n if rng.is_ready:\n rng.generate_release_notes()\n rng.print_release_notes()\n", "path": "scripts/generate_release_notes.py"}]} | 3,110 | 94 |
gh_patches_debug_39372 | rasdani/github-patches | git_diff | Cloud-CV__EvalAI-1550 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Add Feature to notify users about new challenge on EvalAI.
</issue>
<code>
[start of apps/web/views.py]
1 from django.contrib.auth.models import User
2 from django.shortcuts import render
3
4 from .models import Team
5
6 from rest_framework import permissions, status
7 from rest_framework.decorators import (api_view,
8 permission_classes,
9 throttle_classes,)
10 from rest_framework.response import Response
11 from rest_framework.throttling import AnonRateThrottle
12
13 from .serializers import ContactSerializer, TeamSerializer
14
15
16 def home(request, template_name="index.html"):
17 """
18 Home Page View
19 """
20 return render(request, template_name)
21
22
23 def page_not_found(request):
24 response = render(request, 'error404.html',
25 )
26 response.status_code = 404
27 return response
28
29
30 def internal_server_error(request):
31 response = render(request, 'error500.html',
32 )
33 response.status_code = 500
34 return response
35
36
37 @throttle_classes([AnonRateThrottle, ])
38 @api_view(['GET', 'POST'])
39 @permission_classes((permissions.AllowAny,))
40 def contact_us(request):
41 user_does_not_exist = False
42 try:
43 user = User.objects.get(username=request.user)
44 name = user.username
45 email = user.email
46 request_data = {'name': name, 'email': email}
47 except:
48 request_data = request.data
49 user_does_not_exist = True
50
51 if request.method == 'POST' or user_does_not_exist:
52 if request.POST.get('message'):
53 request_data['message'] = request.POST.get('message')
54 serializer = ContactSerializer(data=request_data)
55 if serializer.is_valid():
56 serializer.save()
57 response_data = {'message': 'We have received your request and will contact you shortly.'}
58 return Response(response_data, status=status.HTTP_201_CREATED)
59 return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
60
61 elif request.method == 'GET':
62 response_data = {"name": name, "email": email}
63 return Response(response_data, status=status.HTTP_200_OK)
64
65
66 @throttle_classes([AnonRateThrottle])
67 @api_view(['GET', 'POST'])
68 @permission_classes((permissions.AllowAny,))
69 def our_team(request):
70 if request.method == 'GET':
71 teams = Team.objects.all()
72 serializer = TeamSerializer(teams, many=True, context={'request': request})
73 response_data = serializer.data
74 return Response(response_data, status=status.HTTP_200_OK)
75 elif request.method == 'POST':
76 # team_type is set to Team.CONTRIBUTOR by default and can be overridden by the requester
77 request.data['team_type'] = request.data.get('team_type', Team.CONTRIBUTOR)
78 serializer = TeamSerializer(data=request.data)
79 if serializer.is_valid():
80 serializer.save()
81 response_data = {'message', 'Successfully added the contributor.'}
82 return Response(response_data, status=status.HTTP_201_CREATED)
83 return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
84
[end of apps/web/views.py]
[start of apps/web/urls.py]
1 from django.conf.urls import url
2
3 from . import views
4
5 urlpatterns = [
6 url(r'^contact/$', views.contact_us, name='contact_us'),
7 url(r'^team/$', views.our_team, name='our_team'),
8 ]
9
[end of apps/web/urls.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/web/urls.py b/apps/web/urls.py
--- a/apps/web/urls.py
+++ b/apps/web/urls.py
@@ -5,4 +5,5 @@
urlpatterns = [
url(r'^contact/$', views.contact_us, name='contact_us'),
url(r'^team/$', views.our_team, name='our_team'),
+ url(r'^notify_users/$', views.notify_users_about_challenge, name='notify_users_about_challenge'),
]
diff --git a/apps/web/views.py b/apps/web/views.py
--- a/apps/web/views.py
+++ b/apps/web/views.py
@@ -1,7 +1,14 @@
from django.contrib.auth.models import User
+from django.conf import settings
+from django.core.mail import EmailMultiAlternatives
from django.shortcuts import render
+from django.template.loader import get_template
+from django.template import Context
+
+from email.MIMEImage import MIMEImage
from .models import Team
+from .serializers import ContactSerializer, TeamSerializer
from rest_framework import permissions, status
from rest_framework.decorators import (api_view,
@@ -10,8 +17,6 @@
from rest_framework.response import Response
from rest_framework.throttling import AnonRateThrottle
-from .serializers import ContactSerializer, TeamSerializer
-
def home(request, template_name="index.html"):
"""
@@ -34,6 +39,57 @@
return response
+def notify_users_about_challenge(request):
+ """
+ Email New Challenge Details to EvalAI Users
+ """
+ if request.user.is_authenticated() and request.user.is_superuser:
+ if request.method == 'GET':
+ template_name = 'notification_email_data.html'
+ return render(request, template_name)
+
+ elif request.method == 'POST':
+ template_name = 'notification_email.html'
+ emails = User.objects.all().exclude(email__isnull=True, email__exact='').values_list('email', flat=True)
+ htmly = get_template('notification_email.html')
+
+ subject = request.POST.get('subject')
+ body = request.POST.get('body')
+
+ try:
+ challenge_image = request.FILES['challenge_image']
+ except:
+ challenge_image = None
+
+ if challenge_image:
+ image = MIMEImage(challenge_image.read())
+ image.add_header('Content-ID', '<{}>'.format(challenge_image))
+
+ context = Context({'body': body,
+ 'image': challenge_image})
+
+ for email in emails:
+ from_email = settings.EMAIL_HOST_USER
+ to = [email]
+ html_content = htmly.render(context)
+
+ msg = EmailMultiAlternatives(subject, html_content, from_email, to)
+ msg.attach_alternative(html_content, "text/html")
+ msg.mixed_subtype = 'related'
+
+ if challenge_image:
+ msg.attach(image)
+
+ msg.send()
+ return render(request,
+ 'notification_email_conformation.html',
+ {'message': 'All the emails are sent successfully!'})
+ else:
+ return render(request, 'error404.html')
+ else:
+ return render(request, 'error404.html')
+
+
@throttle_classes([AnonRateThrottle, ])
@api_view(['GET', 'POST'])
@permission_classes((permissions.AllowAny,))
| {"golden_diff": "diff --git a/apps/web/urls.py b/apps/web/urls.py\n--- a/apps/web/urls.py\n+++ b/apps/web/urls.py\n@@ -5,4 +5,5 @@\n urlpatterns = [\n url(r'^contact/$', views.contact_us, name='contact_us'),\n url(r'^team/$', views.our_team, name='our_team'),\n+ url(r'^notify_users/$', views.notify_users_about_challenge, name='notify_users_about_challenge'),\n ]\ndiff --git a/apps/web/views.py b/apps/web/views.py\n--- a/apps/web/views.py\n+++ b/apps/web/views.py\n@@ -1,7 +1,14 @@\n from django.contrib.auth.models import User\n+from django.conf import settings\n+from django.core.mail import EmailMultiAlternatives\n from django.shortcuts import render\n+from django.template.loader import get_template\n+from django.template import Context\n+\n+from email.MIMEImage import MIMEImage\n \n from .models import Team\n+from .serializers import ContactSerializer, TeamSerializer\n \n from rest_framework import permissions, status\n from rest_framework.decorators import (api_view,\n@@ -10,8 +17,6 @@\n from rest_framework.response import Response\n from rest_framework.throttling import AnonRateThrottle\n \n-from .serializers import ContactSerializer, TeamSerializer\n-\n \n def home(request, template_name=\"index.html\"):\n \"\"\"\n@@ -34,6 +39,57 @@\n return response\n \n \n+def notify_users_about_challenge(request):\n+ \"\"\"\n+ Email New Challenge Details to EvalAI Users\n+ \"\"\"\n+ if request.user.is_authenticated() and request.user.is_superuser:\n+ if request.method == 'GET':\n+ template_name = 'notification_email_data.html'\n+ return render(request, template_name)\n+\n+ elif request.method == 'POST':\n+ template_name = 'notification_email.html'\n+ emails = User.objects.all().exclude(email__isnull=True, email__exact='').values_list('email', flat=True)\n+ htmly = get_template('notification_email.html')\n+\n+ subject = request.POST.get('subject')\n+ body = request.POST.get('body')\n+\n+ try:\n+ challenge_image = request.FILES['challenge_image']\n+ except:\n+ challenge_image = None\n+\n+ if challenge_image:\n+ image = MIMEImage(challenge_image.read())\n+ image.add_header('Content-ID', '<{}>'.format(challenge_image))\n+\n+ context = Context({'body': body,\n+ 'image': challenge_image})\n+\n+ for email in emails:\n+ from_email = settings.EMAIL_HOST_USER\n+ to = [email]\n+ html_content = htmly.render(context)\n+\n+ msg = EmailMultiAlternatives(subject, html_content, from_email, to)\n+ msg.attach_alternative(html_content, \"text/html\")\n+ msg.mixed_subtype = 'related'\n+\n+ if challenge_image:\n+ msg.attach(image)\n+\n+ msg.send()\n+ return render(request,\n+ 'notification_email_conformation.html',\n+ {'message': 'All the emails are sent successfully!'})\n+ else:\n+ return render(request, 'error404.html')\n+ else:\n+ return render(request, 'error404.html')\n+\n+\n @throttle_classes([AnonRateThrottle, ])\n @api_view(['GET', 'POST'])\n @permission_classes((permissions.AllowAny,))\n", "issue": "Add Feature to notify users about new challenge on EvalAI.\n\n", "before_files": [{"content": "from django.contrib.auth.models import User\nfrom django.shortcuts import render\n\nfrom .models import Team\n\nfrom rest_framework import permissions, status\nfrom rest_framework.decorators import (api_view,\n permission_classes,\n throttle_classes,)\nfrom rest_framework.response import Response\nfrom rest_framework.throttling import AnonRateThrottle\n\nfrom .serializers import ContactSerializer, TeamSerializer\n\n\ndef home(request, template_name=\"index.html\"):\n \"\"\"\n Home Page View\n \"\"\"\n return render(request, template_name)\n\n\ndef page_not_found(request):\n response = render(request, 'error404.html',\n )\n response.status_code = 404\n return response\n\n\ndef internal_server_error(request):\n response = render(request, 'error500.html',\n )\n response.status_code = 500\n return response\n\n\n@throttle_classes([AnonRateThrottle, ])\n@api_view(['GET', 'POST'])\n@permission_classes((permissions.AllowAny,))\ndef contact_us(request):\n user_does_not_exist = False\n try:\n user = User.objects.get(username=request.user)\n name = user.username\n email = user.email\n request_data = {'name': name, 'email': email}\n except:\n request_data = request.data\n user_does_not_exist = True\n\n if request.method == 'POST' or user_does_not_exist:\n if request.POST.get('message'):\n request_data['message'] = request.POST.get('message')\n serializer = ContactSerializer(data=request_data)\n if serializer.is_valid():\n serializer.save()\n response_data = {'message': 'We have received your request and will contact you shortly.'}\n return Response(response_data, status=status.HTTP_201_CREATED)\n return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)\n\n elif request.method == 'GET':\n response_data = {\"name\": name, \"email\": email}\n return Response(response_data, status=status.HTTP_200_OK)\n\n\n@throttle_classes([AnonRateThrottle])\n@api_view(['GET', 'POST'])\n@permission_classes((permissions.AllowAny,))\ndef our_team(request):\n if request.method == 'GET':\n teams = Team.objects.all()\n serializer = TeamSerializer(teams, many=True, context={'request': request})\n response_data = serializer.data\n return Response(response_data, status=status.HTTP_200_OK)\n elif request.method == 'POST':\n # team_type is set to Team.CONTRIBUTOR by default and can be overridden by the requester\n request.data['team_type'] = request.data.get('team_type', Team.CONTRIBUTOR)\n serializer = TeamSerializer(data=request.data)\n if serializer.is_valid():\n serializer.save()\n response_data = {'message', 'Successfully added the contributor.'}\n return Response(response_data, status=status.HTTP_201_CREATED)\n return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)\n", "path": "apps/web/views.py"}, {"content": "from django.conf.urls import url\n\nfrom . import views\n\nurlpatterns = [\n url(r'^contact/$', views.contact_us, name='contact_us'),\n url(r'^team/$', views.our_team, name='our_team'),\n]\n", "path": "apps/web/urls.py"}]} | 1,410 | 728 |
gh_patches_debug_31292 | rasdani/github-patches | git_diff | DataDog__dd-trace-py-5335 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
The aws_lambda patch module can't handle callable object event handlers
### Summary of problem
NOTE: I'll be cross-posting this in [datadog-lambda-python](https://github.com/DataDog/datadog-lambda-python) project because I'm not sure whether this is in the domain of the Lambda layer or this library itself. This could either be solved in this library by checking if the function being wrapped is a callable class instance, or by the Lambda layer passing the `__call__` function reference instead of the callable class.
The issue stems from ddtrace (specifically the `aws_lambda` module) trying to patch the outer most Lambda handler functions, which can be any callable that accepts an event and context arguments, so either a standard function or a callable object, like a class instance that defines `__call__`.
The internal wrapper is passed the class instance itself instead of the `__call__` function however, so as a result, it fails as a class instance isn't going to have a `__code__` property. The `patch_all` the Lambda layer is executing is in a try/catch block and only runs once, so there's no errors being raised, but on every cold start there's a stack trace popping up in the logs.
Platform: AWS Lambda
Runtime: Python 3.9
Serverless Framework Version: 3.28.0
Serverless Plugin Version: 5.20.0
DataDog Lambda Layer Version: 68
ddtrace Version: 1.9.1
### Which version of dd-trace-py are you using?
[email protected]
### Which version of pip are you using?
[email protected]
### Which libraries and their versions are you using?
Output of `poetry show --no-dev`, excluded some internal libraries irrelevant to this and added `chalice` since that's packaged manually using their internal packaging mechanism.
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
### How can we reproduce your problem?
Deploy a lambda function where the event handler is a callable class instance, whether through the [chalice](https://github.com/aws/chalice) framework or something like this:
```
# app.py
from typing import Any
class LambdaHandler:
def __call__(self, event: dict[str, Any], context: Any) -> dict[str, Any]:
return {"hello": "world"}
app = LambdaHandler()
```
With `app.app` being the handler of the lambda function.
### What is the result that you get?
The following stack trace is thrown on every cold start as `patch_all` fails:
```
Traceback (most recent call last):
File "/opt/python/lib/python3.9/site-packages/datadog_lambda/wrapper.py", line 177, in __init__
patch_all()
File "/opt/python/lib/python3.9/site-packages/datadog_lambda/patch.py", line 36, in patch_all
patch_all_dd()
File "/var/task/ddtrace/_monkey.py", line 190, in patch_all
patch(raise_errors=False, **modules)
File "/var/task/ddtrace/_monkey.py", line 230, in patch
when_imported(module)(_on_import_factory(contrib, raise_errors=False))
File "/var/task/ddtrace/vendor/wrapt/importer.py", line 284, in register
register_post_import_hook(hook, name)
File "/var/task/ddtrace/vendor/wrapt/decorators.py", line 470, in _synchronized
return wrapped(*args, **kwargs)
File "/var/task/ddtrace/vendor/wrapt/importer.py", line 82, in register_post_import_hook
hook(module)
File "/var/task/ddtrace/_monkey.py", line 155, in on_import
imported_module.patch()
File "/var/task/ddtrace/contrib/aws_lambda/patch.py", line 156, in patch
wrap(handler, wrapper)
File "/var/task/ddtrace/internal/wrapping.py", line 428, in wrap
f.__code__,
AttributeError: 'EventSourceHandler' object has no attribute '__code__'
```
### What is the result that you expected?
This operation should not fail, and either [ddtrace.internal.wrapping.wrap](https://github.com/DataDog/dd-trace-py/blob/1.x/ddtrace/internal/wrapping.py#L417) should account for callable classes, or `datadog_lambda` should be figuring out that the handler is a callable class instance and passing the `__call__` function reference instead of the class instance.
</issue>
<code>
[start of ddtrace/contrib/aws_lambda/patch.py]
1 from importlib import import_module
2 import os
3 import signal
4
5 from ddtrace import tracer
6 from ddtrace.constants import ERROR_MSG
7 from ddtrace.constants import ERROR_TYPE
8 from ddtrace.internal.logger import get_logger
9 from ddtrace.internal.serverless import in_aws_lambda
10 from ddtrace.internal.utils import get_argument_value
11 from ddtrace.internal.wrapping import unwrap
12 from ddtrace.internal.wrapping import wrap
13
14
15 log = get_logger(__name__)
16
17
18 class TimeoutChannel:
19 def __init__(self, context):
20 self.crashed = False
21 self.context = context
22
23 def _handle_signal(self, sig, f):
24 """
25 Returns a signal of type `sig` with function `f`, if there are
26 no previously defined signals.
27
28 Else, wraps the given signal with the previously defined one,
29 so no signals are overridden.
30 """
31 old_signal = signal.getsignal(sig)
32
33 def wrap_signals(*args, **kwargs):
34 if old_signal is not None:
35 old_signal(*args, **kwargs)
36 f(*args, **kwargs)
37
38 # Return the incoming signal if any of the following cases happens:
39 # - old signal does not exist,
40 # - old signal is the same as the incoming, or
41 # - old signal is our wrapper.
42 # This avoids multiple signal calling and infinite wrapping.
43 if not callable(old_signal) or old_signal == f or old_signal == wrap_signals:
44 return signal.signal(sig, f)
45
46 return signal.signal(sig, wrap_signals)
47
48 def _start(self):
49 self._handle_signal(signal.SIGALRM, self._crash_flush)
50
51 remaining_time_in_millis = self.context.get_remaining_time_in_millis()
52 apm_flush_deadline = int(os.environ.get("DD_APM_FLUSH_DEADLINE_MILLISECONDS", 100))
53 apm_flush_deadline = 100 if apm_flush_deadline < 0 else apm_flush_deadline
54
55 # TODO: Update logic to calculate an approximate of how long it will
56 # take us to flush the spans on the queue.
57 remaining_time_in_seconds = max(((remaining_time_in_millis - apm_flush_deadline) / 1000), 0)
58 signal.setitimer(signal.ITIMER_REAL, remaining_time_in_seconds)
59
60 def _crash_flush(self, _, __):
61 """
62 Tags the current root span with an Impending Timeout error.
63 Finishes spans with ancestors from the current span.
64 """
65 self._remove_alarm_signal()
66 self.crashed = True
67
68 root_span = tracer.current_root_span()
69 if root_span is not None:
70 root_span.error = 1
71 root_span.set_tag_str(ERROR_MSG, "Datadog detected an Impending Timeout")
72 root_span.set_tag_str(ERROR_TYPE, "Impending Timeout")
73 else:
74 log.warning("An impending timeout was reached, but no root span was found. No error will be tagged.")
75
76 current_span = tracer.current_span()
77 if current_span is not None:
78 current_span.finish_with_ancestors()
79
80 def _remove_alarm_signal(self):
81 """Removes the handler set for the signal `SIGALRM`."""
82 signal.alarm(0)
83 signal.signal(signal.SIGALRM, signal.SIG_DFL)
84
85 def stop(self):
86 self._remove_alarm_signal()
87
88
89 class DatadogInstrumentation(object):
90 """Patches an AWS Lambda handler function for Datadog instrumentation."""
91
92 def __call__(self, func, args, kwargs):
93 self.func = func
94 self._before(args, kwargs)
95 try:
96 self.response = self.func(*args, **kwargs)
97 return self.response
98 except Exception:
99 raise
100 finally:
101 self._after()
102
103 def _set_context(self, args, kwargs):
104 """Sets the context attribute."""
105 # The context is the second argument in a handler
106 # signature and it is always sent.
107 #
108 # note: AWS Lambda context is an object, the event is a dict.
109 # `get_remaining_time_in_millis` is guaranteed to be
110 # present in the context.
111 _context = get_argument_value(args, kwargs, 1, "context")
112 if hasattr(_context, "get_remaining_time_in_millis"):
113 self.context = _context
114 else:
115 # Handler was possibly manually wrapped, and the first
116 # argument is the `datadog-lambda` decorator object.
117 self.context = get_argument_value(args, kwargs, 2, "context")
118
119 def _before(self, args, kwargs):
120 self._set_context(args, kwargs)
121 self.timeoutChannel = TimeoutChannel(self.context)
122
123 self.timeoutChannel._start()
124
125 def _after(self):
126 if not self.timeoutChannel.crashed:
127 self.timeoutChannel.stop()
128
129
130 def _modify_module_name(module_name):
131 """Returns a valid modified module to get imported."""
132 return ".".join(module_name.split("/"))
133
134
135 def _get_handler_and_module():
136 """Returns the user AWS Lambda handler and module."""
137 path = os.environ.get("DD_LAMBDA_HANDLER", None)
138 _datadog_instrumentation = DatadogInstrumentation()
139
140 if path is None:
141 from datadog_lambda.wrapper import datadog_lambda_wrapper
142
143 handler = getattr(datadog_lambda_wrapper, "__call__")
144
145 return handler, datadog_lambda_wrapper, _datadog_instrumentation
146 else:
147 parts = path.rsplit(".", 1)
148 (mod_name, handler_name) = parts
149 modified_mod_name = _modify_module_name(mod_name)
150 handler_module = import_module(modified_mod_name)
151 handler = getattr(handler_module, handler_name)
152 return handler, handler_module, _datadog_instrumentation
153
154
155 def _has_patch_module():
156 """
157 Ensures that the `aws_lambda` integration can be patched.
158
159 It checks either the user has the DD_LAMBDA_HANDLER set correctly.
160 Or if the `datadog_lambda` package is installed.
161 """
162 path = os.environ.get("DD_LAMBDA_HANDLER", None)
163 if path is None:
164 try:
165 import_module("datadog_lambda.wrapper")
166 except Exception:
167 return False
168 else:
169 parts = path.rsplit(".", 1)
170 if len(parts) != 2:
171 return False
172 return True
173
174
175 def patch():
176 """Patches an AWS Lambda using the `datadog-lambda-py` Lambda layer."""
177
178 # It's expected to only patch only in AWS Lambda environments.
179 # The need to check if a patch module exists is to avoid patching
180 # when `ddtrace` is present but not `datadog-lambda`.
181 if not in_aws_lambda() and not _has_patch_module():
182 return
183
184 try:
185 handler, handler_module, wrapper = _get_handler_and_module()
186
187 if getattr(handler_module, "_datadog_patch", False):
188 return
189
190 wrap(handler, wrapper)
191
192 setattr(handler_module, "_datadog_patch", True)
193 except AttributeError:
194 # User code might contain `ddtrace.patch_all()` or `ddtrace.patch(aws_lambda=True)`
195 # which might cause a circular dependency. Skipping.
196 return
197 except Exception:
198 log.exception("Error patching AWS Lambda")
199 return
200
201
202 def unpatch():
203 if not in_aws_lambda() and not _has_patch_module():
204 return
205
206 try:
207 handler, handler_module, wrapper = _get_handler_and_module()
208
209 if not getattr(handler_module, "_datadog_patch", False):
210 return
211
212 unwrap(handler, wrapper)
213
214 setattr(handler_module, "_datadog_patch", False)
215 except AttributeError:
216 return
217 except Exception:
218 log.exception("Error unpatching AWS Lambda")
219 return
220
[end of ddtrace/contrib/aws_lambda/patch.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/aws_lambda/patch.py b/ddtrace/contrib/aws_lambda/patch.py
--- a/ddtrace/contrib/aws_lambda/patch.py
+++ b/ddtrace/contrib/aws_lambda/patch.py
@@ -140,16 +140,42 @@
if path is None:
from datadog_lambda.wrapper import datadog_lambda_wrapper
- handler = getattr(datadog_lambda_wrapper, "__call__")
+ wrapper_module = datadog_lambda_wrapper
+ wrapper_handler = getattr(datadog_lambda_wrapper, "__call__")
- return handler, datadog_lambda_wrapper, _datadog_instrumentation
+ return wrapper_handler, wrapper_module, _datadog_instrumentation
else:
parts = path.rsplit(".", 1)
(mod_name, handler_name) = parts
modified_mod_name = _modify_module_name(mod_name)
handler_module = import_module(modified_mod_name)
handler = getattr(handler_module, handler_name)
- return handler, handler_module, _datadog_instrumentation
+
+ if callable(handler):
+ class_name = type(handler).__name__
+ is_function = not isinstance(handler, type) and hasattr(handler, "__code__") and class_name == "function"
+ # handler is a function
+ #
+ # note: this is a best effort to identify function based handlers
+ # this will not cover all cases
+ if is_function:
+ return handler, handler_module, _datadog_instrumentation
+
+ # handler must be either a class or an instance of a class
+ #
+ # note: if handler is a class instance with `__code__` defined,
+ # we will prioritize the `__call__` method, ignoring `__code__`.
+ class_module = getattr(handler_module, class_name)
+ class_handler = getattr(class_module, "__call__")
+
+ if isinstance(handler, type):
+ # class handler is a metaclass
+ if hasattr(class_handler, "__func__"):
+ class_handler = class_handler.__func__
+
+ return class_handler, class_module, _datadog_instrumentation
+ else:
+ raise TypeError("Handler type is not supported to patch.")
def _has_patch_module():
| {"golden_diff": "diff --git a/ddtrace/contrib/aws_lambda/patch.py b/ddtrace/contrib/aws_lambda/patch.py\n--- a/ddtrace/contrib/aws_lambda/patch.py\n+++ b/ddtrace/contrib/aws_lambda/patch.py\n@@ -140,16 +140,42 @@\n if path is None:\n from datadog_lambda.wrapper import datadog_lambda_wrapper\n \n- handler = getattr(datadog_lambda_wrapper, \"__call__\")\n+ wrapper_module = datadog_lambda_wrapper\n+ wrapper_handler = getattr(datadog_lambda_wrapper, \"__call__\")\n \n- return handler, datadog_lambda_wrapper, _datadog_instrumentation\n+ return wrapper_handler, wrapper_module, _datadog_instrumentation\n else:\n parts = path.rsplit(\".\", 1)\n (mod_name, handler_name) = parts\n modified_mod_name = _modify_module_name(mod_name)\n handler_module = import_module(modified_mod_name)\n handler = getattr(handler_module, handler_name)\n- return handler, handler_module, _datadog_instrumentation\n+\n+ if callable(handler):\n+ class_name = type(handler).__name__\n+ is_function = not isinstance(handler, type) and hasattr(handler, \"__code__\") and class_name == \"function\"\n+ # handler is a function\n+ #\n+ # note: this is a best effort to identify function based handlers\n+ # this will not cover all cases\n+ if is_function:\n+ return handler, handler_module, _datadog_instrumentation\n+\n+ # handler must be either a class or an instance of a class\n+ #\n+ # note: if handler is a class instance with `__code__` defined,\n+ # we will prioritize the `__call__` method, ignoring `__code__`.\n+ class_module = getattr(handler_module, class_name)\n+ class_handler = getattr(class_module, \"__call__\")\n+\n+ if isinstance(handler, type):\n+ # class handler is a metaclass\n+ if hasattr(class_handler, \"__func__\"):\n+ class_handler = class_handler.__func__\n+\n+ return class_handler, class_module, _datadog_instrumentation\n+ else:\n+ raise TypeError(\"Handler type is not supported to patch.\")\n \n \n def _has_patch_module():\n", "issue": "The aws_lambda patch module can't handle callable object event handlers\n### Summary of problem\r\nNOTE: I'll be cross-posting this in [datadog-lambda-python](https://github.com/DataDog/datadog-lambda-python) project because I'm not sure whether this is in the domain of the Lambda layer or this library itself. This could either be solved in this library by checking if the function being wrapped is a callable class instance, or by the Lambda layer passing the `__call__` function reference instead of the callable class.\r\n\r\nThe issue stems from ddtrace (specifically the `aws_lambda` module) trying to patch the outer most Lambda handler functions, which can be any callable that accepts an event and context arguments, so either a standard function or a callable object, like a class instance that defines `__call__`.\r\n\r\nThe internal wrapper is passed the class instance itself instead of the `__call__` function however, so as a result, it fails as a class instance isn't going to have a `__code__` property. The `patch_all` the Lambda layer is executing is in a try/catch block and only runs once, so there's no errors being raised, but on every cold start there's a stack trace popping up in the logs. \r\n\r\nPlatform: AWS Lambda\r\nRuntime: Python 3.9\r\nServerless Framework Version: 3.28.0\r\nServerless Plugin Version: 5.20.0\r\nDataDog Lambda Layer Version: 68\r\nddtrace Version: 1.9.1\r\n\r\n### Which version of dd-trace-py are you using?\r\[email protected]\r\n\r\n### Which version of pip are you using?\r\[email protected]\r\n\r\n### Which libraries and their versions are you using?\r\nOutput of `poetry show --no-dev`, excluded some internal libraries irrelevant to this and added `chalice` since that's packaged manually using their internal packaging mechanism.\r\n\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\[email protected]\r\n\r\n### How can we reproduce your problem?\r\nDeploy a lambda function where the event handler is a callable class instance, whether through the [chalice](https://github.com/aws/chalice) framework or something like this:\r\n```\r\n# app.py\r\nfrom typing import Any\r\n\r\nclass LambdaHandler:\r\n def __call__(self, event: dict[str, Any], context: Any) -> dict[str, Any]:\r\n return {\"hello\": \"world\"}\r\n\r\napp = LambdaHandler()\r\n```\r\nWith `app.app` being the handler of the lambda function.\r\n\r\n### What is the result that you get?\r\nThe following stack trace is thrown on every cold start as `patch_all` fails:\r\n```\r\nTraceback (most recent call last):\r\n\tFile \"/opt/python/lib/python3.9/site-packages/datadog_lambda/wrapper.py\", line 177, in __init__\r\n\t\tpatch_all()\r\n\tFile \"/opt/python/lib/python3.9/site-packages/datadog_lambda/patch.py\", line 36, in patch_all\r\n\t\tpatch_all_dd()\r\n\tFile \"/var/task/ddtrace/_monkey.py\", line 190, in patch_all\r\n\t\tpatch(raise_errors=False, **modules)\r\n\tFile \"/var/task/ddtrace/_monkey.py\", line 230, in patch\r\n\t\twhen_imported(module)(_on_import_factory(contrib, raise_errors=False))\r\n\tFile \"/var/task/ddtrace/vendor/wrapt/importer.py\", line 284, in register\r\n\t\tregister_post_import_hook(hook, name)\r\n\tFile \"/var/task/ddtrace/vendor/wrapt/decorators.py\", line 470, in _synchronized\r\n\t\treturn wrapped(*args, **kwargs)\r\n\tFile \"/var/task/ddtrace/vendor/wrapt/importer.py\", line 82, in register_post_import_hook\r\n\t\thook(module)\r\n\tFile \"/var/task/ddtrace/_monkey.py\", line 155, in on_import\r\n\t\timported_module.patch()\r\n\tFile \"/var/task/ddtrace/contrib/aws_lambda/patch.py\", line 156, in patch\r\n\t\twrap(handler, wrapper)\r\n\tFile \"/var/task/ddtrace/internal/wrapping.py\", line 428, in wrap\r\n\t\tf.__code__,\r\n\tAttributeError: 'EventSourceHandler' object has no attribute '__code__'\r\n```\r\n\r\n### What is the result that you expected?\r\nThis operation should not fail, and either [ddtrace.internal.wrapping.wrap](https://github.com/DataDog/dd-trace-py/blob/1.x/ddtrace/internal/wrapping.py#L417) should account for callable classes, or `datadog_lambda` should be figuring out that the handler is a callable class instance and passing the `__call__` function reference instead of the class instance.\r\n\n", "before_files": [{"content": "from importlib import import_module\nimport os\nimport signal\n\nfrom ddtrace import tracer\nfrom ddtrace.constants import ERROR_MSG\nfrom ddtrace.constants import ERROR_TYPE\nfrom ddtrace.internal.logger import get_logger\nfrom ddtrace.internal.serverless import in_aws_lambda\nfrom ddtrace.internal.utils import get_argument_value\nfrom ddtrace.internal.wrapping import unwrap\nfrom ddtrace.internal.wrapping import wrap\n\n\nlog = get_logger(__name__)\n\n\nclass TimeoutChannel:\n def __init__(self, context):\n self.crashed = False\n self.context = context\n\n def _handle_signal(self, sig, f):\n \"\"\"\n Returns a signal of type `sig` with function `f`, if there are\n no previously defined signals.\n\n Else, wraps the given signal with the previously defined one,\n so no signals are overridden.\n \"\"\"\n old_signal = signal.getsignal(sig)\n\n def wrap_signals(*args, **kwargs):\n if old_signal is not None:\n old_signal(*args, **kwargs)\n f(*args, **kwargs)\n\n # Return the incoming signal if any of the following cases happens:\n # - old signal does not exist,\n # - old signal is the same as the incoming, or\n # - old signal is our wrapper.\n # This avoids multiple signal calling and infinite wrapping.\n if not callable(old_signal) or old_signal == f or old_signal == wrap_signals:\n return signal.signal(sig, f)\n\n return signal.signal(sig, wrap_signals)\n\n def _start(self):\n self._handle_signal(signal.SIGALRM, self._crash_flush)\n\n remaining_time_in_millis = self.context.get_remaining_time_in_millis()\n apm_flush_deadline = int(os.environ.get(\"DD_APM_FLUSH_DEADLINE_MILLISECONDS\", 100))\n apm_flush_deadline = 100 if apm_flush_deadline < 0 else apm_flush_deadline\n\n # TODO: Update logic to calculate an approximate of how long it will\n # take us to flush the spans on the queue.\n remaining_time_in_seconds = max(((remaining_time_in_millis - apm_flush_deadline) / 1000), 0)\n signal.setitimer(signal.ITIMER_REAL, remaining_time_in_seconds)\n\n def _crash_flush(self, _, __):\n \"\"\"\n Tags the current root span with an Impending Timeout error.\n Finishes spans with ancestors from the current span.\n \"\"\"\n self._remove_alarm_signal()\n self.crashed = True\n\n root_span = tracer.current_root_span()\n if root_span is not None:\n root_span.error = 1\n root_span.set_tag_str(ERROR_MSG, \"Datadog detected an Impending Timeout\")\n root_span.set_tag_str(ERROR_TYPE, \"Impending Timeout\")\n else:\n log.warning(\"An impending timeout was reached, but no root span was found. No error will be tagged.\")\n\n current_span = tracer.current_span()\n if current_span is not None:\n current_span.finish_with_ancestors()\n\n def _remove_alarm_signal(self):\n \"\"\"Removes the handler set for the signal `SIGALRM`.\"\"\"\n signal.alarm(0)\n signal.signal(signal.SIGALRM, signal.SIG_DFL)\n\n def stop(self):\n self._remove_alarm_signal()\n\n\nclass DatadogInstrumentation(object):\n \"\"\"Patches an AWS Lambda handler function for Datadog instrumentation.\"\"\"\n\n def __call__(self, func, args, kwargs):\n self.func = func\n self._before(args, kwargs)\n try:\n self.response = self.func(*args, **kwargs)\n return self.response\n except Exception:\n raise\n finally:\n self._after()\n\n def _set_context(self, args, kwargs):\n \"\"\"Sets the context attribute.\"\"\"\n # The context is the second argument in a handler\n # signature and it is always sent.\n #\n # note: AWS Lambda context is an object, the event is a dict.\n # `get_remaining_time_in_millis` is guaranteed to be\n # present in the context.\n _context = get_argument_value(args, kwargs, 1, \"context\")\n if hasattr(_context, \"get_remaining_time_in_millis\"):\n self.context = _context\n else:\n # Handler was possibly manually wrapped, and the first\n # argument is the `datadog-lambda` decorator object.\n self.context = get_argument_value(args, kwargs, 2, \"context\")\n\n def _before(self, args, kwargs):\n self._set_context(args, kwargs)\n self.timeoutChannel = TimeoutChannel(self.context)\n\n self.timeoutChannel._start()\n\n def _after(self):\n if not self.timeoutChannel.crashed:\n self.timeoutChannel.stop()\n\n\ndef _modify_module_name(module_name):\n \"\"\"Returns a valid modified module to get imported.\"\"\"\n return \".\".join(module_name.split(\"/\"))\n\n\ndef _get_handler_and_module():\n \"\"\"Returns the user AWS Lambda handler and module.\"\"\"\n path = os.environ.get(\"DD_LAMBDA_HANDLER\", None)\n _datadog_instrumentation = DatadogInstrumentation()\n\n if path is None:\n from datadog_lambda.wrapper import datadog_lambda_wrapper\n\n handler = getattr(datadog_lambda_wrapper, \"__call__\")\n\n return handler, datadog_lambda_wrapper, _datadog_instrumentation\n else:\n parts = path.rsplit(\".\", 1)\n (mod_name, handler_name) = parts\n modified_mod_name = _modify_module_name(mod_name)\n handler_module = import_module(modified_mod_name)\n handler = getattr(handler_module, handler_name)\n return handler, handler_module, _datadog_instrumentation\n\n\ndef _has_patch_module():\n \"\"\"\n Ensures that the `aws_lambda` integration can be patched.\n\n It checks either the user has the DD_LAMBDA_HANDLER set correctly.\n Or if the `datadog_lambda` package is installed.\n \"\"\"\n path = os.environ.get(\"DD_LAMBDA_HANDLER\", None)\n if path is None:\n try:\n import_module(\"datadog_lambda.wrapper\")\n except Exception:\n return False\n else:\n parts = path.rsplit(\".\", 1)\n if len(parts) != 2:\n return False\n return True\n\n\ndef patch():\n \"\"\"Patches an AWS Lambda using the `datadog-lambda-py` Lambda layer.\"\"\"\n\n # It's expected to only patch only in AWS Lambda environments.\n # The need to check if a patch module exists is to avoid patching\n # when `ddtrace` is present but not `datadog-lambda`.\n if not in_aws_lambda() and not _has_patch_module():\n return\n\n try:\n handler, handler_module, wrapper = _get_handler_and_module()\n\n if getattr(handler_module, \"_datadog_patch\", False):\n return\n\n wrap(handler, wrapper)\n\n setattr(handler_module, \"_datadog_patch\", True)\n except AttributeError:\n # User code might contain `ddtrace.patch_all()` or `ddtrace.patch(aws_lambda=True)`\n # which might cause a circular dependency. Skipping.\n return\n except Exception:\n log.exception(\"Error patching AWS Lambda\")\n return\n\n\ndef unpatch():\n if not in_aws_lambda() and not _has_patch_module():\n return\n\n try:\n handler, handler_module, wrapper = _get_handler_and_module()\n\n if not getattr(handler_module, \"_datadog_patch\", False):\n return\n\n unwrap(handler, wrapper)\n\n setattr(handler_module, \"_datadog_patch\", False)\n except AttributeError:\n return\n except Exception:\n log.exception(\"Error unpatching AWS Lambda\")\n return\n", "path": "ddtrace/contrib/aws_lambda/patch.py"}]} | 4,089 | 504 |
gh_patches_debug_28604 | rasdani/github-patches | git_diff | Lightning-AI__pytorch-lightning-1015 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
logging basic configuration level: INFO vs. WARNING (usability with W&B)
Thanks for the amazing package! I am having a great time using it.
# Issue
Recently, I have been playing around with the weights and biases (W&B) logging functionality and I noticed that I was getting a lot of logging messages in my jupyter notebook while training my model (every epoch I got new messages).
When I looked into `logging.__init__.py`, the logging basic configuration was set with:
`logging.basicConfig(level=logging.INFO)`
However, that means a lot of INFO messages are being printed from W&B's use of the logger (e.g. when the RunManager modifies files).
# Potential Solution
To disable this, I switched the logging basic configuration in `logging.__init__.py` to:
`logging.basicConfig(level=logging.WARNING)`
Would this be a useful addition in general to the package or should I just keep this change local?
</issue>
<code>
[start of pytorch_lightning/profiler/profiler.py]
1 from contextlib import contextmanager
2 from collections import defaultdict
3 import time
4 import numpy as np
5 import cProfile
6 import pstats
7 import io
8 from abc import ABC, abstractmethod
9 import logging
10
11 logger = logging.getLogger(__name__)
12
13
14 class BaseProfiler(ABC):
15 """
16 If you wish to write a custom profiler, you should inhereit from this class.
17 """
18
19 @abstractmethod
20 def start(self, action_name):
21 """
22 Defines how to start recording an action.
23 """
24 pass
25
26 @abstractmethod
27 def stop(self, action_name):
28 """
29 Defines how to record the duration once an action is complete.
30 """
31 pass
32
33 @contextmanager
34 def profile(self, action_name):
35 """
36 Yields a context manager to encapsulate the scope of a profiled action.
37
38 Example::
39
40 with self.profile('load training data'):
41 # load training data code
42
43 The profiler will start once you've entered the context and will automatically
44 stop once you exit the code block.
45 """
46 try:
47 self.start(action_name)
48 yield action_name
49 finally:
50 self.stop(action_name)
51
52 def profile_iterable(self, iterable, action_name):
53 iterator = iter(iterable)
54 while True:
55 try:
56 self.start(action_name)
57 value = next(iterator)
58 self.stop(action_name)
59 yield value
60 except StopIteration:
61 self.stop(action_name)
62 break
63
64 def describe(self):
65 """
66 Logs a profile report after the conclusion of the training run.
67 """
68 pass
69
70
71 class PassThroughProfiler(BaseProfiler):
72 """
73 This class should be used when you don't want the (small) overhead of profiling.
74 The Trainer uses this class by default.
75 """
76
77 def __init__(self):
78 pass
79
80 def start(self, action_name):
81 pass
82
83 def stop(self, action_name):
84 pass
85
86
87 class Profiler(BaseProfiler):
88 """
89 This profiler simply records the duration of actions (in seconds) and reports
90 the mean duration of each action and the total time spent over the entire training run.
91 """
92
93 def __init__(self):
94 self.current_actions = {}
95 self.recorded_durations = defaultdict(list)
96
97 def start(self, action_name):
98 if action_name in self.current_actions:
99 raise ValueError(
100 f"Attempted to start {action_name} which has already started."
101 )
102 self.current_actions[action_name] = time.monotonic()
103
104 def stop(self, action_name):
105 end_time = time.monotonic()
106 if action_name not in self.current_actions:
107 raise ValueError(
108 f"Attempting to stop recording an action ({action_name}) which was never started."
109 )
110 start_time = self.current_actions.pop(action_name)
111 duration = end_time - start_time
112 self.recorded_durations[action_name].append(duration)
113
114 def describe(self):
115 output_string = "\n\nProfiler Report\n"
116
117 def log_row(action, mean, total):
118 return f"\n{action:<20s}\t| {mean:<15}\t| {total:<15}"
119
120 output_string += log_row("Action", "Mean duration (s)", "Total time (s)")
121 output_string += f"\n{'-' * 65}"
122 for action, durations in self.recorded_durations.items():
123 output_string += log_row(
124 action, f"{np.mean(durations):.5}", f"{np.sum(durations):.5}",
125 )
126 output_string += "\n"
127 logger.info(output_string)
128
129
130 class AdvancedProfiler(BaseProfiler):
131 """
132 This profiler uses Python's cProfiler to record more detailed information about
133 time spent in each function call recorded during a given action. The output is quite
134 verbose and you should only use this if you want very detailed reports.
135 """
136
137 def __init__(self, output_filename=None, line_count_restriction=1.0):
138 """
139 :param output_filename (str): optionally save profile results to file instead of printing
140 to std out when training is finished.
141 :param line_count_restriction (int|float): this can be used to limit the number of functions
142 reported for each action. either an integer (to select a count of lines),
143 or a decimal fraction between 0.0 and 1.0 inclusive (to select a percentage of lines)
144 """
145 self.profiled_actions = {}
146 self.output_filename = output_filename
147 self.line_count_restriction = line_count_restriction
148
149 def start(self, action_name):
150 if action_name not in self.profiled_actions:
151 self.profiled_actions[action_name] = cProfile.Profile()
152 self.profiled_actions[action_name].enable()
153
154 def stop(self, action_name):
155 pr = self.profiled_actions.get(action_name)
156 if pr is None:
157 raise ValueError(
158 f"Attempting to stop recording an action ({action_name}) which was never started."
159 )
160 pr.disable()
161
162 def describe(self):
163 self.recorded_stats = {}
164 for action_name, pr in self.profiled_actions.items():
165 s = io.StringIO()
166 ps = pstats.Stats(pr, stream=s).strip_dirs().sort_stats('cumulative')
167 ps.print_stats(self.line_count_restriction)
168 self.recorded_stats[action_name] = s.getvalue()
169 if self.output_filename is not None:
170 # save to file
171 with open(self.output_filename, "w") as f:
172 for action, stats in self.recorded_stats.items():
173 f.write(f"Profile stats for: {action}")
174 f.write(stats)
175 else:
176 # log to standard out
177 output_string = "\nProfiler Report\n"
178 for action, stats in self.recorded_stats.items():
179 output_string += f"\nProfile stats for: {action}\n{stats}"
180 logger.info(output_string)
181
[end of pytorch_lightning/profiler/profiler.py]
[start of pytorch_lightning/__init__.py]
1 """Root package info."""
2
3 __version__ = '0.6.1.dev'
4 __author__ = 'William Falcon et al.'
5 __author_email__ = '[email protected]'
6 __license__ = 'Apache-2.0'
7 __copyright__ = 'Copyright (c) 2018-2020, %s.' % __author__
8 __homepage__ = 'https://github.com/PyTorchLightning/pytorch-lightning'
9 # this has to be simple string, see: https://github.com/pypa/twine/issues/522
10 __docs__ = "PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers." \
11 " Scale your models. Write less boilerplate."
12
13 try:
14 # This variable is injected in the __builtins__ by the build
15 # process. It used to enable importing subpackages of skimage when
16 # the binaries are not built
17 __LIGHTNING_SETUP__
18 except NameError:
19 __LIGHTNING_SETUP__ = False
20
21 if __LIGHTNING_SETUP__:
22 import sys
23 sys.stderr.write('Partial import of `torchlightning` during the build process.\n')
24 # We are not importing the rest of the scikit during the build
25 # process, as it may not be compiled yet
26 else:
27 import logging as log
28 log.basicConfig(level=log.INFO)
29
30 from .core import data_loader, LightningModule
31 from .trainer import Trainer
32 from .callbacks import Callback
33
34 __all__ = [
35 'Trainer',
36 'LightningModule',
37 'Callback',
38 'data_loader',
39 ]
40 # __call__ = __all__
41
[end of pytorch_lightning/__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/pytorch_lightning/__init__.py b/pytorch_lightning/__init__.py
--- a/pytorch_lightning/__init__.py
+++ b/pytorch_lightning/__init__.py
@@ -24,9 +24,6 @@
# We are not importing the rest of the scikit during the build
# process, as it may not be compiled yet
else:
- import logging as log
- log.basicConfig(level=log.INFO)
-
from .core import data_loader, LightningModule
from .trainer import Trainer
from .callbacks import Callback
diff --git a/pytorch_lightning/profiler/profiler.py b/pytorch_lightning/profiler/profiler.py
--- a/pytorch_lightning/profiler/profiler.py
+++ b/pytorch_lightning/profiler/profiler.py
@@ -6,9 +6,7 @@
import pstats
import io
from abc import ABC, abstractmethod
-import logging
-
-logger = logging.getLogger(__name__)
+import logging as log
class BaseProfiler(ABC):
@@ -124,7 +122,7 @@
action, f"{np.mean(durations):.5}", f"{np.sum(durations):.5}",
)
output_string += "\n"
- logger.info(output_string)
+ log.info(output_string)
class AdvancedProfiler(BaseProfiler):
@@ -177,4 +175,4 @@
output_string = "\nProfiler Report\n"
for action, stats in self.recorded_stats.items():
output_string += f"\nProfile stats for: {action}\n{stats}"
- logger.info(output_string)
+ log.info(output_string)
| {"golden_diff": "diff --git a/pytorch_lightning/__init__.py b/pytorch_lightning/__init__.py\n--- a/pytorch_lightning/__init__.py\n+++ b/pytorch_lightning/__init__.py\n@@ -24,9 +24,6 @@\n # We are not importing the rest of the scikit during the build\n # process, as it may not be compiled yet\n else:\n- import logging as log\n- log.basicConfig(level=log.INFO)\n-\n from .core import data_loader, LightningModule\n from .trainer import Trainer\n from .callbacks import Callback\ndiff --git a/pytorch_lightning/profiler/profiler.py b/pytorch_lightning/profiler/profiler.py\n--- a/pytorch_lightning/profiler/profiler.py\n+++ b/pytorch_lightning/profiler/profiler.py\n@@ -6,9 +6,7 @@\n import pstats\n import io\n from abc import ABC, abstractmethod\n-import logging\n-\n-logger = logging.getLogger(__name__)\n+import logging as log\n \n \n class BaseProfiler(ABC):\n@@ -124,7 +122,7 @@\n action, f\"{np.mean(durations):.5}\", f\"{np.sum(durations):.5}\",\n )\n output_string += \"\\n\"\n- logger.info(output_string)\n+ log.info(output_string)\n \n \n class AdvancedProfiler(BaseProfiler):\n@@ -177,4 +175,4 @@\n output_string = \"\\nProfiler Report\\n\"\n for action, stats in self.recorded_stats.items():\n output_string += f\"\\nProfile stats for: {action}\\n{stats}\"\n- logger.info(output_string)\n+ log.info(output_string)\n", "issue": "logging basic configuration level: INFO vs. WARNING (usability with W&B)\nThanks for the amazing package! I am having a great time using it.\r\n\r\n# Issue \r\nRecently, I have been playing around with the weights and biases (W&B) logging functionality and I noticed that I was getting a lot of logging messages in my jupyter notebook while training my model (every epoch I got new messages).\r\n\r\nWhen I looked into `logging.__init__.py`, the logging basic configuration was set with:\r\n\r\n`logging.basicConfig(level=logging.INFO)`\r\n\r\nHowever, that means a lot of INFO messages are being printed from W&B's use of the logger (e.g. when the RunManager modifies files).\r\n\r\n# Potential Solution\r\n\r\nTo disable this, I switched the logging basic configuration in `logging.__init__.py` to:\r\n\r\n`logging.basicConfig(level=logging.WARNING)`\r\n\r\nWould this be a useful addition in general to the package or should I just keep this change local?\n", "before_files": [{"content": "from contextlib import contextmanager\nfrom collections import defaultdict\nimport time\nimport numpy as np\nimport cProfile\nimport pstats\nimport io\nfrom abc import ABC, abstractmethod\nimport logging\n\nlogger = logging.getLogger(__name__)\n\n\nclass BaseProfiler(ABC):\n \"\"\"\n If you wish to write a custom profiler, you should inhereit from this class.\n \"\"\"\n\n @abstractmethod\n def start(self, action_name):\n \"\"\"\n Defines how to start recording an action.\n \"\"\"\n pass\n\n @abstractmethod\n def stop(self, action_name):\n \"\"\"\n Defines how to record the duration once an action is complete.\n \"\"\"\n pass\n\n @contextmanager\n def profile(self, action_name):\n \"\"\"\n Yields a context manager to encapsulate the scope of a profiled action.\n\n Example::\n\n with self.profile('load training data'):\n # load training data code\n\n The profiler will start once you've entered the context and will automatically\n stop once you exit the code block.\n \"\"\"\n try:\n self.start(action_name)\n yield action_name\n finally:\n self.stop(action_name)\n\n def profile_iterable(self, iterable, action_name):\n iterator = iter(iterable)\n while True:\n try:\n self.start(action_name)\n value = next(iterator)\n self.stop(action_name)\n yield value\n except StopIteration:\n self.stop(action_name)\n break\n\n def describe(self):\n \"\"\"\n Logs a profile report after the conclusion of the training run.\n \"\"\"\n pass\n\n\nclass PassThroughProfiler(BaseProfiler):\n \"\"\"\n This class should be used when you don't want the (small) overhead of profiling.\n The Trainer uses this class by default.\n \"\"\"\n\n def __init__(self):\n pass\n\n def start(self, action_name):\n pass\n\n def stop(self, action_name):\n pass\n\n\nclass Profiler(BaseProfiler):\n \"\"\"\n This profiler simply records the duration of actions (in seconds) and reports\n the mean duration of each action and the total time spent over the entire training run.\n \"\"\"\n\n def __init__(self):\n self.current_actions = {}\n self.recorded_durations = defaultdict(list)\n\n def start(self, action_name):\n if action_name in self.current_actions:\n raise ValueError(\n f\"Attempted to start {action_name} which has already started.\"\n )\n self.current_actions[action_name] = time.monotonic()\n\n def stop(self, action_name):\n end_time = time.monotonic()\n if action_name not in self.current_actions:\n raise ValueError(\n f\"Attempting to stop recording an action ({action_name}) which was never started.\"\n )\n start_time = self.current_actions.pop(action_name)\n duration = end_time - start_time\n self.recorded_durations[action_name].append(duration)\n\n def describe(self):\n output_string = \"\\n\\nProfiler Report\\n\"\n\n def log_row(action, mean, total):\n return f\"\\n{action:<20s}\\t| {mean:<15}\\t| {total:<15}\"\n\n output_string += log_row(\"Action\", \"Mean duration (s)\", \"Total time (s)\")\n output_string += f\"\\n{'-' * 65}\"\n for action, durations in self.recorded_durations.items():\n output_string += log_row(\n action, f\"{np.mean(durations):.5}\", f\"{np.sum(durations):.5}\",\n )\n output_string += \"\\n\"\n logger.info(output_string)\n\n\nclass AdvancedProfiler(BaseProfiler):\n \"\"\"\n This profiler uses Python's cProfiler to record more detailed information about\n time spent in each function call recorded during a given action. The output is quite\n verbose and you should only use this if you want very detailed reports.\n \"\"\"\n\n def __init__(self, output_filename=None, line_count_restriction=1.0):\n \"\"\"\n :param output_filename (str): optionally save profile results to file instead of printing\n to std out when training is finished.\n :param line_count_restriction (int|float): this can be used to limit the number of functions\n reported for each action. either an integer (to select a count of lines),\n or a decimal fraction between 0.0 and 1.0 inclusive (to select a percentage of lines)\n \"\"\"\n self.profiled_actions = {}\n self.output_filename = output_filename\n self.line_count_restriction = line_count_restriction\n\n def start(self, action_name):\n if action_name not in self.profiled_actions:\n self.profiled_actions[action_name] = cProfile.Profile()\n self.profiled_actions[action_name].enable()\n\n def stop(self, action_name):\n pr = self.profiled_actions.get(action_name)\n if pr is None:\n raise ValueError(\n f\"Attempting to stop recording an action ({action_name}) which was never started.\"\n )\n pr.disable()\n\n def describe(self):\n self.recorded_stats = {}\n for action_name, pr in self.profiled_actions.items():\n s = io.StringIO()\n ps = pstats.Stats(pr, stream=s).strip_dirs().sort_stats('cumulative')\n ps.print_stats(self.line_count_restriction)\n self.recorded_stats[action_name] = s.getvalue()\n if self.output_filename is not None:\n # save to file\n with open(self.output_filename, \"w\") as f:\n for action, stats in self.recorded_stats.items():\n f.write(f\"Profile stats for: {action}\")\n f.write(stats)\n else:\n # log to standard out\n output_string = \"\\nProfiler Report\\n\"\n for action, stats in self.recorded_stats.items():\n output_string += f\"\\nProfile stats for: {action}\\n{stats}\"\n logger.info(output_string)\n", "path": "pytorch_lightning/profiler/profiler.py"}, {"content": "\"\"\"Root package info.\"\"\"\n\n__version__ = '0.6.1.dev'\n__author__ = 'William Falcon et al.'\n__author_email__ = '[email protected]'\n__license__ = 'Apache-2.0'\n__copyright__ = 'Copyright (c) 2018-2020, %s.' % __author__\n__homepage__ = 'https://github.com/PyTorchLightning/pytorch-lightning'\n# this has to be simple string, see: https://github.com/pypa/twine/issues/522\n__docs__ = \"PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers.\" \\\n \" Scale your models. Write less boilerplate.\"\n\ntry:\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 __LIGHTNING_SETUP__\nexcept NameError:\n __LIGHTNING_SETUP__ = False\n\nif __LIGHTNING_SETUP__:\n import sys\n sys.stderr.write('Partial import of `torchlightning` during the build process.\\n')\n # We are not importing the rest of the scikit during the build\n # process, as it may not be compiled yet\nelse:\n import logging as log\n log.basicConfig(level=log.INFO)\n\n from .core import data_loader, LightningModule\n from .trainer import Trainer\n from .callbacks import Callback\n\n __all__ = [\n 'Trainer',\n 'LightningModule',\n 'Callback',\n 'data_loader',\n ]\n # __call__ = __all__\n", "path": "pytorch_lightning/__init__.py"}]} | 2,886 | 360 |
gh_patches_debug_17049 | rasdani/github-patches | git_diff | Cog-Creators__Red-DiscordBot-3606 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
[Trivia] Errors in game sessions need better handling
Currently any exception inside trivia session's task just stops it without any logging and feedback to session's players.
Example issues that can get hidden because of this issue: #3583, #3584
</issue>
<code>
[start of redbot/cogs/trivia/session.py]
1 """Module to manage trivia sessions."""
2 import asyncio
3 import time
4 import random
5 from collections import Counter
6 import discord
7 from redbot.core import bank
8 from redbot.core.i18n import Translator
9 from redbot.core.utils.chat_formatting import box, bold, humanize_list, humanize_number
10 from redbot.core.utils.common_filters import normalize_smartquotes
11 from .log import LOG
12
13 __all__ = ["TriviaSession"]
14
15 T_ = Translator("TriviaSession", __file__)
16
17
18 _ = lambda s: s
19 _REVEAL_MESSAGES = (
20 _("I know this one! {answer}!"),
21 _("Easy: {answer}."),
22 _("Oh really? It's {answer} of course."),
23 )
24 _FAIL_MESSAGES = (
25 _("To the next one I guess..."),
26 _("Moving on..."),
27 _("I'm sure you'll know the answer of the next one."),
28 _("\N{PENSIVE FACE} Next one."),
29 )
30 _ = T_
31
32
33 class TriviaSession:
34 """Class to run a session of trivia with the user.
35
36 To run the trivia session immediately, use `TriviaSession.start` instead of
37 instantiating directly.
38
39 Attributes
40 ----------
41 ctx : `commands.Context`
42 Context object from which this session will be run.
43 This object assumes the session was started in `ctx.channel`
44 by `ctx.author`.
45 question_list : `dict`
46 A list of tuples mapping questions (`str`) to answers (`list` of
47 `str`).
48 settings : `dict`
49 Settings for the trivia session, with values for the following:
50 - ``max_score`` (`int`)
51 - ``delay`` (`float`)
52 - ``timeout`` (`float`)
53 - ``reveal_answer`` (`bool`)
54 - ``bot_plays`` (`bool`)
55 - ``allow_override`` (`bool`)
56 - ``payout_multiplier`` (`float`)
57 scores : `collections.Counter`
58 A counter with the players as keys, and their scores as values. The
59 players are of type `discord.Member`.
60 count : `int`
61 The number of questions which have been asked.
62
63 """
64
65 def __init__(self, ctx, question_list: dict, settings: dict):
66 self.ctx = ctx
67 list_ = list(question_list.items())
68 random.shuffle(list_)
69 self.question_list = list_
70 self.settings = settings
71 self.scores = Counter()
72 self.count = 0
73 self._last_response = time.time()
74 self._task = None
75
76 @classmethod
77 def start(cls, ctx, question_list, settings):
78 """Create and start a trivia session.
79
80 This allows the session to manage the running and cancellation of its
81 own tasks.
82
83 Parameters
84 ----------
85 ctx : `commands.Context`
86 Same as `TriviaSession.ctx`
87 question_list : `dict`
88 Same as `TriviaSession.question_list`
89 settings : `dict`
90 Same as `TriviaSession.settings`
91
92 Returns
93 -------
94 TriviaSession
95 The new trivia session being run.
96
97 """
98 session = cls(ctx, question_list, settings)
99 loop = ctx.bot.loop
100 session._task = loop.create_task(session.run())
101 return session
102
103 async def run(self):
104 """Run the trivia session.
105
106 In order for the trivia session to be stopped correctly, this should
107 only be called internally by `TriviaSession.start`.
108 """
109 await self._send_startup_msg()
110 max_score = self.settings["max_score"]
111 delay = self.settings["delay"]
112 timeout = self.settings["timeout"]
113 for question, answers in self._iter_questions():
114 async with self.ctx.typing():
115 await asyncio.sleep(3)
116 self.count += 1
117 msg = bold(_("Question number {num}!").format(num=self.count)) + "\n\n" + question
118 await self.ctx.send(msg)
119 continue_ = await self.wait_for_answer(answers, delay, timeout)
120 if continue_ is False:
121 break
122 if any(score >= max_score for score in self.scores.values()):
123 await self.end_game()
124 break
125 else:
126 await self.ctx.send(_("There are no more questions!"))
127 await self.end_game()
128
129 async def _send_startup_msg(self):
130 list_names = []
131 for idx, tup in enumerate(self.settings["lists"].items()):
132 name, author = tup
133 if author:
134 title = _("{trivia_list} (by {author})").format(trivia_list=name, author=author)
135 else:
136 title = name
137 list_names.append(title)
138 await self.ctx.send(
139 _("Starting Trivia: {list_names}").format(list_names=humanize_list(list_names))
140 )
141
142 def _iter_questions(self):
143 """Iterate over questions and answers for this session.
144
145 Yields
146 ------
147 `tuple`
148 A tuple containing the question (`str`) and the answers (`tuple` of
149 `str`).
150
151 """
152 for question, answers in self.question_list:
153 answers = _parse_answers(answers)
154 yield question, answers
155
156 async def wait_for_answer(self, answers, delay: float, timeout: float):
157 """Wait for a correct answer, and then respond.
158
159 Scores are also updated in this method.
160
161 Returns False if waiting was cancelled; this is usually due to the
162 session being forcibly stopped.
163
164 Parameters
165 ----------
166 answers : `iterable` of `str`
167 A list of valid answers to the current question.
168 delay : float
169 How long users have to respond (in seconds).
170 timeout : float
171 How long before the session ends due to no responses (in seconds).
172
173 Returns
174 -------
175 bool
176 :code:`True` if the session wasn't interrupted.
177
178 """
179 try:
180 message = await self.ctx.bot.wait_for(
181 "message", check=self.check_answer(answers), timeout=delay
182 )
183 except asyncio.TimeoutError:
184 if time.time() - self._last_response >= timeout:
185 await self.ctx.send(_("Guys...? Well, I guess I'll stop then."))
186 self.stop()
187 return False
188 if self.settings["reveal_answer"]:
189 reply = T_(random.choice(_REVEAL_MESSAGES)).format(answer=answers[0])
190 else:
191 reply = T_(random.choice(_FAIL_MESSAGES))
192 if self.settings["bot_plays"]:
193 reply += _(" **+1** for me!")
194 self.scores[self.ctx.guild.me] += 1
195 await self.ctx.send(reply)
196 else:
197 self.scores[message.author] += 1
198 reply = _("You got it {user}! **+1** to you!").format(user=message.author.display_name)
199 await self.ctx.send(reply)
200 return True
201
202 def check_answer(self, answers):
203 """Get a predicate to check for correct answers.
204
205 The returned predicate takes a message as its only parameter,
206 and returns ``True`` if the message contains any of the
207 given answers.
208
209 Parameters
210 ----------
211 answers : `iterable` of `str`
212 The answers which the predicate must check for.
213
214 Returns
215 -------
216 function
217 The message predicate.
218
219 """
220 answers = tuple(s.lower() for s in answers)
221
222 def _pred(message: discord.Message):
223 early_exit = message.channel != self.ctx.channel or message.author == self.ctx.guild.me
224 if early_exit:
225 return False
226
227 self._last_response = time.time()
228 guess = message.content.lower()
229 guess = normalize_smartquotes(guess)
230 for answer in answers:
231 if " " in answer and answer in guess:
232 # Exact matching, issue #331
233 return True
234 elif any(word == answer for word in guess.split(" ")):
235 return True
236 return False
237
238 return _pred
239
240 async def end_game(self):
241 """End the trivia session and display scrores."""
242 if self.scores:
243 await self.send_table()
244 multiplier = self.settings["payout_multiplier"]
245 if multiplier > 0:
246 await self.pay_winner(multiplier)
247 self.stop()
248
249 async def send_table(self):
250 """Send a table of scores to the session's channel."""
251 table = "+ Results: \n\n"
252 for user, score in self.scores.most_common():
253 table += "+ {}\t{}\n".format(user, score)
254 await self.ctx.send(box(table, lang="diff"))
255
256 def stop(self):
257 """Stop the trivia session, without showing scores."""
258 self.ctx.bot.dispatch("trivia_end", self)
259
260 def force_stop(self):
261 """Cancel whichever tasks this session is running."""
262 self._task.cancel()
263 channel = self.ctx.channel
264 LOG.debug("Force stopping trivia session; #%s in %s", channel, channel.guild.id)
265
266 async def pay_winner(self, multiplier: float):
267 """Pay the winner of this trivia session.
268
269 The winner is only payed if there are at least 3 human contestants.
270
271 Parameters
272 ----------
273 multiplier : float
274 The coefficient of the winner's score, used to determine the amount
275 paid.
276
277 """
278 (winner, score) = next((tup for tup in self.scores.most_common(1)), (None, None))
279 me_ = self.ctx.guild.me
280 if winner is not None and winner != me_ and score > 0:
281 contestants = list(self.scores.keys())
282 if me_ in contestants:
283 contestants.remove(me_)
284 if len(contestants) >= 3:
285 amount = int(multiplier * score)
286 if amount > 0:
287 LOG.debug("Paying trivia winner: %d credits --> %s", amount, str(winner))
288 await bank.deposit_credits(winner, int(multiplier * score))
289 await self.ctx.send(
290 _(
291 "Congratulations, {user}, you have received {num} {currency}"
292 " for coming first."
293 ).format(
294 user=winner.display_name,
295 num=humanize_number(amount),
296 currency=await bank.get_currency_name(self.ctx.guild),
297 )
298 )
299
300
301 def _parse_answers(answers):
302 """Parse the raw answers to readable strings.
303
304 The reason this exists is because of YAML's ambiguous syntax. For example,
305 if the answer to a question in YAML is ``yes``, YAML will load it as the
306 boolean value ``True``, which is not necessarily the desired answer. This
307 function aims to undo that for bools, and possibly for numbers in the
308 future too.
309
310 Parameters
311 ----------
312 answers : `iterable` of `str`
313 The raw answers loaded from YAML.
314
315 Returns
316 -------
317 `tuple` of `str`
318 The answers in readable/ guessable strings.
319
320 """
321 ret = []
322 for answer in answers:
323 if isinstance(answer, bool):
324 if answer is True:
325 ret.extend(["True", "Yes", "On"])
326 else:
327 ret.extend(["False", "No", "Off"])
328 else:
329 ret.append(str(answer))
330 # Uniquify list
331 seen = set()
332 return tuple(x for x in ret if not (x in seen or seen.add(x)))
333
[end of redbot/cogs/trivia/session.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/redbot/cogs/trivia/session.py b/redbot/cogs/trivia/session.py
--- a/redbot/cogs/trivia/session.py
+++ b/redbot/cogs/trivia/session.py
@@ -98,8 +98,26 @@
session = cls(ctx, question_list, settings)
loop = ctx.bot.loop
session._task = loop.create_task(session.run())
+ session._task.add_done_callback(session._error_handler)
return session
+ def _error_handler(self, fut):
+ """Catches errors in the session task."""
+ try:
+ fut.result()
+ except asyncio.CancelledError:
+ pass
+ except Exception as exc:
+ LOG.error("A trivia session has encountered an error.\n", exc_info=exc)
+ asyncio.create_task(
+ self.ctx.send(
+ _(
+ "An unexpected error occurred in the trivia session.\nCheck your console or logs for details."
+ )
+ )
+ )
+ self.stop()
+
async def run(self):
"""Run the trivia session.
| {"golden_diff": "diff --git a/redbot/cogs/trivia/session.py b/redbot/cogs/trivia/session.py\n--- a/redbot/cogs/trivia/session.py\n+++ b/redbot/cogs/trivia/session.py\n@@ -98,8 +98,26 @@\n session = cls(ctx, question_list, settings)\n loop = ctx.bot.loop\n session._task = loop.create_task(session.run())\n+ session._task.add_done_callback(session._error_handler)\n return session\n \n+ def _error_handler(self, fut):\n+ \"\"\"Catches errors in the session task.\"\"\"\n+ try:\n+ fut.result()\n+ except asyncio.CancelledError:\n+ pass\n+ except Exception as exc:\n+ LOG.error(\"A trivia session has encountered an error.\\n\", exc_info=exc)\n+ asyncio.create_task(\n+ self.ctx.send(\n+ _(\n+ \"An unexpected error occurred in the trivia session.\\nCheck your console or logs for details.\"\n+ )\n+ )\n+ )\n+ self.stop()\n+\n async def run(self):\n \"\"\"Run the trivia session.\n", "issue": "[Trivia] Errors in game sessions need better handling\nCurrently any exception inside trivia session's task just stops it without any logging and feedback to session's players.\r\nExample issues that can get hidden because of this issue: #3583, #3584\n", "before_files": [{"content": "\"\"\"Module to manage trivia sessions.\"\"\"\nimport asyncio\nimport time\nimport random\nfrom collections import Counter\nimport discord\nfrom redbot.core import bank\nfrom redbot.core.i18n import Translator\nfrom redbot.core.utils.chat_formatting import box, bold, humanize_list, humanize_number\nfrom redbot.core.utils.common_filters import normalize_smartquotes\nfrom .log import LOG\n\n__all__ = [\"TriviaSession\"]\n\nT_ = Translator(\"TriviaSession\", __file__)\n\n\n_ = lambda s: s\n_REVEAL_MESSAGES = (\n _(\"I know this one! {answer}!\"),\n _(\"Easy: {answer}.\"),\n _(\"Oh really? It's {answer} of course.\"),\n)\n_FAIL_MESSAGES = (\n _(\"To the next one I guess...\"),\n _(\"Moving on...\"),\n _(\"I'm sure you'll know the answer of the next one.\"),\n _(\"\\N{PENSIVE FACE} Next one.\"),\n)\n_ = T_\n\n\nclass TriviaSession:\n \"\"\"Class to run a session of trivia with the user.\n\n To run the trivia session immediately, use `TriviaSession.start` instead of\n instantiating directly.\n\n Attributes\n ----------\n ctx : `commands.Context`\n Context object from which this session will be run.\n This object assumes the session was started in `ctx.channel`\n by `ctx.author`.\n question_list : `dict`\n A list of tuples mapping questions (`str`) to answers (`list` of\n `str`).\n settings : `dict`\n Settings for the trivia session, with values for the following:\n - ``max_score`` (`int`)\n - ``delay`` (`float`)\n - ``timeout`` (`float`)\n - ``reveal_answer`` (`bool`)\n - ``bot_plays`` (`bool`)\n - ``allow_override`` (`bool`)\n - ``payout_multiplier`` (`float`)\n scores : `collections.Counter`\n A counter with the players as keys, and their scores as values. The\n players are of type `discord.Member`.\n count : `int`\n The number of questions which have been asked.\n\n \"\"\"\n\n def __init__(self, ctx, question_list: dict, settings: dict):\n self.ctx = ctx\n list_ = list(question_list.items())\n random.shuffle(list_)\n self.question_list = list_\n self.settings = settings\n self.scores = Counter()\n self.count = 0\n self._last_response = time.time()\n self._task = None\n\n @classmethod\n def start(cls, ctx, question_list, settings):\n \"\"\"Create and start a trivia session.\n\n This allows the session to manage the running and cancellation of its\n own tasks.\n\n Parameters\n ----------\n ctx : `commands.Context`\n Same as `TriviaSession.ctx`\n question_list : `dict`\n Same as `TriviaSession.question_list`\n settings : `dict`\n Same as `TriviaSession.settings`\n\n Returns\n -------\n TriviaSession\n The new trivia session being run.\n\n \"\"\"\n session = cls(ctx, question_list, settings)\n loop = ctx.bot.loop\n session._task = loop.create_task(session.run())\n return session\n\n async def run(self):\n \"\"\"Run the trivia session.\n\n In order for the trivia session to be stopped correctly, this should\n only be called internally by `TriviaSession.start`.\n \"\"\"\n await self._send_startup_msg()\n max_score = self.settings[\"max_score\"]\n delay = self.settings[\"delay\"]\n timeout = self.settings[\"timeout\"]\n for question, answers in self._iter_questions():\n async with self.ctx.typing():\n await asyncio.sleep(3)\n self.count += 1\n msg = bold(_(\"Question number {num}!\").format(num=self.count)) + \"\\n\\n\" + question\n await self.ctx.send(msg)\n continue_ = await self.wait_for_answer(answers, delay, timeout)\n if continue_ is False:\n break\n if any(score >= max_score for score in self.scores.values()):\n await self.end_game()\n break\n else:\n await self.ctx.send(_(\"There are no more questions!\"))\n await self.end_game()\n\n async def _send_startup_msg(self):\n list_names = []\n for idx, tup in enumerate(self.settings[\"lists\"].items()):\n name, author = tup\n if author:\n title = _(\"{trivia_list} (by {author})\").format(trivia_list=name, author=author)\n else:\n title = name\n list_names.append(title)\n await self.ctx.send(\n _(\"Starting Trivia: {list_names}\").format(list_names=humanize_list(list_names))\n )\n\n def _iter_questions(self):\n \"\"\"Iterate over questions and answers for this session.\n\n Yields\n ------\n `tuple`\n A tuple containing the question (`str`) and the answers (`tuple` of\n `str`).\n\n \"\"\"\n for question, answers in self.question_list:\n answers = _parse_answers(answers)\n yield question, answers\n\n async def wait_for_answer(self, answers, delay: float, timeout: float):\n \"\"\"Wait for a correct answer, and then respond.\n\n Scores are also updated in this method.\n\n Returns False if waiting was cancelled; this is usually due to the\n session being forcibly stopped.\n\n Parameters\n ----------\n answers : `iterable` of `str`\n A list of valid answers to the current question.\n delay : float\n How long users have to respond (in seconds).\n timeout : float\n How long before the session ends due to no responses (in seconds).\n\n Returns\n -------\n bool\n :code:`True` if the session wasn't interrupted.\n\n \"\"\"\n try:\n message = await self.ctx.bot.wait_for(\n \"message\", check=self.check_answer(answers), timeout=delay\n )\n except asyncio.TimeoutError:\n if time.time() - self._last_response >= timeout:\n await self.ctx.send(_(\"Guys...? Well, I guess I'll stop then.\"))\n self.stop()\n return False\n if self.settings[\"reveal_answer\"]:\n reply = T_(random.choice(_REVEAL_MESSAGES)).format(answer=answers[0])\n else:\n reply = T_(random.choice(_FAIL_MESSAGES))\n if self.settings[\"bot_plays\"]:\n reply += _(\" **+1** for me!\")\n self.scores[self.ctx.guild.me] += 1\n await self.ctx.send(reply)\n else:\n self.scores[message.author] += 1\n reply = _(\"You got it {user}! **+1** to you!\").format(user=message.author.display_name)\n await self.ctx.send(reply)\n return True\n\n def check_answer(self, answers):\n \"\"\"Get a predicate to check for correct answers.\n\n The returned predicate takes a message as its only parameter,\n and returns ``True`` if the message contains any of the\n given answers.\n\n Parameters\n ----------\n answers : `iterable` of `str`\n The answers which the predicate must check for.\n\n Returns\n -------\n function\n The message predicate.\n\n \"\"\"\n answers = tuple(s.lower() for s in answers)\n\n def _pred(message: discord.Message):\n early_exit = message.channel != self.ctx.channel or message.author == self.ctx.guild.me\n if early_exit:\n return False\n\n self._last_response = time.time()\n guess = message.content.lower()\n guess = normalize_smartquotes(guess)\n for answer in answers:\n if \" \" in answer and answer in guess:\n # Exact matching, issue #331\n return True\n elif any(word == answer for word in guess.split(\" \")):\n return True\n return False\n\n return _pred\n\n async def end_game(self):\n \"\"\"End the trivia session and display scrores.\"\"\"\n if self.scores:\n await self.send_table()\n multiplier = self.settings[\"payout_multiplier\"]\n if multiplier > 0:\n await self.pay_winner(multiplier)\n self.stop()\n\n async def send_table(self):\n \"\"\"Send a table of scores to the session's channel.\"\"\"\n table = \"+ Results: \\n\\n\"\n for user, score in self.scores.most_common():\n table += \"+ {}\\t{}\\n\".format(user, score)\n await self.ctx.send(box(table, lang=\"diff\"))\n\n def stop(self):\n \"\"\"Stop the trivia session, without showing scores.\"\"\"\n self.ctx.bot.dispatch(\"trivia_end\", self)\n\n def force_stop(self):\n \"\"\"Cancel whichever tasks this session is running.\"\"\"\n self._task.cancel()\n channel = self.ctx.channel\n LOG.debug(\"Force stopping trivia session; #%s in %s\", channel, channel.guild.id)\n\n async def pay_winner(self, multiplier: float):\n \"\"\"Pay the winner of this trivia session.\n\n The winner is only payed if there are at least 3 human contestants.\n\n Parameters\n ----------\n multiplier : float\n The coefficient of the winner's score, used to determine the amount\n paid.\n\n \"\"\"\n (winner, score) = next((tup for tup in self.scores.most_common(1)), (None, None))\n me_ = self.ctx.guild.me\n if winner is not None and winner != me_ and score > 0:\n contestants = list(self.scores.keys())\n if me_ in contestants:\n contestants.remove(me_)\n if len(contestants) >= 3:\n amount = int(multiplier * score)\n if amount > 0:\n LOG.debug(\"Paying trivia winner: %d credits --> %s\", amount, str(winner))\n await bank.deposit_credits(winner, int(multiplier * score))\n await self.ctx.send(\n _(\n \"Congratulations, {user}, you have received {num} {currency}\"\n \" for coming first.\"\n ).format(\n user=winner.display_name,\n num=humanize_number(amount),\n currency=await bank.get_currency_name(self.ctx.guild),\n )\n )\n\n\ndef _parse_answers(answers):\n \"\"\"Parse the raw answers to readable strings.\n\n The reason this exists is because of YAML's ambiguous syntax. For example,\n if the answer to a question in YAML is ``yes``, YAML will load it as the\n boolean value ``True``, which is not necessarily the desired answer. This\n function aims to undo that for bools, and possibly for numbers in the\n future too.\n\n Parameters\n ----------\n answers : `iterable` of `str`\n The raw answers loaded from YAML.\n\n Returns\n -------\n `tuple` of `str`\n The answers in readable/ guessable strings.\n\n \"\"\"\n ret = []\n for answer in answers:\n if isinstance(answer, bool):\n if answer is True:\n ret.extend([\"True\", \"Yes\", \"On\"])\n else:\n ret.extend([\"False\", \"No\", \"Off\"])\n else:\n ret.append(str(answer))\n # Uniquify list\n seen = set()\n return tuple(x for x in ret if not (x in seen or seen.add(x)))\n", "path": "redbot/cogs/trivia/session.py"}]} | 3,905 | 237 |
gh_patches_debug_57016 | rasdani/github-patches | git_diff | fidals__shopelectro-291 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Добавь артикул в карту товара
В мобильной версии сайта, рядом с заголовком товара, не отображается артикул. Как в веб версии. Добавьте такой же элемент.
</issue>
<code>
[start of shopelectro/admin.py]
1 from django.contrib import admin
2 from django.contrib.admin.widgets import FilteredSelectMultiple
3 from django.contrib.redirects.models import Redirect
4 from django.db import models as django_models
5 from django.urls import reverse
6 from django.utils.html import format_html
7 from django.utils.translation import ugettext_lazy as _
8
9 from django_select2.forms import ModelSelect2Widget
10
11 from pages.models import CustomPage, FlatPage, PageTemplate
12 from generic_admin import inlines, models, sites
13
14 from shopelectro import models as se_models
15 from shopelectro.views.admin import TableEditor
16
17
18 class SEAdminSite(sites.SiteWithTableEditor):
19
20 site_header = 'Shopelectro administration'
21 table_editor_view = TableEditor
22
23
24 def prepare_has_filter_queryset(value, db_table, queryset):
25 if not value:
26 return
27
28 query = '{}__tags__isnull'.format(db_table)
29
30 # Use brackets, because `Explicit is better than implicit`.
31 return queryset.filter(**{query: value != 'yes'})
32
33
34 class HasTagsFilter(admin.SimpleListFilter):
35
36 product_model = se_models.Product
37 title = _('has tags')
38 parameter_name = 'has_tags'
39
40 def lookups(self, request, model_admin):
41 return (
42 ('yes', _('Has tags')),
43 ('no', _('Has no tags')),
44 )
45
46 def queryset(self, request, queryset):
47 return prepare_has_filter_queryset(
48 self.value(),
49 self.product_model._meta.db_table,
50 queryset
51 )
52
53
54 class HasCategoryFilter(admin.SimpleListFilter):
55
56 product_model = se_models.Product
57 title = _('has category')
58 parameter_name = 'has_category'
59
60 def lookups(self, request, model_admin):
61 return (
62 ('yes', _('Has category')),
63 ('no', _('Has no category')),
64 )
65
66 def queryset(self, request, queryset):
67 return prepare_has_filter_queryset(
68 self.value(),
69 self.product_model._meta.db_table,
70 queryset
71 )
72
73
74 class TagInline(admin.StackedInline):
75
76 model = se_models.Tag
77 extra = 0
78
79
80 class CategoryInline(inlines.CategoryInline):
81
82 model = se_models.Category
83
84 fieldsets = ((None, {
85 'classes': ('primary-chars', ),
86 'fields': (
87 ('name', 'id'),
88 ('parent', 'correct_parent_id'),
89 )
90 }),)
91
92
93 class ProductInline(inlines.ProductInline):
94
95 model = se_models.Product
96
97 formfield_overrides = {
98 django_models.ManyToManyField: {
99 'widget': FilteredSelectMultiple(verbose_name='Tags', is_stacked=False)
100 },
101 }
102
103 fieldsets = ((None, {
104 'classes': ('primary-chars', ),
105 'fields': (
106 ('name', 'id'),
107 ('category', 'correct_category_id'),
108 ('price', 'in_stock'),
109 'is_popular',
110 ('purchase_price', 'wholesale_small'),
111 ('wholesale_medium', 'wholesale_large'),
112 'tags',
113 )
114 }),)
115
116 def formfield_for_dbfield(self, db_field, **kwargs):
117 if db_field.name == 'category':
118 kwargs['widget'] = ModelSelect2Widget(
119 model=se_models.Category,
120 search_fields=[
121 'name__icontains',
122 'pk__startswith',
123 ],
124 )
125 return super(ProductInline, self).formfield_for_dbfield(
126 db_field,
127 **kwargs,
128 )
129
130
131 class CategoryPageAdmin(models.CategoryPageAdmin):
132
133 add = False
134 delete = False
135 inlines = [CategoryInline, inlines.ImageInline]
136
137 def get_queryset(self, request):
138 return (
139 super(CategoryPageAdmin, self)
140 .get_queryset(request)
141 .select_related('shopelectro_category')
142 )
143
144
145 class ProductPageAdmin(models.ProductPageAdmin):
146
147 add = False
148 delete = False
149 category_page_model = se_models.CategoryPage
150 list_filter = [*models.ProductPageAdmin.list_filter, HasTagsFilter, HasCategoryFilter]
151 inlines = [ProductInline, inlines.ImageInline]
152 search_fields = [
153 'shopelectro_product__vendor_code', 'name', 'slug',
154 ]
155
156 def model_id(self, obj):
157 return obj.model.vendor_code
158
159 model_id.short_description = _('Vendor code')
160 model_id.admin_order_field = 'shopelectro_product__vendor_code'
161
162 def get_queryset(self, request):
163 return (
164 super(ProductPageAdmin, self)
165 .get_queryset(request)
166 .select_related('shopelectro_product')
167 )
168
169
170 class ProductFeedbackPageAdmin(admin.ModelAdmin):
171
172 add = False
173 delete = False
174 list_filter = ['rating']
175 list_display = ['rating', 'name', 'dignities', 'limitations', 'general', 'links']
176
177 def links(self, obj):
178 return format_html(
179 '''
180 <a href="{url}" class="field-link" title="Посмотреть на сайте" target="_blank">
181 <i class="fa fa-link" aria-hidden="true"></i>
182 </a>
183 '''.format(url=obj.product.url))
184
185 links.short_description = _('Link')
186
187 def get_queryset(self, request):
188 return (
189 super(ProductFeedbackPageAdmin, self)
190 .get_queryset(request)
191 .select_related('product')
192 )
193
194
195 class TagGroupAdmin(admin.ModelAdmin):
196
197 list_display = ['id', 'name', 'position', 'count_tags']
198 list_display_links = ['name']
199
200 inlines = [TagInline]
201
202 def get_queryset(self, request):
203 return super(TagGroupAdmin, self).get_queryset(request).prefetch_related('tags')
204
205 def count_tags(self, obj):
206 return obj.tags.count()
207
208
209 class TagAdmin(admin.ModelAdmin):
210
211 search_fields = ['id', 'name']
212 list_display = ['id', 'name', 'position', 'custom_group']
213 list_display_links = ['name']
214
215 def get_queryset(self, request):
216 return super(TagAdmin, self).get_queryset(request).prefetch_related('group')
217
218 def custom_group(self, obj):
219 group = obj.group
220
221 return format_html(
222 '<a href="{url}">{group}</a>',
223 group=group,
224 url=reverse('admin:shopelectro_taggroup_change', args=(group.id, ))
225 )
226
227 custom_group.admin_order_field = 'group'
228 custom_group.short_description = _('Group')
229
230
231 se_admin = SEAdminSite(name='se_admin')
232 se_admin.register(CustomPage, models.CustomPageAdmin)
233 se_admin.register(FlatPage, models.FlatPageAdmin)
234 se_admin.register(PageTemplate, models.CustomPageTemplateAdmin)
235
236 se_admin.register(se_models.CategoryPage, CategoryPageAdmin)
237 se_admin.register(se_models.ProductPage, ProductPageAdmin)
238 se_admin.register(se_models.ProductFeedback, ProductFeedbackPageAdmin)
239 se_admin.register(se_models.TagGroup, TagGroupAdmin)
240 se_admin.register(se_models.Tag, TagAdmin)
241
242 se_admin.register(Redirect)
243
[end of shopelectro/admin.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/shopelectro/admin.py b/shopelectro/admin.py
--- a/shopelectro/admin.py
+++ b/shopelectro/admin.py
@@ -103,7 +103,7 @@
fieldsets = ((None, {
'classes': ('primary-chars', ),
'fields': (
- ('name', 'id'),
+ ('name', 'id', 'vendor_code'),
('category', 'correct_category_id'),
('price', 'in_stock'),
'is_popular',
| {"golden_diff": "diff --git a/shopelectro/admin.py b/shopelectro/admin.py\n--- a/shopelectro/admin.py\n+++ b/shopelectro/admin.py\n@@ -103,7 +103,7 @@\n fieldsets = ((None, {\n 'classes': ('primary-chars', ),\n 'fields': (\n- ('name', 'id'),\n+ ('name', 'id', 'vendor_code'),\n ('category', 'correct_category_id'),\n ('price', 'in_stock'),\n 'is_popular',\n", "issue": "\u0414\u043e\u0431\u0430\u0432\u044c \u0430\u0440\u0442\u0438\u043a\u0443\u043b \u0432 \u043a\u0430\u0440\u0442\u0443 \u0442\u043e\u0432\u0430\u0440\u0430\n\u0412 \u043c\u043e\u0431\u0438\u043b\u044c\u043d\u043e\u0439 \u0432\u0435\u0440\u0441\u0438\u0438 \u0441\u0430\u0439\u0442\u0430, \u0440\u044f\u0434\u043e\u043c \u0441 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u043e\u043c \u0442\u043e\u0432\u0430\u0440\u0430, \u043d\u0435 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u0442\u0441\u044f \u0430\u0440\u0442\u0438\u043a\u0443\u043b. \u041a\u0430\u043a \u0432 \u0432\u0435\u0431 \u0432\u0435\u0440\u0441\u0438\u0438. \u0414\u043e\u0431\u0430\u0432\u044c\u0442\u0435 \u0442\u0430\u043a\u043e\u0439 \u0436\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442. \n", "before_files": [{"content": "from django.contrib import admin\nfrom django.contrib.admin.widgets import FilteredSelectMultiple\nfrom django.contrib.redirects.models import Redirect\nfrom django.db import models as django_models\nfrom django.urls import reverse\nfrom django.utils.html import format_html\nfrom django.utils.translation import ugettext_lazy as _\n\nfrom django_select2.forms import ModelSelect2Widget\n\nfrom pages.models import CustomPage, FlatPage, PageTemplate\nfrom generic_admin import inlines, models, sites\n\nfrom shopelectro import models as se_models\nfrom shopelectro.views.admin import TableEditor\n\n\nclass SEAdminSite(sites.SiteWithTableEditor):\n\n site_header = 'Shopelectro administration'\n table_editor_view = TableEditor\n\n\ndef prepare_has_filter_queryset(value, db_table, queryset):\n if not value:\n return\n\n query = '{}__tags__isnull'.format(db_table)\n\n # Use brackets, because `Explicit is better than implicit`.\n return queryset.filter(**{query: value != 'yes'})\n\n\nclass HasTagsFilter(admin.SimpleListFilter):\n\n product_model = se_models.Product\n title = _('has tags')\n parameter_name = 'has_tags'\n\n def lookups(self, request, model_admin):\n return (\n ('yes', _('Has tags')),\n ('no', _('Has no tags')),\n )\n\n def queryset(self, request, queryset):\n return prepare_has_filter_queryset(\n self.value(),\n self.product_model._meta.db_table,\n queryset\n )\n\n\nclass HasCategoryFilter(admin.SimpleListFilter):\n\n product_model = se_models.Product\n title = _('has category')\n parameter_name = 'has_category'\n\n def lookups(self, request, model_admin):\n return (\n ('yes', _('Has category')),\n ('no', _('Has no category')),\n )\n\n def queryset(self, request, queryset):\n return prepare_has_filter_queryset(\n self.value(),\n self.product_model._meta.db_table,\n queryset\n )\n\n\nclass TagInline(admin.StackedInline):\n\n model = se_models.Tag\n extra = 0\n\n\nclass CategoryInline(inlines.CategoryInline):\n\n model = se_models.Category\n\n fieldsets = ((None, {\n 'classes': ('primary-chars', ),\n 'fields': (\n ('name', 'id'),\n ('parent', 'correct_parent_id'),\n )\n }),)\n\n\nclass ProductInline(inlines.ProductInline):\n\n model = se_models.Product\n\n formfield_overrides = {\n django_models.ManyToManyField: {\n 'widget': FilteredSelectMultiple(verbose_name='Tags', is_stacked=False)\n },\n }\n\n fieldsets = ((None, {\n 'classes': ('primary-chars', ),\n 'fields': (\n ('name', 'id'),\n ('category', 'correct_category_id'),\n ('price', 'in_stock'),\n 'is_popular',\n ('purchase_price', 'wholesale_small'),\n ('wholesale_medium', 'wholesale_large'),\n 'tags',\n )\n }),)\n\n def formfield_for_dbfield(self, db_field, **kwargs):\n if db_field.name == 'category':\n kwargs['widget'] = ModelSelect2Widget(\n model=se_models.Category,\n search_fields=[\n 'name__icontains',\n 'pk__startswith',\n ],\n )\n return super(ProductInline, self).formfield_for_dbfield(\n db_field,\n **kwargs,\n )\n\n\nclass CategoryPageAdmin(models.CategoryPageAdmin):\n\n add = False\n delete = False\n inlines = [CategoryInline, inlines.ImageInline]\n\n def get_queryset(self, request):\n return (\n super(CategoryPageAdmin, self)\n .get_queryset(request)\n .select_related('shopelectro_category')\n )\n\n\nclass ProductPageAdmin(models.ProductPageAdmin):\n\n add = False\n delete = False\n category_page_model = se_models.CategoryPage\n list_filter = [*models.ProductPageAdmin.list_filter, HasTagsFilter, HasCategoryFilter]\n inlines = [ProductInline, inlines.ImageInline]\n search_fields = [\n 'shopelectro_product__vendor_code', 'name', 'slug',\n ]\n\n def model_id(self, obj):\n return obj.model.vendor_code\n\n model_id.short_description = _('Vendor code')\n model_id.admin_order_field = 'shopelectro_product__vendor_code'\n\n def get_queryset(self, request):\n return (\n super(ProductPageAdmin, self)\n .get_queryset(request)\n .select_related('shopelectro_product')\n )\n\n\nclass ProductFeedbackPageAdmin(admin.ModelAdmin):\n\n add = False\n delete = False\n list_filter = ['rating']\n list_display = ['rating', 'name', 'dignities', 'limitations', 'general', 'links']\n\n def links(self, obj):\n return format_html(\n '''\n <a href=\"{url}\" class=\"field-link\" title=\"\u041f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u043d\u0430 \u0441\u0430\u0439\u0442\u0435\" target=\"_blank\">\n <i class=\"fa fa-link\" aria-hidden=\"true\"></i>\n </a>\n '''.format(url=obj.product.url))\n\n links.short_description = _('Link')\n\n def get_queryset(self, request):\n return (\n super(ProductFeedbackPageAdmin, self)\n .get_queryset(request)\n .select_related('product')\n )\n\n\nclass TagGroupAdmin(admin.ModelAdmin):\n\n list_display = ['id', 'name', 'position', 'count_tags']\n list_display_links = ['name']\n\n inlines = [TagInline]\n\n def get_queryset(self, request):\n return super(TagGroupAdmin, self).get_queryset(request).prefetch_related('tags')\n\n def count_tags(self, obj):\n return obj.tags.count()\n\n\nclass TagAdmin(admin.ModelAdmin):\n\n search_fields = ['id', 'name']\n list_display = ['id', 'name', 'position', 'custom_group']\n list_display_links = ['name']\n\n def get_queryset(self, request):\n return super(TagAdmin, self).get_queryset(request).prefetch_related('group')\n\n def custom_group(self, obj):\n group = obj.group\n\n return format_html(\n '<a href=\"{url}\">{group}</a>',\n group=group,\n url=reverse('admin:shopelectro_taggroup_change', args=(group.id, ))\n )\n\n custom_group.admin_order_field = 'group'\n custom_group.short_description = _('Group')\n\n\nse_admin = SEAdminSite(name='se_admin')\nse_admin.register(CustomPage, models.CustomPageAdmin)\nse_admin.register(FlatPage, models.FlatPageAdmin)\nse_admin.register(PageTemplate, models.CustomPageTemplateAdmin)\n\nse_admin.register(se_models.CategoryPage, CategoryPageAdmin)\nse_admin.register(se_models.ProductPage, ProductPageAdmin)\nse_admin.register(se_models.ProductFeedback, ProductFeedbackPageAdmin)\nse_admin.register(se_models.TagGroup, TagGroupAdmin)\nse_admin.register(se_models.Tag, TagAdmin)\n\nse_admin.register(Redirect)\n", "path": "shopelectro/admin.py"}]} | 2,717 | 116 |
gh_patches_debug_11414 | rasdani/github-patches | git_diff | bridgecrewio__checkov-686 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
No module named 'packaging'
**Describe the bug**
Since latest docker image v1.0.640. We got an issue when running checkov on our CI.
**To Reproduce**
```
$ checkov --quiet -d directory
Traceback (most recent call last):
File "/usr/local/bin/checkov", line 2, in <module>
from checkov.main import run
File "/usr/local/lib/python3.8/site-packages/checkov/main.py", line 23, in <module>
from checkov.terraform.runner import Runner as tf_runner
File "/usr/local/lib/python3.8/site-packages/checkov/terraform/runner.py", line 20, in <module>
from checkov.terraform.parser import Parser
File "/usr/local/lib/python3.8/site-packages/checkov/terraform/parser.py", line 16, in <module>
from checkov.terraform.module_loading.registry import ModuleLoaderRegistry
File "/usr/local/lib/python3.8/site-packages/checkov/terraform/module_loading/__init__.py", line 1, in <module>
from checkov.terraform.module_loading.loaders import *
File "/usr/local/lib/python3.8/site-packages/checkov/terraform/module_loading/loaders/versions_parser.py", line 2, in <module>
from packaging import version
ModuleNotFoundError: No module named 'packaging'
```
**Additional context**
Using Docker Image v1.0.640
</issue>
<code>
[start of setup.py]
1 #!/usr/bin/env python
2 import logging
3 import os
4 from importlib import util
5 from os import path
6
7 import setuptools
8 from setuptools import setup
9
10 # read the contents of your README file
11 this_directory = path.abspath(path.dirname(__file__))
12 with open(path.join(this_directory, "README.md"), encoding="utf-8") as f:
13 long_description = f.read()
14
15 logger = logging.getLogger(__name__)
16 spec = util.spec_from_file_location(
17 "checkov.version", os.path.join("checkov", "version.py")
18 )
19 # noinspection PyUnresolvedReferences
20 mod = util.module_from_spec(spec)
21 spec.loader.exec_module(mod) # type: ignore
22 version = mod.version # type: ignore
23
24 setup(
25 extras_require={
26 "dev": [
27 "alabaster==0.7.12",
28 "attrs==19.3.0",
29 "babel==2.7.0",
30 "certifi==2019.11.28",
31 "chardet==3.0.4",
32 "coverage==4.5.4",
33 "coverage-badge==1.0.1",
34 "docopt==0.6.2",
35 "docutils==0.15.2",
36 "idna==2.8",
37 "imagesize==1.1.0",
38 "importlib-metadata==1.1.0; python_version < '3.8'",
39 "jinja2==2.10.3",
40 "lark-parser==0.7.8",
41 "markupsafe==1.1.1",
42 "more-itertools==8.0.0",
43 "packaging==19.2",
44 "pluggy==0.13.1",
45 "py==1.8.0",
46 "pygments==2.5.2",
47 "pyparsing==2.4.5",
48 "pytest==5.3.1",
49 "bc-python-hcl2>=0.3.10",
50 "pytz==2019.3",
51 "pyyaml==5.3.1",
52 "requests==2.22.0",
53 "six==1.15.0",
54 "snowballstemmer==2.0.0",
55 "sphinx==2.2.1",
56 "sphinxcontrib-applehelp==1.0.1",
57 "sphinxcontrib-devhelp==1.0.1",
58 "sphinxcontrib-htmlhelp==1.0.2",
59 "sphinxcontrib-jsmath==1.0.1",
60 "sphinxcontrib-qthelp==1.0.2",
61 "sphinxcontrib-serializinghtml==1.1.3",
62 "urllib3==1.25.10",
63 "wcwidth==0.1.7",
64 "zipp==0.6.0",
65 "GitPython==3.1.7",
66 "gitdb==4.0.5"
67 ]
68 },
69 install_requires=[
70 "update-checker==0.18.0",
71 "tqdm==4.49.0",
72 "boto3==1.12.43",
73 "chardet==3.0.4",
74 "colorama==0.4.3",
75 "deep_merge==0.0.4",
76 "docopt==0.6.2",
77 "idna==2.8",
78 "jmespath==0.10.0",
79 "junit-xml==1.8",
80 "lark-parser==0.7.8",
81 "bc-python-hcl2>=0.3.11",
82 "pyyaml==5.3.1",
83 "requests==2.22.0",
84 "six==1.15.0",
85 "semantic_version==2.8.5",
86 "tabulate==0.8.6",
87 "termcolor==1.1.0",
88 "urllib3==1.25.10",
89 "dpath==1.5.0",
90 "GitPython==3.1.7",
91 "gitdb==4.0.5"
92 ],
93 license="Apache License 2.0",
94 name="checkov",
95 version=version,
96 description="Infrastructure as code static analysis",
97 author="bridgecrew",
98 author_email="[email protected]",
99 url="https://github.com/bridgecrewio/checkov",
100 packages=setuptools.find_packages(exclude=["tests*","integration_tests*"]),
101 scripts=["bin/checkov","bin/checkov.cmd"],
102 long_description=long_description,
103 long_description_content_type="text/markdown",
104 classifiers=[
105 'Environment :: Console',
106 'Intended Audience :: Developers',
107 'Intended Audience :: System Administrators',
108 'Programming Language :: Python :: 3.7',
109 'Topic :: Security',
110 'Topic :: Software Development :: Build Tools'
111 ]
112 )
113
[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
@@ -63,7 +63,8 @@
"wcwidth==0.1.7",
"zipp==0.6.0",
"GitPython==3.1.7",
- "gitdb==4.0.5"
+ "gitdb==4.0.5",
+ "packaging==20.4"
]
},
install_requires=[
@@ -88,7 +89,8 @@
"urllib3==1.25.10",
"dpath==1.5.0",
"GitPython==3.1.7",
- "gitdb==4.0.5"
+ "gitdb==4.0.5",
+ "packaging==20.4"
],
license="Apache License 2.0",
name="checkov",
| {"golden_diff": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -63,7 +63,8 @@\n \"wcwidth==0.1.7\",\n \"zipp==0.6.0\",\n \"GitPython==3.1.7\",\n- \"gitdb==4.0.5\"\n+ \"gitdb==4.0.5\",\n+ \"packaging==20.4\"\n ]\n },\n install_requires=[\n@@ -88,7 +89,8 @@\n \"urllib3==1.25.10\",\n \"dpath==1.5.0\",\n \"GitPython==3.1.7\",\n- \"gitdb==4.0.5\"\n+ \"gitdb==4.0.5\",\n+ \"packaging==20.4\"\n ],\n license=\"Apache License 2.0\",\n name=\"checkov\",\n", "issue": "No module named 'packaging'\n**Describe the bug**\r\nSince latest docker image v1.0.640. We got an issue when running checkov on our CI.\r\n\r\n**To Reproduce**\r\n```\r\n$ checkov --quiet -d directory\r\nTraceback (most recent call last):\r\n File \"/usr/local/bin/checkov\", line 2, in <module>\r\n from checkov.main import run\r\n File \"/usr/local/lib/python3.8/site-packages/checkov/main.py\", line 23, in <module>\r\n from checkov.terraform.runner import Runner as tf_runner\r\n File \"/usr/local/lib/python3.8/site-packages/checkov/terraform/runner.py\", line 20, in <module>\r\n from checkov.terraform.parser import Parser\r\n File \"/usr/local/lib/python3.8/site-packages/checkov/terraform/parser.py\", line 16, in <module>\r\n from checkov.terraform.module_loading.registry import ModuleLoaderRegistry\r\n File \"/usr/local/lib/python3.8/site-packages/checkov/terraform/module_loading/__init__.py\", line 1, in <module>\r\n from checkov.terraform.module_loading.loaders import *\r\n File \"/usr/local/lib/python3.8/site-packages/checkov/terraform/module_loading/loaders/versions_parser.py\", line 2, in <module>\r\n from packaging import version\r\nModuleNotFoundError: No module named 'packaging'\r\n```\r\n\r\n**Additional context**\r\nUsing Docker Image v1.0.640\r\n\n", "before_files": [{"content": "#!/usr/bin/env python\nimport logging\nimport os\nfrom importlib import util\nfrom os import path\n\nimport setuptools\nfrom setuptools import setup\n\n# read the contents of your README file\nthis_directory = path.abspath(path.dirname(__file__))\nwith open(path.join(this_directory, \"README.md\"), encoding=\"utf-8\") as f:\n long_description = f.read()\n\nlogger = logging.getLogger(__name__)\nspec = util.spec_from_file_location(\n \"checkov.version\", os.path.join(\"checkov\", \"version.py\")\n)\n# noinspection PyUnresolvedReferences\nmod = util.module_from_spec(spec)\nspec.loader.exec_module(mod) # type: ignore\nversion = mod.version # type: ignore\n\nsetup(\n extras_require={\n \"dev\": [\n \"alabaster==0.7.12\",\n \"attrs==19.3.0\",\n \"babel==2.7.0\",\n \"certifi==2019.11.28\",\n \"chardet==3.0.4\",\n \"coverage==4.5.4\",\n \"coverage-badge==1.0.1\",\n \"docopt==0.6.2\",\n \"docutils==0.15.2\",\n \"idna==2.8\",\n \"imagesize==1.1.0\",\n \"importlib-metadata==1.1.0; python_version < '3.8'\",\n \"jinja2==2.10.3\",\n \"lark-parser==0.7.8\",\n \"markupsafe==1.1.1\",\n \"more-itertools==8.0.0\",\n \"packaging==19.2\",\n \"pluggy==0.13.1\",\n \"py==1.8.0\",\n \"pygments==2.5.2\",\n \"pyparsing==2.4.5\",\n \"pytest==5.3.1\",\n \"bc-python-hcl2>=0.3.10\",\n \"pytz==2019.3\",\n \"pyyaml==5.3.1\",\n \"requests==2.22.0\",\n \"six==1.15.0\",\n \"snowballstemmer==2.0.0\",\n \"sphinx==2.2.1\",\n \"sphinxcontrib-applehelp==1.0.1\",\n \"sphinxcontrib-devhelp==1.0.1\",\n \"sphinxcontrib-htmlhelp==1.0.2\",\n \"sphinxcontrib-jsmath==1.0.1\",\n \"sphinxcontrib-qthelp==1.0.2\",\n \"sphinxcontrib-serializinghtml==1.1.3\",\n \"urllib3==1.25.10\",\n \"wcwidth==0.1.7\",\n \"zipp==0.6.0\",\n \"GitPython==3.1.7\",\n \"gitdb==4.0.5\"\n ]\n },\n install_requires=[\n \"update-checker==0.18.0\",\n \"tqdm==4.49.0\",\n \"boto3==1.12.43\",\n \"chardet==3.0.4\",\n \"colorama==0.4.3\",\n \"deep_merge==0.0.4\",\n \"docopt==0.6.2\",\n \"idna==2.8\",\n \"jmespath==0.10.0\",\n \"junit-xml==1.8\",\n \"lark-parser==0.7.8\",\n \"bc-python-hcl2>=0.3.11\",\n \"pyyaml==5.3.1\",\n \"requests==2.22.0\",\n \"six==1.15.0\",\n \"semantic_version==2.8.5\",\n \"tabulate==0.8.6\",\n \"termcolor==1.1.0\",\n \"urllib3==1.25.10\",\n \"dpath==1.5.0\",\n \"GitPython==3.1.7\",\n \"gitdb==4.0.5\"\n ],\n license=\"Apache License 2.0\",\n name=\"checkov\",\n version=version,\n description=\"Infrastructure as code static analysis\",\n author=\"bridgecrew\",\n author_email=\"[email protected]\",\n url=\"https://github.com/bridgecrewio/checkov\",\n packages=setuptools.find_packages(exclude=[\"tests*\",\"integration_tests*\"]),\n scripts=[\"bin/checkov\",\"bin/checkov.cmd\"],\n long_description=long_description,\n long_description_content_type=\"text/markdown\",\n classifiers=[\n 'Environment :: Console',\n 'Intended Audience :: Developers',\n 'Intended Audience :: System Administrators',\n 'Programming Language :: Python :: 3.7',\n 'Topic :: Security',\n 'Topic :: Software Development :: Build Tools'\n ]\n)\n", "path": "setup.py"}]} | 2,162 | 209 |
gh_patches_debug_36584 | rasdani/github-patches | git_diff | bokeh__bokeh-6570 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
remove requests as runtime dependency?
This only seems to be used for one sampledata download, in which case we should find a different way to grab the data with stdlib functions and remove the dependency.
ping @mattpap
</issue>
<code>
[start of bokeh/sampledata/daylight.py]
1 """ Daylight hours from http://www.sunrisesunset.com
2
3 """
4 from __future__ import absolute_import
5
6 from bokeh.util.dependencies import import_required
7 pd = import_required('pandas',
8 'daylight sample data requires Pandas (http://pandas.pydata.org) to be installed')
9
10 import re
11 import datetime
12 import requests
13
14 from six.moves import xrange
15 from os.path import join, abspath, dirname
16
17 url = "http://sunrisesunset.com/calendar.asp"
18
19 r0 = re.compile("<[^>]+>| |[\r\n\t]")
20 r1 = re.compile(r"(\d+)(DST Begins|DST Ends)?Sunrise: (\d+):(\d\d)Sunset: (\d+):(\d\d)")
21
22 def fetch_daylight_hours(lat, lon, tz, dst, year):
23 """Fetch daylight hours from sunrisesunset.com for a given location.
24
25 Parameters
26 ----------
27 lat : float
28 Location's latitude.
29 lon : float
30 Location's longitude.
31 tz : int or float
32 Time zone offset from UTC. Use floats for half-hour time zones.
33 dst : int
34 Daylight saving type, e.g. 0 -> none, 1 -> North America, 2 -> Europe.
35 See sunrisesunset.com/custom.asp for other possible values.
36 year : int
37 Year (1901..2099).
38 """
39 daylight = []
40 summer = 0 if lat >= 0 else 1
41
42 for month in xrange(1, 12+1):
43 args = dict(url=url, lat=lat, lon=lon, tz=tz, dst=dst, year=year, month=month)
44 response = requests.get("%(url)s?comb_city_info=_;%(lon)s;%(lat)s;%(tz)s;%(dst)s&month=%(month)s&year=%(year)s&time_type=1&wadj=1" % args)
45 entries = r1.findall(r0.sub("", response.text))
46
47 for day, note, sunrise_hour, sunrise_minute, sunset_hour, sunset_minute in entries:
48 if note == "DST Begins":
49 summer = 1
50 elif note == "DST Ends":
51 summer = 0
52
53 date = datetime.date(year, month, int(day))
54 sunrise = datetime.time(int(sunrise_hour), int(sunrise_minute))
55 sunset = datetime.time(int(sunset_hour), int(sunset_minute))
56
57 daylight.append([date, sunrise, sunset, summer])
58
59 return pd.DataFrame(daylight, columns=["Date", "Sunrise", "Sunset", "Summer"])
60
61 # daylight_warsaw_2013 = fetch_daylight_hours(52.2297, -21.0122, 1, 2, 2013)
62 # daylight_warsaw_2013.to_csv("bokeh/sampledata/daylight_warsaw_2013.csv", index=False)
63
64 def load_daylight_hours(file):
65 path = join(dirname(abspath(__file__)), file)
66 df = pd.read_csv(path, parse_dates=["Date", "Sunrise", "Sunset"])
67
68 df["Date"] = df.Date.map(lambda x: x.date())
69 df["Sunrise"] = df.Sunrise.map(lambda x: x.time())
70 df["Sunset"] = df.Sunset.map(lambda x: x.time())
71
72 return df
73
74 daylight_warsaw_2013 = load_daylight_hours("daylight_warsaw_2013.csv")
75
[end of bokeh/sampledata/daylight.py]
[start of setup.py]
1 #-----------------------------------------------------------------------------
2 # Copyright (c) 2012 - 2017, Continuum Analytics, Inc. All rights reserved.
3 #
4 # Powered by the Bokeh Development Team.
5 #
6 # The full license is in the file LICENSE.txt, distributed with this software.
7 #-----------------------------------------------------------------------------
8 ''' Setup script for Bokeh.
9
10 Two separate components comprise Bokeh:
11
12 * A JavaScript runtime BokehJS that draws and handles events in browsers
13 * Python "bindings" and an optional server for interacting with BokehJS
14
15 The BokehJS library is written in a mixture of CoffeeScript, TypeScript, and
16 pure JavaScript. This necessitates a "compilation" step to build a complete
17 BokehJS from these sources, and this fact makes the Bokeh setup and install
18 more complicated than typical pure Python projects.
19
20 In order to build BokehJS, the first step is to make sure that the "npm"
21 command is installed. If you are using conda, you can typically just run
22
23 conda install -c bokeh nodejs
24
25 Othewise, you can find general instructions for installing NodeJS here:
26
27 https://nodejs.org/en/download/
28
29 Once you have "npm" installed, this script can be used to build BokehJS
30 from the ``bokehjs`` source subdirectory, and install Bokeh into the python
31 source package by issuing the command:
32
33 python setup.py install --build-js
34
35 The script also supports the standard "develop" mode that setuptools offers:
36
37 python setup.py develop --build-js
38
39 It can take a few minutes for BokehJS to build, if you are not making changes
40 to the BokehJS source code, then you only need to build it once, the first
41 time. Subsequence invocations can be made to install the previously built
42 BokehJS from the ``bokehjs`` source subdirectoruy with the ``--install-js``
43 option, e.g:
44
45 python setup.py develop --install-js
46
47 It is also possible to build BokehJS "by hand" under the ``bokehjs`` source
48 subdirectory. In this case, to simply install the build BokehJS quickly into
49 the python source tree, the following command may be issued:
50
51 python setup.py --install-js
52
53 This will copy BokehJS from the ``bokehjs`` source directory, into the python
54 package directory, and perform no other actions.
55
56 Note that source distributions (sdists) are published with a pre-built BokehJS
57 included inside the python package, and do not include the ``bokehjs`` source.
58 The ``--build-js`` and ``-install-js`` options are not valid when running from
59 an sdist. They will be ignored, and warning printed.
60
61 '''
62 from os.path import join
63 from shutil import copy
64 import sys
65
66 from setuptools import find_packages, setup
67
68 from _setup_support import (
69 build_or_install_bokehjs, conda_rendering, fixup_building_sdist,
70 fixup_for_packaged, get_cmdclass, get_package_data, get_version,
71 install_js, package_files, package_path, ROOT, SERVER, show_bokehjs,
72 show_help
73 )
74
75 # immediately bail for ancient pythons
76 if sys.version_info[:2] < (2, 7):
77 raise RuntimeError("Bokeh requires python >= 2.7")
78
79 # immediately handle lightweight "python setup.py --install-js"
80 if len(sys.argv) == 2 and sys.argv[-1] == '--install-js':
81 install_js()
82 sys.exit()
83
84 # we want to have the license at the top level of the GitHub repo, but setup
85 # can't include it from there, so copy it to the package directory first thing
86 copy("LICENSE.txt", "bokeh/")
87
88 # state our runtime deps here, also used by meta.yaml (so KEEP the spaces)
89 REQUIRES = [
90 'six >=1.5.2',
91 'requests >=1.2.3',
92 'PyYAML >=3.10',
93 'python-dateutil >=2.1',
94 'Jinja2 >=2.7',
95 'numpy >=1.7.1',
96 'tornado >=4.3',
97
98 # this will be removed when Bokeh hits 1.0
99 'bkcharts >=0.2',
100 ]
101
102 # handle the compat difference for futures (meta.yaml handles differently)
103 if sys.version_info[:2] == (2, 7):
104 REQUIRES.append('futures >=3.0.3')
105
106 # if this is just conda-build skimming information, skip all this actual work
107 if not conda_rendering():
108 fixup_for_packaged() # --build_js and --install_js not valid FROM sdist
109 fixup_building_sdist() # must build BokehJS when MAKING sdists
110
111 bokehjs_action = build_or_install_bokehjs()
112
113 # configuration to include all the special or non-python files in the package
114 # directory that need to also be installed or included in a build
115 sampledata_pats = ('.csv', '.conf', '.gz', '.json', '.png', '.ics', '.geojson')
116 package_path(join(SERVER, 'static'))
117 package_path(join(ROOT, 'bokeh', 'core', '_templates'))
118 package_path(join(ROOT, 'bokeh', 'sphinxext', '_templates'))
119 package_path(join(ROOT, 'bokeh', 'server', 'views'), ('.html'))
120 package_path(join(ROOT, 'bokeh', 'sampledata'), sampledata_pats)
121 package_files('LICENSE.txt', 'themes/*.yaml')
122
123 setup(
124
125 # basic package metadata
126 name='bokeh',
127 version=get_version(),
128 description='Interactive plots and applications in the browser from Python',
129 license='New BSD',
130 author='Continuum Analytics',
131 author_email='[email protected]',
132 url='http://github.com/bokeh/bokeh',
133 classifiers=open("classifiers.txt").read().strip().split('\n'),
134
135 # details needed by setup
136 install_requires=REQUIRES,
137 packages=find_packages(exclude=["scripts*", "tests*"]),
138 package_data=get_package_data(),
139 entry_points={'console_scripts': ['bokeh = bokeh.__main__:main',], },
140 zip_safe=False,
141 cmdclass=get_cmdclass()
142
143 )
144
145 # if this is just conda-build skimming information, skip all this actual work
146 if not conda_rendering():
147 if '--help' in sys.argv: show_help(bokehjs_action)
148 if 'develop' in sys.argv: show_bokehjs(bokehjs_action, develop=True)
149 if 'install' in sys.argv: show_bokehjs(bokehjs_action)
150
[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/bokeh/sampledata/daylight.py b/bokeh/sampledata/daylight.py
--- a/bokeh/sampledata/daylight.py
+++ b/bokeh/sampledata/daylight.py
@@ -7,60 +7,8 @@
pd = import_required('pandas',
'daylight sample data requires Pandas (http://pandas.pydata.org) to be installed')
-import re
-import datetime
-import requests
-
-from six.moves import xrange
from os.path import join, abspath, dirname
-url = "http://sunrisesunset.com/calendar.asp"
-
-r0 = re.compile("<[^>]+>| |[\r\n\t]")
-r1 = re.compile(r"(\d+)(DST Begins|DST Ends)?Sunrise: (\d+):(\d\d)Sunset: (\d+):(\d\d)")
-
-def fetch_daylight_hours(lat, lon, tz, dst, year):
- """Fetch daylight hours from sunrisesunset.com for a given location.
-
- Parameters
- ----------
- lat : float
- Location's latitude.
- lon : float
- Location's longitude.
- tz : int or float
- Time zone offset from UTC. Use floats for half-hour time zones.
- dst : int
- Daylight saving type, e.g. 0 -> none, 1 -> North America, 2 -> Europe.
- See sunrisesunset.com/custom.asp for other possible values.
- year : int
- Year (1901..2099).
- """
- daylight = []
- summer = 0 if lat >= 0 else 1
-
- for month in xrange(1, 12+1):
- args = dict(url=url, lat=lat, lon=lon, tz=tz, dst=dst, year=year, month=month)
- response = requests.get("%(url)s?comb_city_info=_;%(lon)s;%(lat)s;%(tz)s;%(dst)s&month=%(month)s&year=%(year)s&time_type=1&wadj=1" % args)
- entries = r1.findall(r0.sub("", response.text))
-
- for day, note, sunrise_hour, sunrise_minute, sunset_hour, sunset_minute in entries:
- if note == "DST Begins":
- summer = 1
- elif note == "DST Ends":
- summer = 0
-
- date = datetime.date(year, month, int(day))
- sunrise = datetime.time(int(sunrise_hour), int(sunrise_minute))
- sunset = datetime.time(int(sunset_hour), int(sunset_minute))
-
- daylight.append([date, sunrise, sunset, summer])
-
- return pd.DataFrame(daylight, columns=["Date", "Sunrise", "Sunset", "Summer"])
-
-# daylight_warsaw_2013 = fetch_daylight_hours(52.2297, -21.0122, 1, 2, 2013)
-# daylight_warsaw_2013.to_csv("bokeh/sampledata/daylight_warsaw_2013.csv", index=False)
-
def load_daylight_hours(file):
path = join(dirname(abspath(__file__)), file)
df = pd.read_csv(path, parse_dates=["Date", "Sunrise", "Sunset"])
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,6 @@
# state our runtime deps here, also used by meta.yaml (so KEEP the spaces)
REQUIRES = [
'six >=1.5.2',
- 'requests >=1.2.3',
'PyYAML >=3.10',
'python-dateutil >=2.1',
'Jinja2 >=2.7',
| {"golden_diff": "diff --git a/bokeh/sampledata/daylight.py b/bokeh/sampledata/daylight.py\n--- a/bokeh/sampledata/daylight.py\n+++ b/bokeh/sampledata/daylight.py\n@@ -7,60 +7,8 @@\n pd = import_required('pandas',\n 'daylight sample data requires Pandas (http://pandas.pydata.org) to be installed')\n \n-import re\n-import datetime\n-import requests\n-\n-from six.moves import xrange\n from os.path import join, abspath, dirname\n \n-url = \"http://sunrisesunset.com/calendar.asp\"\n-\n-r0 = re.compile(\"<[^>]+>| |[\\r\\n\\t]\")\n-r1 = re.compile(r\"(\\d+)(DST Begins|DST Ends)?Sunrise: (\\d+):(\\d\\d)Sunset: (\\d+):(\\d\\d)\")\n-\n-def fetch_daylight_hours(lat, lon, tz, dst, year):\n- \"\"\"Fetch daylight hours from sunrisesunset.com for a given location.\n-\n- Parameters\n- ----------\n- lat : float\n- Location's latitude.\n- lon : float\n- Location's longitude.\n- tz : int or float\n- Time zone offset from UTC. Use floats for half-hour time zones.\n- dst : int\n- Daylight saving type, e.g. 0 -> none, 1 -> North America, 2 -> Europe.\n- See sunrisesunset.com/custom.asp for other possible values.\n- year : int\n- Year (1901..2099).\n- \"\"\"\n- daylight = []\n- summer = 0 if lat >= 0 else 1\n-\n- for month in xrange(1, 12+1):\n- args = dict(url=url, lat=lat, lon=lon, tz=tz, dst=dst, year=year, month=month)\n- response = requests.get(\"%(url)s?comb_city_info=_;%(lon)s;%(lat)s;%(tz)s;%(dst)s&month=%(month)s&year=%(year)s&time_type=1&wadj=1\" % args)\n- entries = r1.findall(r0.sub(\"\", response.text))\n-\n- for day, note, sunrise_hour, sunrise_minute, sunset_hour, sunset_minute in entries:\n- if note == \"DST Begins\":\n- summer = 1\n- elif note == \"DST Ends\":\n- summer = 0\n-\n- date = datetime.date(year, month, int(day))\n- sunrise = datetime.time(int(sunrise_hour), int(sunrise_minute))\n- sunset = datetime.time(int(sunset_hour), int(sunset_minute))\n-\n- daylight.append([date, sunrise, sunset, summer])\n-\n- return pd.DataFrame(daylight, columns=[\"Date\", \"Sunrise\", \"Sunset\", \"Summer\"])\n-\n-# daylight_warsaw_2013 = fetch_daylight_hours(52.2297, -21.0122, 1, 2, 2013)\n-# daylight_warsaw_2013.to_csv(\"bokeh/sampledata/daylight_warsaw_2013.csv\", index=False)\n-\n def load_daylight_hours(file):\n path = join(dirname(abspath(__file__)), file)\n df = pd.read_csv(path, parse_dates=[\"Date\", \"Sunrise\", \"Sunset\"])\ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -88,7 +88,6 @@\n # state our runtime deps here, also used by meta.yaml (so KEEP the spaces)\n REQUIRES = [\n 'six >=1.5.2',\n- 'requests >=1.2.3',\n 'PyYAML >=3.10',\n 'python-dateutil >=2.1',\n 'Jinja2 >=2.7',\n", "issue": "remove requests as runtime dependency?\nThis only seems to be used for one sampledata download, in which case we should find a different way to grab the data with stdlib functions and remove the dependency.\r\n\r\nping @mattpap \n", "before_files": [{"content": "\"\"\" Daylight hours from http://www.sunrisesunset.com\n\n\"\"\"\nfrom __future__ import absolute_import\n\nfrom bokeh.util.dependencies import import_required\npd = import_required('pandas',\n 'daylight sample data requires Pandas (http://pandas.pydata.org) to be installed')\n\nimport re\nimport datetime\nimport requests\n\nfrom six.moves import xrange\nfrom os.path import join, abspath, dirname\n\nurl = \"http://sunrisesunset.com/calendar.asp\"\n\nr0 = re.compile(\"<[^>]+>| |[\\r\\n\\t]\")\nr1 = re.compile(r\"(\\d+)(DST Begins|DST Ends)?Sunrise: (\\d+):(\\d\\d)Sunset: (\\d+):(\\d\\d)\")\n\ndef fetch_daylight_hours(lat, lon, tz, dst, year):\n \"\"\"Fetch daylight hours from sunrisesunset.com for a given location.\n\n Parameters\n ----------\n lat : float\n Location's latitude.\n lon : float\n Location's longitude.\n tz : int or float\n Time zone offset from UTC. Use floats for half-hour time zones.\n dst : int\n Daylight saving type, e.g. 0 -> none, 1 -> North America, 2 -> Europe.\n See sunrisesunset.com/custom.asp for other possible values.\n year : int\n Year (1901..2099).\n \"\"\"\n daylight = []\n summer = 0 if lat >= 0 else 1\n\n for month in xrange(1, 12+1):\n args = dict(url=url, lat=lat, lon=lon, tz=tz, dst=dst, year=year, month=month)\n response = requests.get(\"%(url)s?comb_city_info=_;%(lon)s;%(lat)s;%(tz)s;%(dst)s&month=%(month)s&year=%(year)s&time_type=1&wadj=1\" % args)\n entries = r1.findall(r0.sub(\"\", response.text))\n\n for day, note, sunrise_hour, sunrise_minute, sunset_hour, sunset_minute in entries:\n if note == \"DST Begins\":\n summer = 1\n elif note == \"DST Ends\":\n summer = 0\n\n date = datetime.date(year, month, int(day))\n sunrise = datetime.time(int(sunrise_hour), int(sunrise_minute))\n sunset = datetime.time(int(sunset_hour), int(sunset_minute))\n\n daylight.append([date, sunrise, sunset, summer])\n\n return pd.DataFrame(daylight, columns=[\"Date\", \"Sunrise\", \"Sunset\", \"Summer\"])\n\n# daylight_warsaw_2013 = fetch_daylight_hours(52.2297, -21.0122, 1, 2, 2013)\n# daylight_warsaw_2013.to_csv(\"bokeh/sampledata/daylight_warsaw_2013.csv\", index=False)\n\ndef load_daylight_hours(file):\n path = join(dirname(abspath(__file__)), file)\n df = pd.read_csv(path, parse_dates=[\"Date\", \"Sunrise\", \"Sunset\"])\n\n df[\"Date\"] = df.Date.map(lambda x: x.date())\n df[\"Sunrise\"] = df.Sunrise.map(lambda x: x.time())\n df[\"Sunset\"] = df.Sunset.map(lambda x: x.time())\n\n return df\n\ndaylight_warsaw_2013 = load_daylight_hours(\"daylight_warsaw_2013.csv\")\n", "path": "bokeh/sampledata/daylight.py"}, {"content": "#-----------------------------------------------------------------------------\n# Copyright (c) 2012 - 2017, Continuum Analytics, Inc. All rights reserved.\n#\n# Powered by the Bokeh Development Team.\n#\n# The full license is in the file LICENSE.txt, distributed with this software.\n#-----------------------------------------------------------------------------\n''' Setup script for Bokeh.\n\nTwo separate components comprise Bokeh:\n\n* A JavaScript runtime BokehJS that draws and handles events in browsers\n* Python \"bindings\" and an optional server for interacting with BokehJS\n\nThe BokehJS library is written in a mixture of CoffeeScript, TypeScript, and\npure JavaScript. This necessitates a \"compilation\" step to build a complete\nBokehJS from these sources, and this fact makes the Bokeh setup and install\nmore complicated than typical pure Python projects.\n\nIn order to build BokehJS, the first step is to make sure that the \"npm\"\ncommand is installed. If you are using conda, you can typically just run\n\n conda install -c bokeh nodejs\n\nOthewise, you can find general instructions for installing NodeJS here:\n\n https://nodejs.org/en/download/\n\nOnce you have \"npm\" installed, this script can be used to build BokehJS\nfrom the ``bokehjs`` source subdirectory, and install Bokeh into the python\nsource package by issuing the command:\n\n python setup.py install --build-js\n\nThe script also supports the standard \"develop\" mode that setuptools offers:\n\n python setup.py develop --build-js\n\nIt can take a few minutes for BokehJS to build, if you are not making changes\nto the BokehJS source code, then you only need to build it once, the first\ntime. Subsequence invocations can be made to install the previously built\nBokehJS from the ``bokehjs`` source subdirectoruy with the ``--install-js``\noption, e.g:\n\n python setup.py develop --install-js\n\nIt is also possible to build BokehJS \"by hand\" under the ``bokehjs`` source\nsubdirectory. In this case, to simply install the build BokehJS quickly into\nthe python source tree, the following command may be issued:\n\n python setup.py --install-js\n\nThis will copy BokehJS from the ``bokehjs`` source directory, into the python\npackage directory, and perform no other actions.\n\nNote that source distributions (sdists) are published with a pre-built BokehJS\nincluded inside the python package, and do not include the ``bokehjs`` source.\nThe ``--build-js`` and ``-install-js`` options are not valid when running from\nan sdist. They will be ignored, and warning printed.\n\n'''\nfrom os.path import join\nfrom shutil import copy\nimport sys\n\nfrom setuptools import find_packages, setup\n\nfrom _setup_support import (\n build_or_install_bokehjs, conda_rendering, fixup_building_sdist,\n fixup_for_packaged, get_cmdclass, get_package_data, get_version,\n install_js, package_files, package_path, ROOT, SERVER, show_bokehjs,\n show_help\n)\n\n# immediately bail for ancient pythons\nif sys.version_info[:2] < (2, 7):\n raise RuntimeError(\"Bokeh requires python >= 2.7\")\n\n# immediately handle lightweight \"python setup.py --install-js\"\nif len(sys.argv) == 2 and sys.argv[-1] == '--install-js':\n install_js()\n sys.exit()\n\n# we want to have the license at the top level of the GitHub repo, but setup\n# can't include it from there, so copy it to the package directory first thing\ncopy(\"LICENSE.txt\", \"bokeh/\")\n\n# state our runtime deps here, also used by meta.yaml (so KEEP the spaces)\nREQUIRES = [\n 'six >=1.5.2',\n 'requests >=1.2.3',\n 'PyYAML >=3.10',\n 'python-dateutil >=2.1',\n 'Jinja2 >=2.7',\n 'numpy >=1.7.1',\n 'tornado >=4.3',\n\n # this will be removed when Bokeh hits 1.0\n 'bkcharts >=0.2',\n]\n\n# handle the compat difference for futures (meta.yaml handles differently)\nif sys.version_info[:2] == (2, 7):\n REQUIRES.append('futures >=3.0.3')\n\n# if this is just conda-build skimming information, skip all this actual work\nif not conda_rendering():\n fixup_for_packaged() # --build_js and --install_js not valid FROM sdist\n fixup_building_sdist() # must build BokehJS when MAKING sdists\n\n bokehjs_action = build_or_install_bokehjs()\n\n# configuration to include all the special or non-python files in the package\n# directory that need to also be installed or included in a build\nsampledata_pats = ('.csv', '.conf', '.gz', '.json', '.png', '.ics', '.geojson')\npackage_path(join(SERVER, 'static'))\npackage_path(join(ROOT, 'bokeh', 'core', '_templates'))\npackage_path(join(ROOT, 'bokeh', 'sphinxext', '_templates'))\npackage_path(join(ROOT, 'bokeh', 'server', 'views'), ('.html'))\npackage_path(join(ROOT, 'bokeh', 'sampledata'), sampledata_pats)\npackage_files('LICENSE.txt', 'themes/*.yaml')\n\nsetup(\n\n # basic package metadata\n name='bokeh',\n version=get_version(),\n description='Interactive plots and applications in the browser from Python',\n license='New BSD',\n author='Continuum Analytics',\n author_email='[email protected]',\n url='http://github.com/bokeh/bokeh',\n classifiers=open(\"classifiers.txt\").read().strip().split('\\n'),\n\n # details needed by setup\n install_requires=REQUIRES,\n packages=find_packages(exclude=[\"scripts*\", \"tests*\"]),\n package_data=get_package_data(),\n entry_points={'console_scripts': ['bokeh = bokeh.__main__:main',], },\n zip_safe=False,\n cmdclass=get_cmdclass()\n\n)\n\n# if this is just conda-build skimming information, skip all this actual work\nif not conda_rendering():\n if '--help' in sys.argv: show_help(bokehjs_action)\n if 'develop' in sys.argv: show_bokehjs(bokehjs_action, develop=True)\n if 'install' in sys.argv: show_bokehjs(bokehjs_action)\n", "path": "setup.py"}]} | 3,290 | 858 |
gh_patches_debug_7806 | rasdani/github-patches | git_diff | qtile__qtile-3961 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
App crashes when sending a dbus notification
### The issue:
See https://github.com/ciderapp/Cider/issues/1475 for more details.
After playing a few songs with Cider App, the app will crash when changing songs with the following error message in the logs. I am not sure which side is responsible for the bug.
```
[395803:0929/171008.500207:ERROR:libnotify_notification.cc(49)] notify_notification_close: domain=1236 code=36 message="GDBus.Error:com.dubstepdish.dbus.next.ServiceError: The service interface raised an error: list index out of range.
[' File "/usr/lib/python3.10/site-packages/dbus_next/message_bus.py", line 712, in _process_message\n handler(msg, send_reply)\n', ' File "/usr/lib/python3.10/site-packages/dbus_next/message_bus.py", line 731, in handler\n result = method.fn(interface, *args)\n', ' File "/usr/lib/python3.10/site-packages/libqtile/notify.py", line 88, in CloseNotification\n self.manager.close(nid)\n', ' File "/usr/lib/python3.10/site-packages/libqtile/notify.py", line 203, in close\n notif = self.notifications[nid]\n']"
Trace/breakpoint trap (core dumped)
```
### Required:
- [X] I have searched past issues to see if this bug has already been reported.
</issue>
<code>
[start of libqtile/notify.py]
1 # Copyright (c) 2010 dequis
2 # Copyright (c) 2011 Florian Mounier
3 # Copyright (c) 2011 Mounier Florian
4 # Copyright (c) 2013 Mickael FALCK
5 # Copyright (c) 2013 Tao Sauvage
6 # Copyright (c) 2020 elParaguayo
7 #
8 # Permission is hereby granted, free of charge, to any person obtaining a copy
9 # of this software and associated documentation files (the "Software"), to deal
10 # in the Software without restriction, including without limitation the rights
11 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12 # copies of the Software, and to permit persons to whom the Software is
13 # furnished to do so, subject to the following conditions:
14 #
15 # The above copyright notice and this permission notice shall be included in
16 # all copies or substantial portions of the Software.
17 #
18 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
24 # SOFTWARE.
25 import asyncio
26 from typing import Any
27
28 try:
29 from dbus_next import ReleaseNameReply
30 from dbus_next.aio import MessageBus
31 from dbus_next.service import ServiceInterface, method, signal
32
33 has_dbus = True
34 except ImportError:
35 has_dbus = False
36
37 from libqtile.log_utils import logger
38
39 BUS_NAME = "org.freedesktop.Notifications"
40 SERVICE_PATH = "/org/freedesktop/Notifications"
41
42 notifier: Any = None
43
44
45 class ClosedReason:
46 expired = 1
47 dismissed = 2
48 method = 3 # CloseNotification method
49
50
51 if has_dbus:
52
53 class NotificationService(ServiceInterface):
54 def __init__(self, manager):
55 super().__init__(BUS_NAME)
56 self.manager = manager
57 self._capabilities = {"body"}
58
59 @method()
60 def GetCapabilities(self) -> "as": # type:ignore # noqa: N802, F722
61 return list(self._capabilities)
62
63 def register_capabilities(self, capabilities):
64 if isinstance(capabilities, str):
65 self._capabilities.add(capabilities)
66 elif isinstance(capabilities, (tuple, list, set)):
67 self._capabilities.update(set(capabilities))
68
69 @method()
70 def Notify( # noqa: N802, F722
71 self,
72 app_name: "s", # type:ignore # noqa: F821
73 replaces_id: "u", # type:ignore # noqa: F821
74 app_icon: "s", # type:ignore # noqa: F821
75 summary: "s", # type:ignore # noqa: F821
76 body: "s", # type:ignore # noqa: F821
77 actions: "as", # type:ignore # noqa: F821
78 hints: "a{sv}", # type:ignore # noqa: F821
79 timeout: "i", # type:ignore # noqa: F821
80 ) -> "u": # type:ignore # noqa: F821
81 notif = Notification(
82 summary, body, timeout, hints, app_name, replaces_id, app_icon, actions
83 )
84 return self.manager.add(notif)
85
86 @method()
87 def CloseNotification(self, nid: "u"): # type:ignore # noqa: N802, F821
88 self.manager.close(nid)
89
90 @signal()
91 def NotificationClosed( # noqa: N802
92 self, nid: "u", reason: "u" # type: ignore # noqa: F821
93 ) -> "uu": # type: ignore # noqa: F821
94 return [nid, reason]
95
96 @signal()
97 def ActionInvoked( # noqa: N802
98 self, nid: "u", action_key: "s" # type: ignore # noqa: F821
99 ) -> "us": # type:ignore # noqa: N802, F821
100 return [nid, action_key]
101
102 @method()
103 def GetServerInformation(self) -> "ssss": # type: ignore # noqa: N802, F821
104 return ["qtile-notify-daemon", "qtile", "1.0", "1"]
105
106 class Notification:
107 def __init__(
108 self,
109 summary,
110 body="",
111 timeout=-1,
112 hints=None,
113 app_name="",
114 replaces_id=None,
115 app_icon=None,
116 actions=None,
117 ):
118 self.summary = summary
119 self.body = body
120 self.timeout = timeout
121 self.hints = hints or {}
122 self.app_name = app_name
123 self.replaces_id = replaces_id
124 self.app_icon = app_icon
125 self.actions = actions
126
127 class NotificationManager:
128 def __init__(self):
129 self.notifications = []
130 self.callbacks = []
131 self.close_callbacks = []
132 self._service = None
133
134 async def service(self):
135 if self._service is None:
136 try:
137 self.bus = await MessageBus().connect()
138 self._service = NotificationService(self)
139 self.bus.export(SERVICE_PATH, self._service)
140 await self.bus.request_name(BUS_NAME)
141 except Exception:
142 logger.exception("Dbus connection failed")
143 self._service = None
144 return self._service
145
146 async def register(self, callback, capabilities=None, on_close=None):
147 service = await self.service()
148 if not service:
149 logger.warning(
150 "Registering %s without any dbus connection existing",
151 callback.__name__,
152 )
153 self.callbacks.append(callback)
154 if capabilities:
155 self._service.register_capabilities(capabilities)
156 if on_close:
157 self.close_callbacks.append(on_close)
158
159 def unregister(self, callback, on_close=None):
160 try:
161 self.callbacks.remove(callback)
162 except ValueError:
163 logger.error("Unable to remove notify callback. Unknown callback.")
164
165 if on_close:
166 try:
167 self.close_callbacks.remove(on_close)
168 except ValueError:
169 logger.error("Unable to remove notify on_close callback. Unknown callback.")
170
171 if not self.callbacks:
172 return asyncio.create_task(self._release())
173
174 async def _release(self):
175 """
176 If the manager has no more callbacks then we need to release the service name
177 from dbus and reset _service to None (to force subsequent calls to `register` to
178 re-register the name on dbus.)
179 """
180 reply = await self.bus.release_name(BUS_NAME)
181
182 if reply != ReleaseNameReply.RELEASED:
183 logger.error("Could not release %s", BUS_NAME)
184 return
185
186 self._service = None
187
188 def add(self, notif):
189 self.notifications.append(notif)
190 notif.id = len(self.notifications)
191 for callback in self.callbacks:
192 try:
193 callback(notif)
194 except Exception:
195 logger.exception("Exception in notifier callback")
196 return len(self.notifications)
197
198 def show(self, *args, **kwargs):
199 notif = Notification(*args, **kwargs)
200 return (notif, self.add(notif))
201
202 def close(self, nid):
203 notif = self.notifications[nid]
204
205 for callback in self.close_callbacks:
206 try:
207 callback(notif)
208 except Exception:
209 logger.exception("Exception in notifier close callback")
210
211 notifier = NotificationManager()
212
[end of libqtile/notify.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/libqtile/notify.py b/libqtile/notify.py
--- a/libqtile/notify.py
+++ b/libqtile/notify.py
@@ -200,11 +200,9 @@
return (notif, self.add(notif))
def close(self, nid):
- notif = self.notifications[nid]
-
for callback in self.close_callbacks:
try:
- callback(notif)
+ callback(nid)
except Exception:
logger.exception("Exception in notifier close callback")
| {"golden_diff": "diff --git a/libqtile/notify.py b/libqtile/notify.py\n--- a/libqtile/notify.py\n+++ b/libqtile/notify.py\n@@ -200,11 +200,9 @@\n return (notif, self.add(notif))\n \n def close(self, nid):\n- notif = self.notifications[nid]\n-\n for callback in self.close_callbacks:\n try:\n- callback(notif)\n+ callback(nid)\n except Exception:\n logger.exception(\"Exception in notifier close callback\")\n", "issue": "App crashes when sending a dbus notification\n### The issue:\n\nSee https://github.com/ciderapp/Cider/issues/1475 for more details. \r\n\r\nAfter playing a few songs with Cider App, the app will crash when changing songs with the following error message in the logs. I am not sure which side is responsible for the bug. \r\n\r\n```\r\n[395803:0929/171008.500207:ERROR:libnotify_notification.cc(49)] notify_notification_close: domain=1236 code=36 message=\"GDBus.Error:com.dubstepdish.dbus.next.ServiceError: The service interface raised an error: list index out of range.\r\n[' File \"/usr/lib/python3.10/site-packages/dbus_next/message_bus.py\", line 712, in _process_message\\n handler(msg, send_reply)\\n', ' File \"/usr/lib/python3.10/site-packages/dbus_next/message_bus.py\", line 731, in handler\\n result = method.fn(interface, *args)\\n', ' File \"/usr/lib/python3.10/site-packages/libqtile/notify.py\", line 88, in CloseNotification\\n self.manager.close(nid)\\n', ' File \"/usr/lib/python3.10/site-packages/libqtile/notify.py\", line 203, in close\\n notif = self.notifications[nid]\\n']\"\r\nTrace/breakpoint trap (core dumped)\r\n```\n\n### Required:\n\n- [X] I have searched past issues to see if this bug has already been reported.\n", "before_files": [{"content": "# Copyright (c) 2010 dequis\n# Copyright (c) 2011 Florian Mounier\n# Copyright (c) 2011 Mounier Florian\n# Copyright (c) 2013 Mickael FALCK\n# Copyright (c) 2013 Tao Sauvage\n# Copyright (c) 2020 elParaguayo\n#\n# Permission is hereby granted, free of charge, to any person obtaining a copy\n# of this software and associated documentation files (the \"Software\"), to deal\n# in the Software without restriction, including without limitation the rights\n# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n# copies of the Software, and to permit persons to whom the Software is\n# furnished to do so, subject to the following conditions:\n#\n# The above copyright notice and this permission notice shall be included in\n# all copies or substantial portions of the Software.\n#\n# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n# SOFTWARE.\nimport asyncio\nfrom typing import Any\n\ntry:\n from dbus_next import ReleaseNameReply\n from dbus_next.aio import MessageBus\n from dbus_next.service import ServiceInterface, method, signal\n\n has_dbus = True\nexcept ImportError:\n has_dbus = False\n\nfrom libqtile.log_utils import logger\n\nBUS_NAME = \"org.freedesktop.Notifications\"\nSERVICE_PATH = \"/org/freedesktop/Notifications\"\n\nnotifier: Any = None\n\n\nclass ClosedReason:\n expired = 1\n dismissed = 2\n method = 3 # CloseNotification method\n\n\nif has_dbus:\n\n class NotificationService(ServiceInterface):\n def __init__(self, manager):\n super().__init__(BUS_NAME)\n self.manager = manager\n self._capabilities = {\"body\"}\n\n @method()\n def GetCapabilities(self) -> \"as\": # type:ignore # noqa: N802, F722\n return list(self._capabilities)\n\n def register_capabilities(self, capabilities):\n if isinstance(capabilities, str):\n self._capabilities.add(capabilities)\n elif isinstance(capabilities, (tuple, list, set)):\n self._capabilities.update(set(capabilities))\n\n @method()\n def Notify( # noqa: N802, F722\n self,\n app_name: \"s\", # type:ignore # noqa: F821\n replaces_id: \"u\", # type:ignore # noqa: F821\n app_icon: \"s\", # type:ignore # noqa: F821\n summary: \"s\", # type:ignore # noqa: F821\n body: \"s\", # type:ignore # noqa: F821\n actions: \"as\", # type:ignore # noqa: F821\n hints: \"a{sv}\", # type:ignore # noqa: F821\n timeout: \"i\", # type:ignore # noqa: F821\n ) -> \"u\": # type:ignore # noqa: F821\n notif = Notification(\n summary, body, timeout, hints, app_name, replaces_id, app_icon, actions\n )\n return self.manager.add(notif)\n\n @method()\n def CloseNotification(self, nid: \"u\"): # type:ignore # noqa: N802, F821\n self.manager.close(nid)\n\n @signal()\n def NotificationClosed( # noqa: N802\n self, nid: \"u\", reason: \"u\" # type: ignore # noqa: F821\n ) -> \"uu\": # type: ignore # noqa: F821\n return [nid, reason]\n\n @signal()\n def ActionInvoked( # noqa: N802\n self, nid: \"u\", action_key: \"s\" # type: ignore # noqa: F821\n ) -> \"us\": # type:ignore # noqa: N802, F821\n return [nid, action_key]\n\n @method()\n def GetServerInformation(self) -> \"ssss\": # type: ignore # noqa: N802, F821\n return [\"qtile-notify-daemon\", \"qtile\", \"1.0\", \"1\"]\n\n class Notification:\n def __init__(\n self,\n summary,\n body=\"\",\n timeout=-1,\n hints=None,\n app_name=\"\",\n replaces_id=None,\n app_icon=None,\n actions=None,\n ):\n self.summary = summary\n self.body = body\n self.timeout = timeout\n self.hints = hints or {}\n self.app_name = app_name\n self.replaces_id = replaces_id\n self.app_icon = app_icon\n self.actions = actions\n\n class NotificationManager:\n def __init__(self):\n self.notifications = []\n self.callbacks = []\n self.close_callbacks = []\n self._service = None\n\n async def service(self):\n if self._service is None:\n try:\n self.bus = await MessageBus().connect()\n self._service = NotificationService(self)\n self.bus.export(SERVICE_PATH, self._service)\n await self.bus.request_name(BUS_NAME)\n except Exception:\n logger.exception(\"Dbus connection failed\")\n self._service = None\n return self._service\n\n async def register(self, callback, capabilities=None, on_close=None):\n service = await self.service()\n if not service:\n logger.warning(\n \"Registering %s without any dbus connection existing\",\n callback.__name__,\n )\n self.callbacks.append(callback)\n if capabilities:\n self._service.register_capabilities(capabilities)\n if on_close:\n self.close_callbacks.append(on_close)\n\n def unregister(self, callback, on_close=None):\n try:\n self.callbacks.remove(callback)\n except ValueError:\n logger.error(\"Unable to remove notify callback. Unknown callback.\")\n\n if on_close:\n try:\n self.close_callbacks.remove(on_close)\n except ValueError:\n logger.error(\"Unable to remove notify on_close callback. Unknown callback.\")\n\n if not self.callbacks:\n return asyncio.create_task(self._release())\n\n async def _release(self):\n \"\"\"\n If the manager has no more callbacks then we need to release the service name\n from dbus and reset _service to None (to force subsequent calls to `register` to\n re-register the name on dbus.)\n \"\"\"\n reply = await self.bus.release_name(BUS_NAME)\n\n if reply != ReleaseNameReply.RELEASED:\n logger.error(\"Could not release %s\", BUS_NAME)\n return\n\n self._service = None\n\n def add(self, notif):\n self.notifications.append(notif)\n notif.id = len(self.notifications)\n for callback in self.callbacks:\n try:\n callback(notif)\n except Exception:\n logger.exception(\"Exception in notifier callback\")\n return len(self.notifications)\n\n def show(self, *args, **kwargs):\n notif = Notification(*args, **kwargs)\n return (notif, self.add(notif))\n\n def close(self, nid):\n notif = self.notifications[nid]\n\n for callback in self.close_callbacks:\n try:\n callback(notif)\n except Exception:\n logger.exception(\"Exception in notifier close callback\")\n\n notifier = NotificationManager()\n", "path": "libqtile/notify.py"}]} | 3,140 | 117 |
gh_patches_debug_3311 | rasdani/github-patches | git_diff | beeware__toga-1785 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Text within MultilineTextInput remains black in macOS Dark Mode
### Describe the bug
When using macOS in dark mode, the text within MultilineTextInput widgets remains black, making it difficult to read.
### Steps to reproduce
1. Add a MultilineTextInput widget to an app
2. Ensure macOS dark mode is enabled
3. View the app in dev mode or run the app
4. Type text into the MultilineTextInput widget
5. See error
### Expected behavior
The color of the text within the MultilineTextInput widget should be white when in dark mode and black in light mode. This works as expected with TextInput widget.
### Screenshots
<img width="270" alt="Screenshot 2023-02-16 at 1 44 35 PM" src="https://user-images.githubusercontent.com/42925864/219470705-d344d219-f0c1-46ed-8fd9-085fccfef03f.png">
### Environment
- Operating System: macOS 13.1
- Python version: 11
- Software versions:
- Briefcase: 0.3.12
- Toga: 0.3.0
### Logs
```
```
### Additional context
_No response_
</issue>
<code>
[start of cocoa/src/toga_cocoa/widgets/multilinetextinput.py]
1 from travertino.size import at_least
2
3 from toga_cocoa.colors import native_color
4 from toga_cocoa.libs import (
5 NSBezelBorder,
6 NSScrollView,
7 NSTextView,
8 NSViewWidthSizable,
9 objc_method,
10 )
11
12 from .base import Widget
13
14
15 class TogaTextView(NSTextView):
16 @objc_method
17 def touchBar(self):
18 # Disable the touchbar.
19 return None
20
21
22 class MultilineTextInput(Widget):
23 def create(self):
24 # Create a multiline view, and put it in a scroll view.
25 # The scroll view is the native, because it's the outer container.
26 self.native = NSScrollView.alloc().init()
27 self.native.hasVerticalScroller = True
28 self.native.hasHorizontalScroller = False
29 self.native.autohidesScrollers = False
30 self.native.borderType = NSBezelBorder
31
32 # Disable all autolayout functionality on the outer widget
33 self.native.translatesAutoresizingMaskIntoConstraints = False
34
35 # Create the actual text widget
36 self.text = TogaTextView.alloc().init()
37 self.text.editable = True
38 self.text.selectable = True
39 self.text.verticallyResizable = True
40 self.text.horizontallyResizable = False
41
42 self.text.autoresizingMask = NSViewWidthSizable
43
44 # Put the text view in the scroll window.
45 self.native.documentView = self.text
46
47 # Add the layout constraints
48 self.add_constraints()
49
50 def set_placeholder(self, value):
51 self.text.placeholderString = self.interface.placeholder
52
53 def set_readonly(self, value):
54 self.text.editable = not self.interface.readonly
55
56 def get_value(self):
57 return self.text.string
58
59 def set_value(self, value):
60 self.text.string = value
61
62 def set_color(self, value):
63 self.text.textColor = native_color(value)
64
65 def set_font(self, font):
66 if font:
67 self.text.font = font._impl.native
68
69 def rehint(self):
70 self.interface.intrinsic.width = at_least(self.interface.MIN_WIDTH)
71 self.interface.intrinsic.height = at_least(self.interface.MIN_HEIGHT)
72
73 def set_on_change(self, handler):
74 self.interface.factory.not_implemented("MultilineTextInput.set_on_change()")
75
76 def scroll_to_bottom(self):
77 self.text.scrollToEndOfDocument(None)
78
79 def scroll_to_top(self):
80 self.text.scrollToBeginningOfDocument(None)
81
[end of cocoa/src/toga_cocoa/widgets/multilinetextinput.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/cocoa/src/toga_cocoa/widgets/multilinetextinput.py b/cocoa/src/toga_cocoa/widgets/multilinetextinput.py
--- a/cocoa/src/toga_cocoa/widgets/multilinetextinput.py
+++ b/cocoa/src/toga_cocoa/widgets/multilinetextinput.py
@@ -38,6 +38,7 @@
self.text.selectable = True
self.text.verticallyResizable = True
self.text.horizontallyResizable = False
+ self.text.usesAdaptiveColorMappingForDarkAppearance = True
self.text.autoresizingMask = NSViewWidthSizable
| {"golden_diff": "diff --git a/cocoa/src/toga_cocoa/widgets/multilinetextinput.py b/cocoa/src/toga_cocoa/widgets/multilinetextinput.py\n--- a/cocoa/src/toga_cocoa/widgets/multilinetextinput.py\n+++ b/cocoa/src/toga_cocoa/widgets/multilinetextinput.py\n@@ -38,6 +38,7 @@\n self.text.selectable = True\n self.text.verticallyResizable = True\n self.text.horizontallyResizable = False\n+ self.text.usesAdaptiveColorMappingForDarkAppearance = True\n \n self.text.autoresizingMask = NSViewWidthSizable\n", "issue": "Text within MultilineTextInput remains black in macOS Dark Mode\n### Describe the bug\n\nWhen using macOS in dark mode, the text within MultilineTextInput widgets remains black, making it difficult to read.\n\n### Steps to reproduce\n\n1. Add a MultilineTextInput widget to an app\r\n2. Ensure macOS dark mode is enabled\r\n3. View the app in dev mode or run the app \r\n4. Type text into the MultilineTextInput widget\r\n5. See error\r\n\n\n### Expected behavior\n\nThe color of the text within the MultilineTextInput widget should be white when in dark mode and black in light mode. This works as expected with TextInput widget.\n\n### Screenshots\n\n<img width=\"270\" alt=\"Screenshot 2023-02-16 at 1 44 35 PM\" src=\"https://user-images.githubusercontent.com/42925864/219470705-d344d219-f0c1-46ed-8fd9-085fccfef03f.png\">\r\n\n\n### Environment\n\n- Operating System: macOS 13.1\r\n- Python version: 11\r\n- Software versions:\r\n - Briefcase: 0.3.12\r\n - Toga: 0.3.0\r\n\n\n### Logs\n\n```\r\n\r\n```\r\n\n\n### Additional context\n\n_No response_\n", "before_files": [{"content": "from travertino.size import at_least\n\nfrom toga_cocoa.colors import native_color\nfrom toga_cocoa.libs import (\n NSBezelBorder,\n NSScrollView,\n NSTextView,\n NSViewWidthSizable,\n objc_method,\n)\n\nfrom .base import Widget\n\n\nclass TogaTextView(NSTextView):\n @objc_method\n def touchBar(self):\n # Disable the touchbar.\n return None\n\n\nclass MultilineTextInput(Widget):\n def create(self):\n # Create a multiline view, and put it in a scroll view.\n # The scroll view is the native, because it's the outer container.\n self.native = NSScrollView.alloc().init()\n self.native.hasVerticalScroller = True\n self.native.hasHorizontalScroller = False\n self.native.autohidesScrollers = False\n self.native.borderType = NSBezelBorder\n\n # Disable all autolayout functionality on the outer widget\n self.native.translatesAutoresizingMaskIntoConstraints = False\n\n # Create the actual text widget\n self.text = TogaTextView.alloc().init()\n self.text.editable = True\n self.text.selectable = True\n self.text.verticallyResizable = True\n self.text.horizontallyResizable = False\n\n self.text.autoresizingMask = NSViewWidthSizable\n\n # Put the text view in the scroll window.\n self.native.documentView = self.text\n\n # Add the layout constraints\n self.add_constraints()\n\n def set_placeholder(self, value):\n self.text.placeholderString = self.interface.placeholder\n\n def set_readonly(self, value):\n self.text.editable = not self.interface.readonly\n\n def get_value(self):\n return self.text.string\n\n def set_value(self, value):\n self.text.string = value\n\n def set_color(self, value):\n self.text.textColor = native_color(value)\n\n def set_font(self, font):\n if font:\n self.text.font = font._impl.native\n\n def rehint(self):\n self.interface.intrinsic.width = at_least(self.interface.MIN_WIDTH)\n self.interface.intrinsic.height = at_least(self.interface.MIN_HEIGHT)\n\n def set_on_change(self, handler):\n self.interface.factory.not_implemented(\"MultilineTextInput.set_on_change()\")\n\n def scroll_to_bottom(self):\n self.text.scrollToEndOfDocument(None)\n\n def scroll_to_top(self):\n self.text.scrollToBeginningOfDocument(None)\n", "path": "cocoa/src/toga_cocoa/widgets/multilinetextinput.py"}]} | 1,519 | 140 |
gh_patches_debug_14156 | rasdani/github-patches | git_diff | aws__aws-cli-436 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Using --ip-permissions with --group-id causes validation error
If you attempt to use the --ip-permissions option with `aws ec2 authorize-security-group-*` subcommands while using a `--group-id` option to specify a VPC group, you receive this validation error:
```
ValueError: The --group_id option is not compatible with the --ip-permissions option
```
This should be allowed, though. The workaround is to use the simplified, scalar options to set the permissions.
</issue>
<code>
[start of awscli/customizations/ec2secgroupsimplify.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 authorize operations:
16
17 * --protocol: tcp | udp | icmp or any protocol number
18 * --port: A single integer or a range (min-max). You can specify ``all``
19 to mean all ports (for example, port range 0-65535)
20 * --source-group-name
21 * --source-group-id
22 * --cidr - The CIDR range. Cannot be used when specifying a source or
23 destination security group.
24 """
25
26 from awscli.arguments import CustomArgument
27
28
29 def _add_params(argument_table, operation, **kwargs):
30 arg = ProtocolArgument('protocol',
31 help_text=PROTOCOL_DOCS)
32 argument_table['protocol'] = arg
33 arg = PortArgument('port', help_text=PORT_DOCS)
34 argument_table['port'] = arg
35 arg = CidrArgument('cidr', help_text=CIDR_DOCS)
36 argument_table['cidr'] = arg
37 arg = SourceGroupArgument('source-group',
38 help_text=SOURCEGROUP_DOCS)
39 argument_table['source-group'] = arg
40 arg = GroupOwnerArgument('group-owner',
41 help_text=GROUPOWNER_DOCS)
42 argument_table['group-owner'] = arg
43
44
45 def _check_args(parsed_args, **kwargs):
46 # This function checks the parsed args. If the user specified
47 # the --ip-permissions option with any of the scalar options we
48 # raise an error.
49 arg_dict = vars(parsed_args)
50 if arg_dict['ip_permissions']:
51 for key in ('protocol', 'group_id', 'port', 'cidr',
52 'source_group', 'group_owner'):
53 if arg_dict[key]:
54 msg = ('Mixing the --ip-permissions option '
55 'with the simple, scalar options is '
56 'not recommended.')
57 raise ValueError(msg)
58
59 def _add_docs(help_command, **kwargs):
60 doc = help_command.doc
61 doc.style.new_paragraph()
62 doc.style.start_note()
63 msg = ('To specify multiple rules in a single command '
64 'use the <code>--ip-permissions</code> option')
65 doc.include_doc_string(msg)
66 doc.style.end_note()
67
68
69 EVENTS = [
70 ('building-argument-table.ec2.authorize-security-group-ingress', _add_params),
71 ('building-argument-table.ec2.authorize-security-group-egress', _add_params),
72 ('building-argument-table.ec2.revoke-security-group-ingress', _add_params),
73 ('building-argument-table.ec2.revoke-security-group-egress', _add_params),
74 ('operation-args-parsed.ec2.authorize-security-group-ingress', _check_args),
75 ('operation-args-parsed.ec2.authorize-security-group-egress', _check_args),
76 ('operation-args-parsed.ec2.revoke-security-group-ingress', _check_args),
77 ('operation-args-parsed.ec2.revoke-security-group-egress', _check_args),
78 ('doc-description.ec2.authorize-security-group-ingress', _add_docs),
79 ('doc-description.ec2.authorize-security-group-egress', _add_docs),
80 ('doc-description.ec2.revoke-security-group-ingress', _add_docs),
81 ('doc-description.ec2.revoke-security-groupdoc-ingress', _add_docs),
82 ]
83 PROTOCOL_DOCS = ('<p>The IP protocol of this permission.</p>'
84 '<p>Valid protocol values: <code>tcp</code>, '
85 '<code>udp</code>, <code>icmp</code></p>')
86 PORT_DOCS = ('<p>For TCP or UDP: The range of ports to allow.'
87 ' A single integer or a range (min-max). You can '
88 'specify <code>all</code> to mean all ports</p>')
89 CIDR_DOCS = '<p>The CIDR IP range.</p>'
90 SOURCEGROUP_DOCS = ('<p>The name of the source security group. '
91 'Cannot be used when specifying a CIDR IP address.')
92 GROUPOWNER_DOCS = ('<p>The AWS account ID that owns the source security '
93 'group. Cannot be used when specifying a CIDR IP '
94 'address.</p>')
95
96 def register_secgroup(event_handler):
97 for event, handler in EVENTS:
98 event_handler.register(event, handler)
99
100
101 def _build_ip_permissions(params, key, value):
102 if 'ip_permissions' not in params:
103 params['ip_permissions'] = [{}]
104 if key == 'CidrIp':
105 if 'IpRanges' not in params['ip_permissions'][0]:
106 params['ip_permissions'][0]['IpRanges'] = []
107 params['ip_permissions'][0]['IpRanges'].append(value)
108 elif key in ('GroupId', 'GroupName', 'UserId'):
109 if 'UserIdGroupPairs' not in params['ip_permissions'][0]:
110 params['ip_permissions'][0]['UserIdGroupPairs'] = [{}]
111 params['ip_permissions'][0]['UserIdGroupPairs'][0][key] = value
112 else:
113 params['ip_permissions'][0][key] = value
114
115
116 class ProtocolArgument(CustomArgument):
117
118 def add_to_params(self, parameters, value):
119 if value:
120 try:
121 int_value = int(value)
122 if int_value < 0 or int_value > 255:
123 msg = ('protocol numbers must be in the range 0-255')
124 raise ValueError(msg)
125 except ValueError:
126 if value not in ('tcp', 'udp', 'icmp'):
127 msg = ('protocol parameter should be one of: '
128 'tcp|udp|icmp or any valid protocol number.')
129 raise ValueError(msg)
130 _build_ip_permissions(parameters, 'IpProtocol', value)
131
132
133 class PortArgument(CustomArgument):
134
135 def add_to_params(self, parameters, value):
136 if value:
137 try:
138 if value == '-1' or value == 'all':
139 fromstr = '-1'
140 tostr = '-1'
141 elif '-' in value:
142 fromstr, tostr = value.split('-')
143 else:
144 fromstr, tostr = (value, value)
145 _build_ip_permissions(parameters, 'FromPort', int(fromstr))
146 _build_ip_permissions(parameters, 'ToPort', int(tostr))
147 except ValueError:
148 msg = ('port parameter should be of the '
149 'form <from[-to]> (e.g. 22 or 22-25)')
150 raise ValueError(msg)
151
152
153 class CidrArgument(CustomArgument):
154
155 def add_to_params(self, parameters, value):
156 if value:
157 value = [{'CidrIp': value}]
158 _build_ip_permissions(parameters, 'IpRanges', value)
159
160
161 class SourceGroupArgument(CustomArgument):
162
163 def add_to_params(self, parameters, value):
164 if value:
165 if value.startswith('sg-'):
166 _build_ip_permissions(parameters, 'GroupId', value)
167 else:
168 _build_ip_permissions(parameters, 'GroupName', value)
169
170
171 class GroupOwnerArgument(CustomArgument):
172
173 def add_to_params(self, parameters, value):
174 if value:
175 _build_ip_permissions(parameters, 'UserId', value)
176
[end of awscli/customizations/ec2secgroupsimplify.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/ec2secgroupsimplify.py b/awscli/customizations/ec2secgroupsimplify.py
--- a/awscli/customizations/ec2secgroupsimplify.py
+++ b/awscli/customizations/ec2secgroupsimplify.py
@@ -48,12 +48,11 @@
# raise an error.
arg_dict = vars(parsed_args)
if arg_dict['ip_permissions']:
- for key in ('protocol', 'group_id', 'port', 'cidr',
+ for key in ('protocol', 'port', 'cidr',
'source_group', 'group_owner'):
if arg_dict[key]:
- msg = ('Mixing the --ip-permissions option '
- 'with the simple, scalar options is '
- 'not recommended.')
+ msg = ('The --%s option is not compatible '
+ 'with the --ip-permissions option ') % key
raise ValueError(msg)
def _add_docs(help_command, **kwargs):
| {"golden_diff": "diff --git a/awscli/customizations/ec2secgroupsimplify.py b/awscli/customizations/ec2secgroupsimplify.py\n--- a/awscli/customizations/ec2secgroupsimplify.py\n+++ b/awscli/customizations/ec2secgroupsimplify.py\n@@ -48,12 +48,11 @@\n # raise an error.\n arg_dict = vars(parsed_args)\n if arg_dict['ip_permissions']:\n- for key in ('protocol', 'group_id', 'port', 'cidr',\n+ for key in ('protocol', 'port', 'cidr',\n 'source_group', 'group_owner'):\n if arg_dict[key]:\n- msg = ('Mixing the --ip-permissions option '\n- 'with the simple, scalar options is '\n- 'not recommended.')\n+ msg = ('The --%s option is not compatible '\n+ 'with the --ip-permissions option ') % key\n raise ValueError(msg)\n \n def _add_docs(help_command, **kwargs):\n", "issue": "Using --ip-permissions with --group-id causes validation error\nIf you attempt to use the --ip-permissions option with `aws ec2 authorize-security-group-*` subcommands while using a `--group-id` option to specify a VPC group, you receive this validation error:\n\n```\nValueError: The --group_id option is not compatible with the --ip-permissions option\n```\n\nThis should be allowed, though. The workaround is to use the simplified, scalar options to set the permissions.\n\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\nauthorize operations:\n\n* --protocol: tcp | udp | icmp or any protocol number\n* --port: A single integer or a range (min-max). You can specify ``all``\n to mean all ports (for example, port range 0-65535)\n* --source-group-name\n* --source-group-id\n* --cidr - The CIDR range. Cannot be used when specifying a source or\n destination security group.\n\"\"\"\n\nfrom awscli.arguments import CustomArgument\n\n\ndef _add_params(argument_table, operation, **kwargs):\n arg = ProtocolArgument('protocol',\n help_text=PROTOCOL_DOCS)\n argument_table['protocol'] = arg\n arg = PortArgument('port', help_text=PORT_DOCS)\n argument_table['port'] = arg\n arg = CidrArgument('cidr', help_text=CIDR_DOCS)\n argument_table['cidr'] = arg\n arg = SourceGroupArgument('source-group',\n help_text=SOURCEGROUP_DOCS)\n argument_table['source-group'] = arg\n arg = GroupOwnerArgument('group-owner',\n help_text=GROUPOWNER_DOCS)\n argument_table['group-owner'] = arg\n\n\ndef _check_args(parsed_args, **kwargs):\n # This function checks the parsed args. If the user specified\n # the --ip-permissions option with any of the scalar options we\n # raise an error.\n arg_dict = vars(parsed_args)\n if arg_dict['ip_permissions']:\n for key in ('protocol', 'group_id', 'port', 'cidr',\n 'source_group', 'group_owner'):\n if arg_dict[key]:\n msg = ('Mixing the --ip-permissions option '\n 'with the simple, scalar options is '\n 'not recommended.')\n raise ValueError(msg)\n\ndef _add_docs(help_command, **kwargs):\n doc = help_command.doc\n doc.style.new_paragraph()\n doc.style.start_note()\n msg = ('To specify multiple rules in a single command '\n 'use the <code>--ip-permissions</code> option')\n doc.include_doc_string(msg)\n doc.style.end_note()\n\n\nEVENTS = [\n ('building-argument-table.ec2.authorize-security-group-ingress', _add_params),\n ('building-argument-table.ec2.authorize-security-group-egress', _add_params),\n ('building-argument-table.ec2.revoke-security-group-ingress', _add_params),\n ('building-argument-table.ec2.revoke-security-group-egress', _add_params),\n ('operation-args-parsed.ec2.authorize-security-group-ingress', _check_args),\n ('operation-args-parsed.ec2.authorize-security-group-egress', _check_args),\n ('operation-args-parsed.ec2.revoke-security-group-ingress', _check_args),\n ('operation-args-parsed.ec2.revoke-security-group-egress', _check_args),\n ('doc-description.ec2.authorize-security-group-ingress', _add_docs),\n ('doc-description.ec2.authorize-security-group-egress', _add_docs),\n ('doc-description.ec2.revoke-security-group-ingress', _add_docs),\n ('doc-description.ec2.revoke-security-groupdoc-ingress', _add_docs),\n ]\nPROTOCOL_DOCS = ('<p>The IP protocol of this permission.</p>'\n '<p>Valid protocol values: <code>tcp</code>, '\n '<code>udp</code>, <code>icmp</code></p>')\nPORT_DOCS = ('<p>For TCP or UDP: The range of ports to allow.'\n ' A single integer or a range (min-max). You can '\n 'specify <code>all</code> to mean all ports</p>')\nCIDR_DOCS = '<p>The CIDR IP range.</p>'\nSOURCEGROUP_DOCS = ('<p>The name of the source security group. '\n 'Cannot be used when specifying a CIDR IP address.')\nGROUPOWNER_DOCS = ('<p>The AWS account ID that owns the source security '\n 'group. Cannot be used when specifying a CIDR IP '\n 'address.</p>')\n\ndef register_secgroup(event_handler):\n for event, handler in EVENTS:\n event_handler.register(event, handler)\n\n\ndef _build_ip_permissions(params, key, value):\n if 'ip_permissions' not in params:\n params['ip_permissions'] = [{}]\n if key == 'CidrIp':\n if 'IpRanges' not in params['ip_permissions'][0]:\n params['ip_permissions'][0]['IpRanges'] = []\n params['ip_permissions'][0]['IpRanges'].append(value)\n elif key in ('GroupId', 'GroupName', 'UserId'):\n if 'UserIdGroupPairs' not in params['ip_permissions'][0]:\n params['ip_permissions'][0]['UserIdGroupPairs'] = [{}]\n params['ip_permissions'][0]['UserIdGroupPairs'][0][key] = value\n else:\n params['ip_permissions'][0][key] = value\n\n\nclass ProtocolArgument(CustomArgument):\n\n def add_to_params(self, parameters, value):\n if value:\n try:\n int_value = int(value)\n if int_value < 0 or int_value > 255:\n msg = ('protocol numbers must be in the range 0-255')\n raise ValueError(msg)\n except ValueError:\n if value not in ('tcp', 'udp', 'icmp'):\n msg = ('protocol parameter should be one of: '\n 'tcp|udp|icmp or any valid protocol number.')\n raise ValueError(msg)\n _build_ip_permissions(parameters, 'IpProtocol', value)\n\n\nclass PortArgument(CustomArgument):\n\n def add_to_params(self, parameters, value):\n if value:\n try:\n if value == '-1' or value == 'all':\n fromstr = '-1'\n tostr = '-1'\n elif '-' in value:\n fromstr, tostr = value.split('-')\n else:\n fromstr, tostr = (value, value)\n _build_ip_permissions(parameters, 'FromPort', int(fromstr))\n _build_ip_permissions(parameters, 'ToPort', int(tostr))\n except ValueError:\n msg = ('port parameter should be of the '\n 'form <from[-to]> (e.g. 22 or 22-25)')\n raise ValueError(msg)\n\n\nclass CidrArgument(CustomArgument):\n\n def add_to_params(self, parameters, value):\n if value:\n value = [{'CidrIp': value}]\n _build_ip_permissions(parameters, 'IpRanges', value)\n\n\nclass SourceGroupArgument(CustomArgument):\n\n def add_to_params(self, parameters, value):\n if value:\n if value.startswith('sg-'):\n _build_ip_permissions(parameters, 'GroupId', value)\n else:\n _build_ip_permissions(parameters, 'GroupName', value)\n\n\nclass GroupOwnerArgument(CustomArgument):\n\n def add_to_params(self, parameters, value):\n if value:\n _build_ip_permissions(parameters, 'UserId', value)\n", "path": "awscli/customizations/ec2secgroupsimplify.py"}]} | 2,740 | 212 |
gh_patches_debug_27552 | rasdani/github-patches | git_diff | fossasia__open-event-server-7452 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Change email and PDF datetimes to event timezone
They are currently shown in server timezone
</issue>
<code>
[start of app/models/event_invoice.py]
1 import logging
2 from datetime import datetime, timedelta
3
4 from flask.templating import render_template
5 from sqlalchemy.sql import func
6
7 from app.api.helpers.files import create_save_pdf
8 from app.api.helpers.mail import send_email_for_monthly_fee_payment
9 from app.api.helpers.notification import send_notif_monthly_fee_payment
10 from app.api.helpers.storage import UPLOAD_PATHS
11 from app.api.helpers.utilities import monthdelta, round_money
12 from app.models import db
13 from app.models.base import SoftDeletionModel
14 from app.models.order import Order
15 from app.models.setting import Setting
16 from app.models.ticket_fee import TicketFees
17 from app.settings import get_settings
18
19 logger = logging.getLogger(__name__)
20
21
22 class EventInvoice(SoftDeletionModel):
23 DUE_DATE_DAYS = 30
24
25 __tablename__ = 'event_invoices'
26
27 id = db.Column(db.Integer, primary_key=True)
28 identifier = db.Column(db.String, unique=True, nullable=False)
29 amount = db.Column(db.Float)
30
31 user_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='SET NULL'))
32 event_id = db.Column(db.Integer, db.ForeignKey('events.id', ondelete='SET NULL'))
33
34 created_at = db.Column(db.DateTime(timezone=True), default=func.now())
35 issued_at = db.Column(db.DateTime(timezone=True), nullable=False)
36
37 # Payment Fields
38 completed_at = db.Column(db.DateTime(timezone=True), nullable=True, default=None)
39 transaction_id = db.Column(db.String)
40 paid_via = db.Column(db.String)
41 payment_mode = db.Column(db.String)
42 brand = db.Column(db.String)
43 exp_month = db.Column(db.Integer)
44 exp_year = db.Column(db.Integer)
45 last4 = db.Column(db.String)
46 stripe_token = db.Column(db.String)
47 paypal_token = db.Column(db.String)
48 status = db.Column(db.String, default='due')
49
50 invoice_pdf_url = db.Column(db.String)
51
52 event = db.relationship('Event', backref='invoices')
53 user = db.relationship('User', backref='event_invoices')
54
55 def __init__(self, **kwargs):
56 super().__init__(**kwargs)
57
58 if not self.issued_at:
59 self.issued_at = datetime.now()
60
61 if not self.identifier:
62 self.identifier = self.get_new_id()
63
64 def __repr__(self):
65 return '<EventInvoice {!r} {!r} {!r}>'.format(
66 self.id,
67 self.identifier,
68 self.invoice_pdf_url,
69 )
70
71 def get_new_id(self) -> str:
72 with db.session.no_autoflush:
73 identifier = self.issued_at.strftime('%Y%mU-') + '%06d' % (
74 EventInvoice.query.count() + 1
75 )
76 count = EventInvoice.query.filter_by(identifier=identifier).count()
77 if count == 0:
78 return identifier
79 return self.get_new_id()
80
81 @property
82 def previous_month_date(self):
83 return monthdelta(self.issued_at, -1)
84
85 @property
86 def due_at(self):
87 return self.issued_at + timedelta(days=EventInvoice.DUE_DATE_DAYS)
88
89 def populate(self):
90 assert self.event is not None
91
92 with db.session.no_autoflush:
93 self.user = self.event.owner
94 return self.generate_pdf()
95
96 def generate_pdf(self, force=False):
97 with db.session.no_autoflush:
98 latest_invoice_date = (
99 EventInvoice.query.filter_by(event=self.event)
100 .filter(EventInvoice.issued_at < self.issued_at)
101 .with_entities(func.max(EventInvoice.issued_at))
102 .scalar()
103 )
104
105 admin_info = Setting.query.first()
106 currency = self.event.payment_currency
107 ticket_fee_object = (
108 TicketFees.query.filter_by(country=self.event.payment_country).first()
109 or TicketFees.query.filter_by(country='global').first()
110 )
111 if not ticket_fee_object:
112 logger.error('Ticket Fee not found for event %s', self.event)
113 return
114
115 ticket_fee_percentage = ticket_fee_object.service_fee
116 ticket_fee_maximum = ticket_fee_object.maximum_fee
117 gross_revenue = self.event.calc_revenue(
118 start=latest_invoice_date, end=self.issued_at
119 )
120 invoice_amount = gross_revenue * (ticket_fee_percentage / 100)
121 if invoice_amount > ticket_fee_maximum:
122 invoice_amount = ticket_fee_maximum
123 self.amount = round_money(invoice_amount)
124 if not force and self.amount == 0:
125 logger.warning(
126 'Invoice amount of Event %s is 0, hence skipping generation',
127 self.event,
128 )
129 return
130 net_revenue = round_money(gross_revenue - invoice_amount)
131 orders_query = self.event.get_orders_query(
132 start=latest_invoice_date, end=self.issued_at
133 )
134 first_order_date = orders_query.with_entities(
135 func.min(Order.completed_at)
136 ).scalar()
137 last_order_date = orders_query.with_entities(
138 func.max(Order.completed_at)
139 ).scalar()
140 payment_details = {
141 'tickets_sold': self.event.tickets_sold,
142 'gross_revenue': round_money(gross_revenue),
143 'net_revenue': round_money(net_revenue),
144 'first_date': first_order_date or self.previous_month_date,
145 'last_date': last_order_date or self.issued_at,
146 }
147 self.invoice_pdf_url = create_save_pdf(
148 render_template(
149 'pdf/event_invoice.html',
150 user=self.user,
151 admin_info=admin_info,
152 currency=currency,
153 event=self.event,
154 ticket_fee=ticket_fee_object,
155 payment_details=payment_details,
156 net_revenue=net_revenue,
157 invoice=self,
158 ),
159 UPLOAD_PATHS['pdf']['event_invoice'],
160 dir_path='/static/uploads/pdf/event_invoices/',
161 identifier=self.identifier,
162 extra_identifiers={'event_identifier': self.event.identifier},
163 new_renderer=True,
164 )
165
166 return self.invoice_pdf_url
167
168 def send_notification(self, follow_up=False):
169 prev_month = self.previous_month_date.strftime("%b %Y") # Displayed as Aug 2016
170 app_name = get_settings()['app_name']
171 frontend_url = get_settings()['frontend_url']
172 link = f'{frontend_url}/event-invoice/{self.identifier}/review'
173 currency = self.event.payment_currency
174 amount = f"{currency} {self.amount}"
175 send_email_for_monthly_fee_payment(
176 self.user,
177 self.event.name,
178 prev_month,
179 amount,
180 app_name,
181 link,
182 follow_up=follow_up,
183 )
184 if isinstance(follow_up, bool):
185 send_notif_monthly_fee_payment(
186 self.user,
187 self.event.name,
188 prev_month,
189 amount,
190 app_name,
191 link,
192 self.event_id,
193 follow_up=follow_up,
194 )
195
[end of app/models/event_invoice.py]
[start of app/templates/flask_ext/jinja/filters.py]
1 from datetime import datetime
2
3 import humanize
4 import pytz
5 from forex_python.converter import CurrencyCodes
6
7
8 def humanize_helper(time):
9 """Returns time passed from now in a human readable duration"""
10
11 if not time:
12 return "N/A"
13 return humanize.naturaltime(datetime.now(pytz.utc) - time.astimezone(pytz.utc))
14
15
16 def init_filters(app):
17 @app.template_filter('currency_symbol')
18 def currency_symbol_filter(currency_code):
19 symbol = CurrencyCodes().get_symbol(currency_code)
20 return symbol if symbol else currency_code
21
22 @app.template_filter('money')
23 def money_filter(string):
24 return '{:20,.2f}'.format(float(string))
25
26 @app.template_filter('datetime')
27 def simple_datetime_display(date, timezone='UTC', format='%B %d, %Y %I:%M %p'):
28 if not date:
29 return ''
30 return date.astimezone(pytz.timezone(timezone)).strftime(format)
31
32 @app.template_filter('date')
33 def simple_date_display(date):
34 if not date:
35 return ''
36 return date.strftime('%B %d, %Y')
37
38 @app.template_filter('humanize')
39 def humanize_filter(time):
40 return humanize_helper(time)
41
[end of app/templates/flask_ext/jinja/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/app/models/event_invoice.py b/app/models/event_invoice.py
--- a/app/models/event_invoice.py
+++ b/app/models/event_invoice.py
@@ -1,6 +1,7 @@
import logging
from datetime import datetime, timedelta
+import pytz
from flask.templating import render_template
from sqlalchemy.sql import func
@@ -166,7 +167,11 @@
return self.invoice_pdf_url
def send_notification(self, follow_up=False):
- prev_month = self.previous_month_date.strftime("%b %Y") # Displayed as Aug 2016
+ prev_month = self.previous_month_date.astimezone(
+ pytz.timezone(self.event.timezone)
+ ).strftime(
+ "%b %Y"
+ ) # Displayed as Aug 2016
app_name = get_settings()['app_name']
frontend_url = get_settings()['frontend_url']
link = f'{frontend_url}/event-invoice/{self.identifier}/review'
diff --git a/app/templates/flask_ext/jinja/filters.py b/app/templates/flask_ext/jinja/filters.py
--- a/app/templates/flask_ext/jinja/filters.py
+++ b/app/templates/flask_ext/jinja/filters.py
@@ -30,10 +30,8 @@
return date.astimezone(pytz.timezone(timezone)).strftime(format)
@app.template_filter('date')
- def simple_date_display(date):
- if not date:
- return ''
- return date.strftime('%B %d, %Y')
+ def simple_date_display(date, timezone='UTC'):
+ return simple_datetime_display(date, timezone, '%B %d, %Y')
@app.template_filter('humanize')
def humanize_filter(time):
| {"golden_diff": "diff --git a/app/models/event_invoice.py b/app/models/event_invoice.py\n--- a/app/models/event_invoice.py\n+++ b/app/models/event_invoice.py\n@@ -1,6 +1,7 @@\n import logging\n from datetime import datetime, timedelta\n \n+import pytz\n from flask.templating import render_template\n from sqlalchemy.sql import func\n \n@@ -166,7 +167,11 @@\n return self.invoice_pdf_url\n \n def send_notification(self, follow_up=False):\n- prev_month = self.previous_month_date.strftime(\"%b %Y\") # Displayed as Aug 2016\n+ prev_month = self.previous_month_date.astimezone(\n+ pytz.timezone(self.event.timezone)\n+ ).strftime(\n+ \"%b %Y\"\n+ ) # Displayed as Aug 2016\n app_name = get_settings()['app_name']\n frontend_url = get_settings()['frontend_url']\n link = f'{frontend_url}/event-invoice/{self.identifier}/review'\ndiff --git a/app/templates/flask_ext/jinja/filters.py b/app/templates/flask_ext/jinja/filters.py\n--- a/app/templates/flask_ext/jinja/filters.py\n+++ b/app/templates/flask_ext/jinja/filters.py\n@@ -30,10 +30,8 @@\n return date.astimezone(pytz.timezone(timezone)).strftime(format)\n \n @app.template_filter('date')\n- def simple_date_display(date):\n- if not date:\n- return ''\n- return date.strftime('%B %d, %Y')\n+ def simple_date_display(date, timezone='UTC'):\n+ return simple_datetime_display(date, timezone, '%B %d, %Y')\n \n @app.template_filter('humanize')\n def humanize_filter(time):\n", "issue": "Change email and PDF datetimes to event timezone\nThey are currently shown in server timezone\n", "before_files": [{"content": "import logging\nfrom datetime import datetime, timedelta\n\nfrom flask.templating import render_template\nfrom sqlalchemy.sql import func\n\nfrom app.api.helpers.files import create_save_pdf\nfrom app.api.helpers.mail import send_email_for_monthly_fee_payment\nfrom app.api.helpers.notification import send_notif_monthly_fee_payment\nfrom app.api.helpers.storage import UPLOAD_PATHS\nfrom app.api.helpers.utilities import monthdelta, round_money\nfrom app.models import db\nfrom app.models.base import SoftDeletionModel\nfrom app.models.order import Order\nfrom app.models.setting import Setting\nfrom app.models.ticket_fee import TicketFees\nfrom app.settings import get_settings\n\nlogger = logging.getLogger(__name__)\n\n\nclass EventInvoice(SoftDeletionModel):\n DUE_DATE_DAYS = 30\n\n __tablename__ = 'event_invoices'\n\n id = db.Column(db.Integer, primary_key=True)\n identifier = db.Column(db.String, unique=True, nullable=False)\n amount = db.Column(db.Float)\n\n user_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='SET NULL'))\n event_id = db.Column(db.Integer, db.ForeignKey('events.id', ondelete='SET NULL'))\n\n created_at = db.Column(db.DateTime(timezone=True), default=func.now())\n issued_at = db.Column(db.DateTime(timezone=True), nullable=False)\n\n # Payment Fields\n completed_at = db.Column(db.DateTime(timezone=True), nullable=True, default=None)\n transaction_id = db.Column(db.String)\n paid_via = db.Column(db.String)\n payment_mode = db.Column(db.String)\n brand = db.Column(db.String)\n exp_month = db.Column(db.Integer)\n exp_year = db.Column(db.Integer)\n last4 = db.Column(db.String)\n stripe_token = db.Column(db.String)\n paypal_token = db.Column(db.String)\n status = db.Column(db.String, default='due')\n\n invoice_pdf_url = db.Column(db.String)\n\n event = db.relationship('Event', backref='invoices')\n user = db.relationship('User', backref='event_invoices')\n\n def __init__(self, **kwargs):\n super().__init__(**kwargs)\n\n if not self.issued_at:\n self.issued_at = datetime.now()\n\n if not self.identifier:\n self.identifier = self.get_new_id()\n\n def __repr__(self):\n return '<EventInvoice {!r} {!r} {!r}>'.format(\n self.id,\n self.identifier,\n self.invoice_pdf_url,\n )\n\n def get_new_id(self) -> str:\n with db.session.no_autoflush:\n identifier = self.issued_at.strftime('%Y%mU-') + '%06d' % (\n EventInvoice.query.count() + 1\n )\n count = EventInvoice.query.filter_by(identifier=identifier).count()\n if count == 0:\n return identifier\n return self.get_new_id()\n\n @property\n def previous_month_date(self):\n return monthdelta(self.issued_at, -1)\n\n @property\n def due_at(self):\n return self.issued_at + timedelta(days=EventInvoice.DUE_DATE_DAYS)\n\n def populate(self):\n assert self.event is not None\n\n with db.session.no_autoflush:\n self.user = self.event.owner\n return self.generate_pdf()\n\n def generate_pdf(self, force=False):\n with db.session.no_autoflush:\n latest_invoice_date = (\n EventInvoice.query.filter_by(event=self.event)\n .filter(EventInvoice.issued_at < self.issued_at)\n .with_entities(func.max(EventInvoice.issued_at))\n .scalar()\n )\n\n admin_info = Setting.query.first()\n currency = self.event.payment_currency\n ticket_fee_object = (\n TicketFees.query.filter_by(country=self.event.payment_country).first()\n or TicketFees.query.filter_by(country='global').first()\n )\n if not ticket_fee_object:\n logger.error('Ticket Fee not found for event %s', self.event)\n return\n\n ticket_fee_percentage = ticket_fee_object.service_fee\n ticket_fee_maximum = ticket_fee_object.maximum_fee\n gross_revenue = self.event.calc_revenue(\n start=latest_invoice_date, end=self.issued_at\n )\n invoice_amount = gross_revenue * (ticket_fee_percentage / 100)\n if invoice_amount > ticket_fee_maximum:\n invoice_amount = ticket_fee_maximum\n self.amount = round_money(invoice_amount)\n if not force and self.amount == 0:\n logger.warning(\n 'Invoice amount of Event %s is 0, hence skipping generation',\n self.event,\n )\n return\n net_revenue = round_money(gross_revenue - invoice_amount)\n orders_query = self.event.get_orders_query(\n start=latest_invoice_date, end=self.issued_at\n )\n first_order_date = orders_query.with_entities(\n func.min(Order.completed_at)\n ).scalar()\n last_order_date = orders_query.with_entities(\n func.max(Order.completed_at)\n ).scalar()\n payment_details = {\n 'tickets_sold': self.event.tickets_sold,\n 'gross_revenue': round_money(gross_revenue),\n 'net_revenue': round_money(net_revenue),\n 'first_date': first_order_date or self.previous_month_date,\n 'last_date': last_order_date or self.issued_at,\n }\n self.invoice_pdf_url = create_save_pdf(\n render_template(\n 'pdf/event_invoice.html',\n user=self.user,\n admin_info=admin_info,\n currency=currency,\n event=self.event,\n ticket_fee=ticket_fee_object,\n payment_details=payment_details,\n net_revenue=net_revenue,\n invoice=self,\n ),\n UPLOAD_PATHS['pdf']['event_invoice'],\n dir_path='/static/uploads/pdf/event_invoices/',\n identifier=self.identifier,\n extra_identifiers={'event_identifier': self.event.identifier},\n new_renderer=True,\n )\n\n return self.invoice_pdf_url\n\n def send_notification(self, follow_up=False):\n prev_month = self.previous_month_date.strftime(\"%b %Y\") # Displayed as Aug 2016\n app_name = get_settings()['app_name']\n frontend_url = get_settings()['frontend_url']\n link = f'{frontend_url}/event-invoice/{self.identifier}/review'\n currency = self.event.payment_currency\n amount = f\"{currency} {self.amount}\"\n send_email_for_monthly_fee_payment(\n self.user,\n self.event.name,\n prev_month,\n amount,\n app_name,\n link,\n follow_up=follow_up,\n )\n if isinstance(follow_up, bool):\n send_notif_monthly_fee_payment(\n self.user,\n self.event.name,\n prev_month,\n amount,\n app_name,\n link,\n self.event_id,\n follow_up=follow_up,\n )\n", "path": "app/models/event_invoice.py"}, {"content": "from datetime import datetime\n\nimport humanize\nimport pytz\nfrom forex_python.converter import CurrencyCodes\n\n\ndef humanize_helper(time):\n \"\"\"Returns time passed from now in a human readable duration\"\"\"\n\n if not time:\n return \"N/A\"\n return humanize.naturaltime(datetime.now(pytz.utc) - time.astimezone(pytz.utc))\n\n\ndef init_filters(app):\n @app.template_filter('currency_symbol')\n def currency_symbol_filter(currency_code):\n symbol = CurrencyCodes().get_symbol(currency_code)\n return symbol if symbol else currency_code\n\n @app.template_filter('money')\n def money_filter(string):\n return '{:20,.2f}'.format(float(string))\n\n @app.template_filter('datetime')\n def simple_datetime_display(date, timezone='UTC', format='%B %d, %Y %I:%M %p'):\n if not date:\n return ''\n return date.astimezone(pytz.timezone(timezone)).strftime(format)\n\n @app.template_filter('date')\n def simple_date_display(date):\n if not date:\n return ''\n return date.strftime('%B %d, %Y')\n\n @app.template_filter('humanize')\n def humanize_filter(time):\n return humanize_helper(time)\n", "path": "app/templates/flask_ext/jinja/filters.py"}]} | 2,860 | 385 |
gh_patches_debug_29701 | rasdani/github-patches | git_diff | encode__httpx-310 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
h11._util.LocalProtocolError: Too little data for declared Content-Length
client POC:
```python
import asyncio
import logging
import httpx
logging.basicConfig(level=logging.DEBUG)
async def test():
client = httpx.AsyncClient()
url = 'http://127.0.0.1:8000/debug'
resp = await client.post(url, data='debug', allow_redirects=True)
print(resp.content)
if __name__ == '__main__':
asyncio.get_event_loop().run_until_complete(test())
```
app POC:
```python
from starlette.responses import RedirectResponse
from starlette.applications import Starlette
import uvicorn
app = Starlette(debug=True)
@app.route('/debug', methods=['POST', 'GET'])
async def debug(request):
return RedirectResponse(url='https://httpbin.org/headers', status_code=302)
if __name__ == '__main__':
uvicorn.run(app)
```
log:
```
DEBUG:asyncio:Using selector: KqueueSelector
DEBUG:httpx.dispatch.connection_pool:new_connection connection=HTTPConnection(origin=Origin(scheme='http' host='127.0.0.1' port=8000))
DEBUG:httpx.dispatch.connection:start_connect host='127.0.0.1' port=8000 timeout=TimeoutConfig(timeout=5.0)
DEBUG:httpx.dispatch.connection:connected http_version='HTTP/1.1'
DEBUG:httpx.dispatch.http11:send_headers method='POST' target='/debug' headers=Headers({'host': '127.0.0.1:8000', 'user-agent': 'python-httpx/0.7.2', 'accept': '*/*', 'content-length': '5', 'accept-encoding': 'gzip, deflate', 'connection': 'keep-alive'})
DEBUG:httpx.dispatch.http11:receive_event event=NEED_DATA
DEBUG:httpx.dispatch.http11:send_data data=Data(<5 bytes>)
DEBUG:httpx.dispatch.http11:receive_event event=Response(status_code=302, headers=[(b'date', b'Tue, 03 Sep 2019 03:50:53 GMT'), (b'server', b'uvicorn'), (b'location', b'https://httpbin.org/headers'), (b'transfer-encoding', b'chunked')], http_version=b'1.1', reason=b'Found')
DEBUG:httpx.dispatch.http11:receive_event event=EndOfMessage(headers=[])
DEBUG:httpx.dispatch.http11:response_closed our_state=DONE their_state=DONE
DEBUG:httpx.dispatch.connection_pool:release_connection connection=HTTPConnection(origin=Origin(scheme='http' host='127.0.0.1' port=8000))
DEBUG:httpx.dispatch.connection_pool:new_connection connection=HTTPConnection(origin=Origin(scheme='https' host='httpbin.org' port=443))
DEBUG:httpx.dispatch.connection:start_connect host='httpbin.org' port=443 timeout=TimeoutConfig(timeout=5.0)
DEBUG:httpx.dispatch.connection:connected http_version='HTTP/1.1'
DEBUG:httpx.dispatch.http11:send_headers method='GET' target='/headers' headers=Headers({'host': 'httpbin.org', 'user-agent': 'python-httpx/0.7.2', 'accept': '*/*', 'content-length': '5', 'accept-encoding': 'gzip, deflate', 'connection': 'keep-alive'})
DEBUG:httpx.dispatch.http11:receive_event event=NEED_DATA
Traceback (most recent call last):
File "http3/httpx/dispatch/http11.py", line 53, in send
http_version, status_code, headers = await self._receive_response(timeout)
File "http3/httpx/dispatch/http11.py", line 133, in _receive_response
event = await self._receive_event(timeout)
File "http3/httpx/dispatch/http11.py", line 174, in _receive_event
self.READ_NUM_BYTES, timeout, flag=self.timeout_flag
File "http3/httpx/concurrency/asyncio.py", line 92, in read
raise ReadTimeout() from None
http3.httpx.exceptions.ReadTimeout
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "test_proto.py", line 16, in <module>
asyncio.get_event_loop().run_until_complete(test())
File "/lib/python3.7/asyncio/base_events.py", line 584, in run_until_complete
return future.result()
File "test_proto.py", line 11, in test
resp = await client.post(url, data='debug', allow_redirects=True)
File "http3/httpx/client.py", line 415, in post
trust_env=trust_env,
File "http3/httpx/client.py", line 566, in request
trust_env=trust_env,
File "http3/httpx/client.py", line 237, in send
return await get_response(request)
File "http3/httpx/middleware.py", line 72, in __call__
return await self(next_request, get_response)
File "http3/httpx/middleware.py", line 62, in __call__
response = await get_response(request)
File "http3/httpx/client.py", line 202, in get_response
request, verify=verify, cert=cert, timeout=timeout
File "http3/httpx/dispatch/connection_pool.py", line 126, in send
raise exc
File "http3/httpx/dispatch/connection_pool.py", line 121, in send
request, verify=verify, cert=cert, timeout=timeout
File "http3/httpx/dispatch/connection.py", line 65, in send
response = await self.h11_connection.send(request, timeout=timeout)
File "http3/httpx/dispatch/http11.py", line 53, in send
http_version, status_code, headers = await self._receive_response(timeout)
File "http3/httpx/concurrency/asyncio.py", line 285, in __aexit__
await self.task
File "http3/httpx/dispatch/http11.py", line 108, in _send_request_data
await self._send_event(event, timeout)
File "http3/httpx/dispatch/http11.py", line 123, in _send_event
bytes_to_send = self.h11_state.send(event)
File "site-packages/h11/_connection.py", line 469, in send
data_list = self.send_with_data_passthrough(event)
File "site-packages/h11/_connection.py", line 502, in send_with_data_passthrough
writer(event, data_list.append)
File "site-packages/h11/_writers.py", line 79, in __call__
self.send_eom(event.headers, write)
File "site-packages/h11/_writers.py", line 102, in send_eom
raise LocalProtocolError("Too little data for declared Content-Length")
h11._util.LocalProtocolError: Too little data for declared Content-Length
```
</issue>
<code>
[start of httpx/middleware.py]
1 import functools
2 import typing
3 from base64 import b64encode
4
5 from .config import DEFAULT_MAX_REDIRECTS
6 from .exceptions import RedirectBodyUnavailable, RedirectLoop, TooManyRedirects
7 from .models import URL, AsyncRequest, AsyncResponse, Cookies, Headers
8 from .status_codes import codes
9
10
11 class BaseMiddleware:
12 async def __call__(
13 self, request: AsyncRequest, get_response: typing.Callable
14 ) -> AsyncResponse:
15 raise NotImplementedError # pragma: no cover
16
17
18 class BasicAuthMiddleware(BaseMiddleware):
19 def __init__(
20 self, username: typing.Union[str, bytes], password: typing.Union[str, bytes]
21 ):
22 if isinstance(username, str):
23 username = username.encode("latin1")
24
25 if isinstance(password, str):
26 password = password.encode("latin1")
27
28 userpass = b":".join((username, password))
29 token = b64encode(userpass).decode().strip()
30
31 self.authorization_header = f"Basic {token}"
32
33 async def __call__(
34 self, request: AsyncRequest, get_response: typing.Callable
35 ) -> AsyncResponse:
36 request.headers["Authorization"] = self.authorization_header
37 return await get_response(request)
38
39
40 class CustomAuthMiddleware(BaseMiddleware):
41 def __init__(self, auth: typing.Callable[[AsyncRequest], AsyncRequest]):
42 self.auth = auth
43
44 async def __call__(
45 self, request: AsyncRequest, get_response: typing.Callable
46 ) -> AsyncResponse:
47 request = self.auth(request)
48 return await get_response(request)
49
50
51 class RedirectMiddleware(BaseMiddleware):
52 def __init__(
53 self,
54 allow_redirects: bool = True,
55 max_redirects: int = DEFAULT_MAX_REDIRECTS,
56 cookies: typing.Optional[Cookies] = None,
57 ):
58 self.allow_redirects = allow_redirects
59 self.max_redirects = max_redirects
60 self.cookies = cookies
61 self.history: typing.List[AsyncResponse] = []
62
63 async def __call__(
64 self, request: AsyncRequest, get_response: typing.Callable
65 ) -> AsyncResponse:
66 if len(self.history) > self.max_redirects:
67 raise TooManyRedirects()
68 if request.url in (response.url for response in self.history):
69 raise RedirectLoop()
70
71 response = await get_response(request)
72 response.history = list(self.history)
73
74 if not response.is_redirect:
75 return response
76
77 self.history.append(response)
78 next_request = self.build_redirect_request(request, response)
79
80 if self.allow_redirects:
81 return await self(next_request, get_response)
82
83 response.call_next = functools.partial(self, next_request, get_response)
84 return response
85
86 def build_redirect_request(
87 self, request: AsyncRequest, response: AsyncResponse
88 ) -> AsyncRequest:
89 method = self.redirect_method(request, response)
90 url = self.redirect_url(request, response)
91 headers = self.redirect_headers(request, url) # TODO: merge headers?
92 content = self.redirect_content(request, method)
93 cookies = Cookies(self.cookies)
94 cookies.update(request.cookies)
95 return AsyncRequest(
96 method=method, url=url, headers=headers, data=content, cookies=cookies
97 )
98
99 def redirect_method(self, request: AsyncRequest, response: AsyncResponse) -> str:
100 """
101 When being redirected we may want to change the method of the request
102 based on certain specs or browser behavior.
103 """
104 method = request.method
105
106 # https://tools.ietf.org/html/rfc7231#section-6.4.4
107 if response.status_code == codes.SEE_OTHER and method != "HEAD":
108 method = "GET"
109
110 # Do what the browsers do, despite standards...
111 # Turn 302s into GETs.
112 if response.status_code == codes.FOUND and method != "HEAD":
113 method = "GET"
114
115 # If a POST is responded to with a 301, turn it into a GET.
116 # This bizarre behaviour is explained in 'requests' issue 1704.
117 if response.status_code == codes.MOVED_PERMANENTLY and method == "POST":
118 method = "GET"
119
120 return method
121
122 def redirect_url(self, request: AsyncRequest, response: AsyncResponse) -> URL:
123 """
124 Return the URL for the redirect to follow.
125 """
126 location = response.headers["Location"]
127
128 url = URL(location, allow_relative=True)
129
130 # Facilitate relative 'Location' headers, as allowed by RFC 7231.
131 # (e.g. '/path/to/resource' instead of 'http://domain.tld/path/to/resource')
132 if url.is_relative_url:
133 url = request.url.join(url)
134
135 # Attach previous fragment if needed (RFC 7231 7.1.2)
136 if request.url.fragment and not url.fragment:
137 url = url.copy_with(fragment=request.url.fragment)
138
139 return url
140
141 def redirect_headers(self, request: AsyncRequest, url: URL) -> Headers:
142 """
143 Strip Authorization headers when responses are redirected away from
144 the origin.
145 """
146 headers = Headers(request.headers)
147 if url.origin != request.url.origin:
148 del headers["Authorization"]
149 del headers["host"]
150 return headers
151
152 def redirect_content(self, request: AsyncRequest, method: str) -> bytes:
153 """
154 Return the body that should be used for the redirect request.
155 """
156 if method != request.method and method == "GET":
157 return b""
158 if request.is_streaming:
159 raise RedirectBodyUnavailable()
160 return request.content
161
[end of httpx/middleware.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/middleware.py b/httpx/middleware.py
--- a/httpx/middleware.py
+++ b/httpx/middleware.py
@@ -88,7 +88,7 @@
) -> AsyncRequest:
method = self.redirect_method(request, response)
url = self.redirect_url(request, response)
- headers = self.redirect_headers(request, url) # TODO: merge headers?
+ headers = self.redirect_headers(request, url, method) # TODO: merge headers?
content = self.redirect_content(request, method)
cookies = Cookies(self.cookies)
cookies.update(request.cookies)
@@ -138,15 +138,24 @@
return url
- def redirect_headers(self, request: AsyncRequest, url: URL) -> Headers:
+ def redirect_headers(self, request: AsyncRequest, url: URL, method: str) -> Headers:
"""
- Strip Authorization headers when responses are redirected away from
- the origin.
+ Return the headers that should be used for the redirect request.
"""
headers = Headers(request.headers)
+
if url.origin != request.url.origin:
+ # Strip Authorization headers when responses are redirected away from
+ # the origin.
del headers["Authorization"]
- del headers["host"]
+ del headers["Host"]
+
+ if method != request.method and method == "GET":
+ # If we've switch to a 'GET' request, then strip any headers which
+ # are only relevant to the request body.
+ del headers["Content-Length"]
+ del headers["Transfer-Encoding"]
+
return headers
def redirect_content(self, request: AsyncRequest, method: str) -> bytes:
| {"golden_diff": "diff --git a/httpx/middleware.py b/httpx/middleware.py\n--- a/httpx/middleware.py\n+++ b/httpx/middleware.py\n@@ -88,7 +88,7 @@\n ) -> AsyncRequest:\n method = self.redirect_method(request, response)\n url = self.redirect_url(request, response)\n- headers = self.redirect_headers(request, url) # TODO: merge headers?\n+ headers = self.redirect_headers(request, url, method) # TODO: merge headers?\n content = self.redirect_content(request, method)\n cookies = Cookies(self.cookies)\n cookies.update(request.cookies)\n@@ -138,15 +138,24 @@\n \n return url\n \n- def redirect_headers(self, request: AsyncRequest, url: URL) -> Headers:\n+ def redirect_headers(self, request: AsyncRequest, url: URL, method: str) -> Headers:\n \"\"\"\n- Strip Authorization headers when responses are redirected away from\n- the origin.\n+ Return the headers that should be used for the redirect request.\n \"\"\"\n headers = Headers(request.headers)\n+\n if url.origin != request.url.origin:\n+ # Strip Authorization headers when responses are redirected away from\n+ # the origin.\n del headers[\"Authorization\"]\n- del headers[\"host\"]\n+ del headers[\"Host\"]\n+\n+ if method != request.method and method == \"GET\":\n+ # If we've switch to a 'GET' request, then strip any headers which\n+ # are only relevant to the request body.\n+ del headers[\"Content-Length\"]\n+ del headers[\"Transfer-Encoding\"]\n+\n return headers\n \n def redirect_content(self, request: AsyncRequest, method: str) -> bytes:\n", "issue": "h11._util.LocalProtocolError: Too little data for declared Content-Length\nclient POC:\r\n\r\n```python\r\nimport asyncio\r\nimport logging\r\nimport httpx\r\n\r\nlogging.basicConfig(level=logging.DEBUG)\r\n\r\n\r\nasync def test():\r\n client = httpx.AsyncClient()\r\n url = 'http://127.0.0.1:8000/debug'\r\n resp = await client.post(url, data='debug', allow_redirects=True)\r\n print(resp.content)\r\n\r\n\r\nif __name__ == '__main__':\r\n asyncio.get_event_loop().run_until_complete(test())\r\n```\r\n\r\napp POC:\r\n\r\n```python\r\nfrom starlette.responses import RedirectResponse\r\nfrom starlette.applications import Starlette\r\nimport uvicorn\r\n\r\napp = Starlette(debug=True)\r\n\r\[email protected]('/debug', methods=['POST', 'GET'])\r\nasync def debug(request):\r\n return RedirectResponse(url='https://httpbin.org/headers', status_code=302)\r\n\r\nif __name__ == '__main__':\r\n uvicorn.run(app)\r\n```\r\n\r\nlog:\r\n```\r\nDEBUG:asyncio:Using selector: KqueueSelector\r\nDEBUG:httpx.dispatch.connection_pool:new_connection connection=HTTPConnection(origin=Origin(scheme='http' host='127.0.0.1' port=8000))\r\nDEBUG:httpx.dispatch.connection:start_connect host='127.0.0.1' port=8000 timeout=TimeoutConfig(timeout=5.0)\r\nDEBUG:httpx.dispatch.connection:connected http_version='HTTP/1.1'\r\nDEBUG:httpx.dispatch.http11:send_headers method='POST' target='/debug' headers=Headers({'host': '127.0.0.1:8000', 'user-agent': 'python-httpx/0.7.2', 'accept': '*/*', 'content-length': '5', 'accept-encoding': 'gzip, deflate', 'connection': 'keep-alive'})\r\nDEBUG:httpx.dispatch.http11:receive_event event=NEED_DATA\r\nDEBUG:httpx.dispatch.http11:send_data data=Data(<5 bytes>)\r\nDEBUG:httpx.dispatch.http11:receive_event event=Response(status_code=302, headers=[(b'date', b'Tue, 03 Sep 2019 03:50:53 GMT'), (b'server', b'uvicorn'), (b'location', b'https://httpbin.org/headers'), (b'transfer-encoding', b'chunked')], http_version=b'1.1', reason=b'Found')\r\nDEBUG:httpx.dispatch.http11:receive_event event=EndOfMessage(headers=[])\r\nDEBUG:httpx.dispatch.http11:response_closed our_state=DONE their_state=DONE\r\nDEBUG:httpx.dispatch.connection_pool:release_connection connection=HTTPConnection(origin=Origin(scheme='http' host='127.0.0.1' port=8000))\r\nDEBUG:httpx.dispatch.connection_pool:new_connection connection=HTTPConnection(origin=Origin(scheme='https' host='httpbin.org' port=443))\r\nDEBUG:httpx.dispatch.connection:start_connect host='httpbin.org' port=443 timeout=TimeoutConfig(timeout=5.0)\r\nDEBUG:httpx.dispatch.connection:connected http_version='HTTP/1.1'\r\nDEBUG:httpx.dispatch.http11:send_headers method='GET' target='/headers' headers=Headers({'host': 'httpbin.org', 'user-agent': 'python-httpx/0.7.2', 'accept': '*/*', 'content-length': '5', 'accept-encoding': 'gzip, deflate', 'connection': 'keep-alive'})\r\nDEBUG:httpx.dispatch.http11:receive_event event=NEED_DATA\r\n\r\n\r\nTraceback (most recent call last):\r\n File \"http3/httpx/dispatch/http11.py\", line 53, in send\r\n http_version, status_code, headers = await self._receive_response(timeout)\r\n File \"http3/httpx/dispatch/http11.py\", line 133, in _receive_response\r\n event = await self._receive_event(timeout)\r\n File \"http3/httpx/dispatch/http11.py\", line 174, in _receive_event\r\n self.READ_NUM_BYTES, timeout, flag=self.timeout_flag\r\n File \"http3/httpx/concurrency/asyncio.py\", line 92, in read\r\n raise ReadTimeout() from None\r\nhttp3.httpx.exceptions.ReadTimeout\r\n\r\nDuring handling of the above exception, another exception occurred:\r\n\r\nTraceback (most recent call last):\r\n File \"test_proto.py\", line 16, in <module>\r\n asyncio.get_event_loop().run_until_complete(test())\r\n File \"/lib/python3.7/asyncio/base_events.py\", line 584, in run_until_complete\r\n return future.result()\r\n File \"test_proto.py\", line 11, in test\r\n resp = await client.post(url, data='debug', allow_redirects=True)\r\n File \"http3/httpx/client.py\", line 415, in post\r\n trust_env=trust_env,\r\n File \"http3/httpx/client.py\", line 566, in request\r\n trust_env=trust_env,\r\n File \"http3/httpx/client.py\", line 237, in send\r\n return await get_response(request)\r\n File \"http3/httpx/middleware.py\", line 72, in __call__\r\n return await self(next_request, get_response)\r\n File \"http3/httpx/middleware.py\", line 62, in __call__\r\n response = await get_response(request)\r\n File \"http3/httpx/client.py\", line 202, in get_response\r\n request, verify=verify, cert=cert, timeout=timeout\r\n File \"http3/httpx/dispatch/connection_pool.py\", line 126, in send\r\n raise exc\r\n File \"http3/httpx/dispatch/connection_pool.py\", line 121, in send\r\n request, verify=verify, cert=cert, timeout=timeout\r\n File \"http3/httpx/dispatch/connection.py\", line 65, in send\r\n response = await self.h11_connection.send(request, timeout=timeout)\r\n File \"http3/httpx/dispatch/http11.py\", line 53, in send\r\n http_version, status_code, headers = await self._receive_response(timeout)\r\n File \"http3/httpx/concurrency/asyncio.py\", line 285, in __aexit__\r\n await self.task\r\n File \"http3/httpx/dispatch/http11.py\", line 108, in _send_request_data\r\n await self._send_event(event, timeout)\r\n File \"http3/httpx/dispatch/http11.py\", line 123, in _send_event\r\n bytes_to_send = self.h11_state.send(event)\r\n File \"site-packages/h11/_connection.py\", line 469, in send\r\n data_list = self.send_with_data_passthrough(event)\r\n File \"site-packages/h11/_connection.py\", line 502, in send_with_data_passthrough\r\n writer(event, data_list.append)\r\n File \"site-packages/h11/_writers.py\", line 79, in __call__\r\n self.send_eom(event.headers, write)\r\n File \"site-packages/h11/_writers.py\", line 102, in send_eom\r\n raise LocalProtocolError(\"Too little data for declared Content-Length\")\r\nh11._util.LocalProtocolError: Too little data for declared Content-Length\r\n```\r\n\n", "before_files": [{"content": "import functools\nimport typing\nfrom base64 import b64encode\n\nfrom .config import DEFAULT_MAX_REDIRECTS\nfrom .exceptions import RedirectBodyUnavailable, RedirectLoop, TooManyRedirects\nfrom .models import URL, AsyncRequest, AsyncResponse, Cookies, Headers\nfrom .status_codes import codes\n\n\nclass BaseMiddleware:\n async def __call__(\n self, request: AsyncRequest, get_response: typing.Callable\n ) -> AsyncResponse:\n raise NotImplementedError # pragma: no cover\n\n\nclass BasicAuthMiddleware(BaseMiddleware):\n def __init__(\n self, username: typing.Union[str, bytes], password: typing.Union[str, bytes]\n ):\n if isinstance(username, str):\n username = username.encode(\"latin1\")\n\n if isinstance(password, str):\n password = password.encode(\"latin1\")\n\n userpass = b\":\".join((username, password))\n token = b64encode(userpass).decode().strip()\n\n self.authorization_header = f\"Basic {token}\"\n\n async def __call__(\n self, request: AsyncRequest, get_response: typing.Callable\n ) -> AsyncResponse:\n request.headers[\"Authorization\"] = self.authorization_header\n return await get_response(request)\n\n\nclass CustomAuthMiddleware(BaseMiddleware):\n def __init__(self, auth: typing.Callable[[AsyncRequest], AsyncRequest]):\n self.auth = auth\n\n async def __call__(\n self, request: AsyncRequest, get_response: typing.Callable\n ) -> AsyncResponse:\n request = self.auth(request)\n return await get_response(request)\n\n\nclass RedirectMiddleware(BaseMiddleware):\n def __init__(\n self,\n allow_redirects: bool = True,\n max_redirects: int = DEFAULT_MAX_REDIRECTS,\n cookies: typing.Optional[Cookies] = None,\n ):\n self.allow_redirects = allow_redirects\n self.max_redirects = max_redirects\n self.cookies = cookies\n self.history: typing.List[AsyncResponse] = []\n\n async def __call__(\n self, request: AsyncRequest, get_response: typing.Callable\n ) -> AsyncResponse:\n if len(self.history) > self.max_redirects:\n raise TooManyRedirects()\n if request.url in (response.url for response in self.history):\n raise RedirectLoop()\n\n response = await get_response(request)\n response.history = list(self.history)\n\n if not response.is_redirect:\n return response\n\n self.history.append(response)\n next_request = self.build_redirect_request(request, response)\n\n if self.allow_redirects:\n return await self(next_request, get_response)\n\n response.call_next = functools.partial(self, next_request, get_response)\n return response\n\n def build_redirect_request(\n self, request: AsyncRequest, response: AsyncResponse\n ) -> AsyncRequest:\n method = self.redirect_method(request, response)\n url = self.redirect_url(request, response)\n headers = self.redirect_headers(request, url) # TODO: merge headers?\n content = self.redirect_content(request, method)\n cookies = Cookies(self.cookies)\n cookies.update(request.cookies)\n return AsyncRequest(\n method=method, url=url, headers=headers, data=content, cookies=cookies\n )\n\n def redirect_method(self, request: AsyncRequest, response: AsyncResponse) -> str:\n \"\"\"\n When being redirected we may want to change the method of the request\n based on certain specs or browser behavior.\n \"\"\"\n method = request.method\n\n # https://tools.ietf.org/html/rfc7231#section-6.4.4\n if response.status_code == codes.SEE_OTHER and method != \"HEAD\":\n method = \"GET\"\n\n # Do what the browsers do, despite standards...\n # Turn 302s into GETs.\n if response.status_code == codes.FOUND and method != \"HEAD\":\n method = \"GET\"\n\n # If a POST is responded to with a 301, turn it into a GET.\n # This bizarre behaviour is explained in 'requests' issue 1704.\n if response.status_code == codes.MOVED_PERMANENTLY and method == \"POST\":\n method = \"GET\"\n\n return method\n\n def redirect_url(self, request: AsyncRequest, response: AsyncResponse) -> URL:\n \"\"\"\n Return the URL for the redirect to follow.\n \"\"\"\n location = response.headers[\"Location\"]\n\n url = URL(location, allow_relative=True)\n\n # Facilitate relative 'Location' headers, as allowed by RFC 7231.\n # (e.g. '/path/to/resource' instead of 'http://domain.tld/path/to/resource')\n if url.is_relative_url:\n url = request.url.join(url)\n\n # Attach previous fragment if needed (RFC 7231 7.1.2)\n if request.url.fragment and not url.fragment:\n url = url.copy_with(fragment=request.url.fragment)\n\n return url\n\n def redirect_headers(self, request: AsyncRequest, url: URL) -> Headers:\n \"\"\"\n Strip Authorization headers when responses are redirected away from\n the origin.\n \"\"\"\n headers = Headers(request.headers)\n if url.origin != request.url.origin:\n del headers[\"Authorization\"]\n del headers[\"host\"]\n return headers\n\n def redirect_content(self, request: AsyncRequest, method: str) -> bytes:\n \"\"\"\n Return the body that should be used for the redirect request.\n \"\"\"\n if method != request.method and method == \"GET\":\n return b\"\"\n if request.is_streaming:\n raise RedirectBodyUnavailable()\n return request.content\n", "path": "httpx/middleware.py"}]} | 3,730 | 369 |
gh_patches_debug_11372 | rasdani/github-patches | git_diff | pre-commit__pre-commit-2005 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
Fails when force pushing unrelated histories
pre-commit looks to find difference between remote and local branches as pre-commit wants to know the files changed. But in case of force, git correctly fails to generate diff.
Expected: pre-commit can run all the hooks that has pass-filename=false as they do not require diffs.
Thanks for the awesome stuff!
</issue>
<code>
[start of pre_commit/git.py]
1 import logging
2 import os.path
3 import sys
4 from typing import Dict
5 from typing import List
6 from typing import MutableMapping
7 from typing import Optional
8 from typing import Set
9
10 from pre_commit.errors import FatalError
11 from pre_commit.util import CalledProcessError
12 from pre_commit.util import cmd_output
13 from pre_commit.util import cmd_output_b
14
15
16 logger = logging.getLogger(__name__)
17
18
19 def zsplit(s: str) -> List[str]:
20 s = s.strip('\0')
21 if s:
22 return s.split('\0')
23 else:
24 return []
25
26
27 def no_git_env(
28 _env: Optional[MutableMapping[str, str]] = None,
29 ) -> Dict[str, str]:
30 # Too many bugs dealing with environment variables and GIT:
31 # https://github.com/pre-commit/pre-commit/issues/300
32 # In git 2.6.3 (maybe others), git exports GIT_WORK_TREE while running
33 # pre-commit hooks
34 # In git 1.9.1 (maybe others), git exports GIT_DIR and GIT_INDEX_FILE
35 # while running pre-commit hooks in submodules.
36 # GIT_DIR: Causes git clone to clone wrong thing
37 # GIT_INDEX_FILE: Causes 'error invalid object ...' during commit
38 _env = _env if _env is not None else os.environ
39 return {
40 k: v for k, v in _env.items()
41 if not k.startswith('GIT_') or
42 k in {
43 'GIT_EXEC_PATH', 'GIT_SSH', 'GIT_SSH_COMMAND', 'GIT_SSL_CAINFO',
44 'GIT_SSL_NO_VERIFY',
45 }
46 }
47
48
49 def get_root() -> str:
50 # Git 2.25 introduced a change to "rev-parse --show-toplevel" that exposed
51 # underlying volumes for Windows drives mapped with SUBST. We use
52 # "rev-parse --show-cdup" to get the appropriate path, but must perform
53 # an extra check to see if we are in the .git directory.
54 try:
55 root = os.path.abspath(
56 cmd_output('git', 'rev-parse', '--show-cdup')[1].strip(),
57 )
58 git_dir = os.path.abspath(get_git_dir())
59 except CalledProcessError:
60 raise FatalError(
61 'git failed. Is it installed, and are you in a Git repository '
62 'directory?',
63 )
64 if os.path.samefile(root, git_dir):
65 raise FatalError(
66 'git toplevel unexpectedly empty! make sure you are not '
67 'inside the `.git` directory of your repository.',
68 )
69 return root
70
71
72 def get_git_dir(git_root: str = '.') -> str:
73 opts = ('--git-common-dir', '--git-dir')
74 _, out, _ = cmd_output('git', 'rev-parse', *opts, cwd=git_root)
75 for line, opt in zip(out.splitlines(), opts):
76 if line != opt: # pragma: no branch (git < 2.5)
77 return os.path.normpath(os.path.join(git_root, line))
78 else:
79 raise AssertionError('unreachable: no git dir')
80
81
82 def get_remote_url(git_root: str) -> str:
83 _, out, _ = cmd_output('git', 'config', 'remote.origin.url', cwd=git_root)
84 return out.strip()
85
86
87 def is_in_merge_conflict() -> bool:
88 git_dir = get_git_dir('.')
89 return (
90 os.path.exists(os.path.join(git_dir, 'MERGE_MSG')) and
91 os.path.exists(os.path.join(git_dir, 'MERGE_HEAD'))
92 )
93
94
95 def parse_merge_msg_for_conflicts(merge_msg: bytes) -> List[str]:
96 # Conflicted files start with tabs
97 return [
98 line.lstrip(b'#').strip().decode()
99 for line in merge_msg.splitlines()
100 # '#\t' for git 2.4.1
101 if line.startswith((b'\t', b'#\t'))
102 ]
103
104
105 def get_conflicted_files() -> Set[str]:
106 logger.info('Checking merge-conflict files only.')
107 # Need to get the conflicted files from the MERGE_MSG because they could
108 # have resolved the conflict by choosing one side or the other
109 with open(os.path.join(get_git_dir('.'), 'MERGE_MSG'), 'rb') as f:
110 merge_msg = f.read()
111 merge_conflict_filenames = parse_merge_msg_for_conflicts(merge_msg)
112
113 # This will get the rest of the changes made after the merge.
114 # If they resolved the merge conflict by choosing a mesh of both sides
115 # this will also include the conflicted files
116 tree_hash = cmd_output('git', 'write-tree')[1].strip()
117 merge_diff_filenames = zsplit(
118 cmd_output(
119 'git', 'diff', '--name-only', '--no-ext-diff', '-z',
120 '-m', tree_hash, 'HEAD', 'MERGE_HEAD',
121 )[1],
122 )
123 return set(merge_conflict_filenames) | set(merge_diff_filenames)
124
125
126 def get_staged_files(cwd: Optional[str] = None) -> List[str]:
127 return zsplit(
128 cmd_output(
129 'git', 'diff', '--staged', '--name-only', '--no-ext-diff', '-z',
130 # Everything except for D
131 '--diff-filter=ACMRTUXB',
132 cwd=cwd,
133 )[1],
134 )
135
136
137 def intent_to_add_files() -> List[str]:
138 _, stdout, _ = cmd_output(
139 'git', 'status', '--ignore-submodules', '--porcelain', '-z',
140 )
141 parts = list(reversed(zsplit(stdout)))
142 intent_to_add = []
143 while parts:
144 line = parts.pop()
145 status, filename = line[:3], line[3:]
146 if status[0] in {'C', 'R'}: # renames / moves have an additional arg
147 parts.pop()
148 if status[1] == 'A':
149 intent_to_add.append(filename)
150 return intent_to_add
151
152
153 def get_all_files() -> List[str]:
154 return zsplit(cmd_output('git', 'ls-files', '-z')[1])
155
156
157 def get_changed_files(old: str, new: str) -> List[str]:
158 return zsplit(
159 cmd_output(
160 'git', 'diff', '--name-only', '--no-ext-diff', '-z',
161 f'{old}...{new}',
162 )[1],
163 )
164
165
166 def head_rev(remote: str) -> str:
167 _, out, _ = cmd_output('git', 'ls-remote', '--exit-code', remote, 'HEAD')
168 return out.split()[0]
169
170
171 def has_diff(*args: str, repo: str = '.') -> bool:
172 cmd = ('git', 'diff', '--quiet', '--no-ext-diff', *args)
173 return cmd_output_b(*cmd, cwd=repo, retcode=None)[0] == 1
174
175
176 def has_core_hookpaths_set() -> bool:
177 _, out, _ = cmd_output_b('git', 'config', 'core.hooksPath', retcode=None)
178 return bool(out.strip())
179
180
181 def init_repo(path: str, remote: str) -> None:
182 if os.path.isdir(remote):
183 remote = os.path.abspath(remote)
184
185 env = no_git_env()
186 # avoid the user's template so that hooks do not recurse
187 cmd_output_b('git', 'init', '--template=', path, env=env)
188 cmd_output_b('git', 'remote', 'add', 'origin', remote, cwd=path, env=env)
189
190
191 def commit(repo: str = '.') -> None:
192 env = no_git_env()
193 name, email = 'pre-commit', '[email protected]'
194 env['GIT_AUTHOR_NAME'] = env['GIT_COMMITTER_NAME'] = name
195 env['GIT_AUTHOR_EMAIL'] = env['GIT_COMMITTER_EMAIL'] = email
196 cmd = ('git', 'commit', '--no-edit', '--no-gpg-sign', '-n', '-minit')
197 cmd_output_b(*cmd, cwd=repo, env=env)
198
199
200 def git_path(name: str, repo: str = '.') -> str:
201 _, out, _ = cmd_output('git', 'rev-parse', '--git-path', name, cwd=repo)
202 return os.path.join(repo, out.strip())
203
204
205 def check_for_cygwin_mismatch() -> None:
206 """See https://github.com/pre-commit/pre-commit/issues/354"""
207 if sys.platform in ('cygwin', 'win32'): # pragma: no cover (windows)
208 is_cygwin_python = sys.platform == 'cygwin'
209 try:
210 toplevel = get_root()
211 except FatalError: # skip the check if we're not in a git repo
212 return
213 is_cygwin_git = toplevel.startswith('/')
214
215 if is_cygwin_python ^ is_cygwin_git:
216 exe_type = {True: '(cygwin)', False: '(windows)'}
217 logger.warn(
218 f'pre-commit has detected a mix of cygwin python / git\n'
219 f'This combination is not supported, it is likely you will '
220 f'receive an error later in the program.\n'
221 f'Make sure to use cygwin git+python while using cygwin\n'
222 f'These can be installed through the cygwin installer.\n'
223 f' - python {exe_type[is_cygwin_python]}\n'
224 f' - git {exe_type[is_cygwin_git]}\n',
225 )
226
[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
@@ -155,12 +155,15 @@
def get_changed_files(old: str, new: str) -> List[str]:
- return zsplit(
- cmd_output(
- 'git', 'diff', '--name-only', '--no-ext-diff', '-z',
- f'{old}...{new}',
- )[1],
- )
+ diff_cmd = ('git', 'diff', '--name-only', '--no-ext-diff', '-z')
+ try:
+ _, out, _ = cmd_output(*diff_cmd, f'{old}...{new}')
+ except CalledProcessError: # pragma: no cover (new git)
+ # on newer git where old and new do not have a merge base git fails
+ # so we try a full diff (this is what old git did for us!)
+ _, out, _ = cmd_output(*diff_cmd, f'{old}..{new}')
+
+ return zsplit(out)
def head_rev(remote: str) -> str:
| {"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@@ -155,12 +155,15 @@\n \n \n def get_changed_files(old: str, new: str) -> List[str]:\n- return zsplit(\n- cmd_output(\n- 'git', 'diff', '--name-only', '--no-ext-diff', '-z',\n- f'{old}...{new}',\n- )[1],\n- )\n+ diff_cmd = ('git', 'diff', '--name-only', '--no-ext-diff', '-z')\n+ try:\n+ _, out, _ = cmd_output(*diff_cmd, f'{old}...{new}')\n+ except CalledProcessError: # pragma: no cover (new git)\n+ # on newer git where old and new do not have a merge base git fails\n+ # so we try a full diff (this is what old git did for us!)\n+ _, out, _ = cmd_output(*diff_cmd, f'{old}..{new}')\n+\n+ return zsplit(out)\n \n \n def head_rev(remote: str) -> str:\n", "issue": "Fails when force pushing unrelated histories\npre-commit looks to find difference between remote and local branches as pre-commit wants to know the files changed. But in case of force, git correctly fails to generate diff. \r\n\r\nExpected: pre-commit can run all the hooks that has pass-filename=false as they do not require diffs.\r\n\r\nThanks for the awesome stuff!\n", "before_files": [{"content": "import logging\nimport os.path\nimport sys\nfrom typing import Dict\nfrom typing import List\nfrom typing import MutableMapping\nfrom typing import Optional\nfrom typing import Set\n\nfrom pre_commit.errors import FatalError\nfrom pre_commit.util import CalledProcessError\nfrom pre_commit.util import cmd_output\nfrom pre_commit.util import cmd_output_b\n\n\nlogger = logging.getLogger(__name__)\n\n\ndef zsplit(s: str) -> List[str]:\n s = s.strip('\\0')\n if s:\n return s.split('\\0')\n else:\n return []\n\n\ndef no_git_env(\n _env: Optional[MutableMapping[str, str]] = None,\n) -> Dict[str, str]:\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 _env = _env if _env is not None else os.environ\n return {\n k: v for k, v in _env.items()\n if not k.startswith('GIT_') or\n k in {\n 'GIT_EXEC_PATH', 'GIT_SSH', 'GIT_SSH_COMMAND', 'GIT_SSL_CAINFO',\n 'GIT_SSL_NO_VERIFY',\n }\n }\n\n\ndef get_root() -> str:\n # Git 2.25 introduced a change to \"rev-parse --show-toplevel\" that exposed\n # underlying volumes for Windows drives mapped with SUBST. We use\n # \"rev-parse --show-cdup\" to get the appropriate path, but must perform\n # an extra check to see if we are in the .git directory.\n try:\n root = os.path.abspath(\n cmd_output('git', 'rev-parse', '--show-cdup')[1].strip(),\n )\n git_dir = os.path.abspath(get_git_dir())\n except CalledProcessError:\n raise FatalError(\n 'git failed. Is it installed, and are you in a Git repository '\n 'directory?',\n )\n if os.path.samefile(root, git_dir):\n raise FatalError(\n 'git toplevel unexpectedly empty! make sure you are not '\n 'inside the `.git` directory of your repository.',\n )\n return root\n\n\ndef get_git_dir(git_root: str = '.') -> str:\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: str) -> str:\n _, out, _ = cmd_output('git', 'config', 'remote.origin.url', cwd=git_root)\n return out.strip()\n\n\ndef is_in_merge_conflict() -> bool:\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: bytes) -> List[str]:\n # Conflicted files start with tabs\n return [\n line.lstrip(b'#').strip().decode()\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() -> Set[str]:\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(\n cmd_output(\n 'git', 'diff', '--name-only', '--no-ext-diff', '-z',\n '-m', tree_hash, 'HEAD', 'MERGE_HEAD',\n )[1],\n )\n return set(merge_conflict_filenames) | set(merge_diff_filenames)\n\n\ndef get_staged_files(cwd: Optional[str] = None) -> List[str]:\n return zsplit(\n cmd_output(\n 'git', 'diff', '--staged', '--name-only', '--no-ext-diff', '-z',\n # Everything except for D\n '--diff-filter=ACMRTUXB',\n cwd=cwd,\n )[1],\n )\n\n\ndef intent_to_add_files() -> List[str]:\n _, stdout, _ = cmd_output(\n 'git', 'status', '--ignore-submodules', '--porcelain', '-z',\n )\n parts = list(reversed(zsplit(stdout)))\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() -> List[str]:\n return zsplit(cmd_output('git', 'ls-files', '-z')[1])\n\n\ndef get_changed_files(old: str, new: str) -> List[str]:\n return zsplit(\n cmd_output(\n 'git', 'diff', '--name-only', '--no-ext-diff', '-z',\n f'{old}...{new}',\n )[1],\n )\n\n\ndef head_rev(remote: str) -> str:\n _, out, _ = cmd_output('git', 'ls-remote', '--exit-code', remote, 'HEAD')\n return out.split()[0]\n\n\ndef has_diff(*args: str, repo: str = '.') -> bool:\n cmd = ('git', 'diff', '--quiet', '--no-ext-diff', *args)\n return cmd_output_b(*cmd, cwd=repo, retcode=None)[0] == 1\n\n\ndef has_core_hookpaths_set() -> bool:\n _, out, _ = cmd_output_b('git', 'config', 'core.hooksPath', retcode=None)\n return bool(out.strip())\n\n\ndef init_repo(path: str, remote: str) -> None:\n if os.path.isdir(remote):\n remote = os.path.abspath(remote)\n\n env = no_git_env()\n # avoid the user's template so that hooks do not recurse\n cmd_output_b('git', 'init', '--template=', path, env=env)\n cmd_output_b('git', 'remote', 'add', 'origin', remote, cwd=path, env=env)\n\n\ndef commit(repo: str = '.') -> None:\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_b(*cmd, cwd=repo, env=env)\n\n\ndef git_path(name: str, repo: str = '.') -> str:\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() -> None:\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 try:\n toplevel = get_root()\n except FatalError: # skip the check if we're not in a git repo\n return\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 f'pre-commit has detected a mix of cygwin python / git\\n'\n f'This combination is not supported, it is likely you will '\n f'receive an error later in the program.\\n'\n f'Make sure to use cygwin git+python while using cygwin\\n'\n f'These can be installed through the cygwin installer.\\n'\n f' - python {exe_type[is_cygwin_python]}\\n'\n f' - git {exe_type[is_cygwin_git]}\\n',\n )\n", "path": "pre_commit/git.py"}]} | 3,248 | 255 |
gh_patches_debug_36399 | rasdani/github-patches | git_diff | translate__pootle-4146 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
update_tmserver shouldn't use disabled projects
`update_tmserver` command shouldn't use disabled projects unless they are specifically requested.
By default we shouldn't use them. If the user supplies a command line option or uses a specific project name they we should load that project into the TM.
</issue>
<code>
[start of pootle/apps/pootle_app/management/commands/update_tmserver.py]
1 #!/usr/bin/env python
2 # -*- coding: utf-8 -*-
3 #
4 # Copyright (C) Pootle contributors.
5 #
6 # This file is a part of the Pootle project. It is distributed under the GPL3
7 # or later license. See the LICENSE file for a copy of the license and the
8 # AUTHORS file for copyright and authorship information.
9
10 from hashlib import md5
11 from optparse import make_option
12 import os
13 import sys
14
15 # This must be run before importing Django.
16 os.environ['DJANGO_SETTINGS_MODULE'] = 'pootle.settings'
17
18 from elasticsearch import helpers, Elasticsearch
19 from translate.storage import factory
20
21 from django.conf import settings
22 from django.core.management.base import BaseCommand, CommandError
23
24 from pootle_store.models import Unit
25
26
27 BULK_CHUNK_SIZE = 5000
28
29
30 class DBParser(object):
31
32 def __init__(self, *args, **kwargs):
33 self.stdout = kwargs.pop('stdout')
34 self.INDEX_NAME = kwargs.pop('index', None)
35
36 def get_units(self, *filenames):
37 """Gets the units to import and its total count."""
38 units_qs = Unit.simple_objects \
39 .exclude(target_f__isnull=True) \
40 .exclude(target_f__exact='') \
41 .filter(revision__gt=self.last_indexed_revision) \
42 .select_related(
43 'submitted_by',
44 'store',
45 'store__translation_project__project',
46 'store__translation_project__language'
47 ).values(
48 'id',
49 'revision',
50 'source_f',
51 'target_f',
52 'submitted_by__username',
53 'submitted_by__full_name',
54 'submitted_by__email',
55 'store__translation_project__project__fullname',
56 'store__pootle_path',
57 'store__translation_project__language__code'
58 ).order_by()
59
60 return units_qs.iterator(), units_qs.count()
61
62 def get_unit_data(self, unit):
63 """Return dict with data to import for a single unit."""
64 fullname = (unit['submitted_by__full_name'] or
65 unit['submitted_by__username'])
66
67 email_md5 = None
68 if unit['submitted_by__email']:
69 email_md5 = md5(unit['submitted_by__email']).hexdigest()
70
71 return {
72 '_index': self.INDEX_NAME,
73 '_type': unit['store__translation_project__language__code'],
74 '_id': unit['id'],
75 'revision': int(unit['revision']),
76 'project': unit['store__translation_project__project__fullname'],
77 'path': unit['store__pootle_path'],
78 'username': unit['submitted_by__username'],
79 'fullname': fullname,
80 'email_md5': email_md5,
81 'source': unit['source_f'],
82 'target': unit['target_f'],
83 }
84
85
86 class FileParser(object):
87
88 def __init__(self, *args, **kwargs):
89 self.stdout = kwargs.pop('stdout')
90 self.INDEX_NAME = kwargs.pop('index', None)
91 self.target_language = kwargs.pop('language', None)
92 self.project = kwargs.pop('project', None)
93
94 def get_units(self, *filenames):
95 """Gets the units to import and its total count."""
96 units = []
97 all_filenames = set()
98
99 for filename in filenames:
100 if not os.path.exists(filename):
101 self.stdout.write("File %s doesn't exist. Skipping it." %
102 filename)
103 continue
104
105 if os.path.isdir(filename):
106 for dirpath, dirs, fnames in os.walk(filename):
107 if (os.path.basename(dirpath) in
108 ["CVS", ".svn", "_darcs", ".git", ".hg", ".bzr"]):
109
110 continue
111
112 for f in fnames:
113 all_filenames.add(os.path.join(dirpath, f))
114 else:
115 all_filenames.add(filename)
116
117 for filename in all_filenames:
118 store = factory.getobject(filename)
119 if not store.gettargetlanguage() and not self.target_language:
120 raise CommandError("Unable to determine target language for "
121 "'%s'. Try again specifying a fallback "
122 "target language with --target-language" %
123 filename)
124
125 self.filename = filename
126 units.extend([unit for unit in store.units if unit.istranslated()])
127
128 return units, len(units)
129
130 def get_unit_data(self, unit):
131 """Return dict with data to import for a single unit."""
132 target_language = unit.gettargetlanguage()
133 if target_language is None:
134 target_language = self.target_language
135
136 return {
137 '_index': self.INDEX_NAME,
138 '_type': target_language,
139 '_id': unit.getid(),
140 'revision': 0,
141 'project': self.project,
142 'path': self.filename,
143 'username': None,
144 'fullname': None,
145 'email_md5': None,
146 'source': unit.source,
147 'target': unit.target,
148 }
149
150
151 class Command(BaseCommand):
152 help = "Load Translation Memory with translations"
153 args = "[files]"
154 option_list = BaseCommand.option_list + (
155 make_option('--refresh',
156 action='store_true',
157 dest='refresh',
158 default=False,
159 help='Process all items, not just the new ones, so '
160 'existing translations are refreshed'),
161 make_option('--rebuild',
162 action='store_true',
163 dest='rebuild',
164 default=False,
165 help='Drop the entire TM on start and update everything '
166 'from scratch'),
167 make_option('--dry-run',
168 action='store_true',
169 dest='dry_run',
170 default=False,
171 help='Report the number of translations to index and quit'),
172 # External TM specific options.
173 make_option('--tm',
174 action='store',
175 dest='tm',
176 default='local',
177 help="TM to use. TM must exist on settings. TM will be "
178 "created on the server if it doesn't exist"),
179 make_option('--target-language',
180 action='store',
181 dest='target_language',
182 default='',
183 help="Target language to fallback to use in case it can't "
184 "be guessed for any of the input files."),
185 make_option('--display-name',
186 action='store',
187 dest='project',
188 default='',
189 help='Name used when displaying TM matches for these '
190 'translations.'),
191 )
192
193 def _parse_translations(self, *args, **options):
194 units, total = self.parser.get_units(*args)
195
196 if total == 0:
197 self.stdout.write("No translations to index")
198 sys.exit()
199
200 self.stdout.write("%s translations to index" % total)
201
202 if options['dry_run']:
203 sys.exit()
204
205 self.stdout.write("")
206
207 for i, unit in enumerate(units, start=1):
208 if (i % 1000 == 0) or (i == total):
209 percent = "%.1f" % (i * 100.0 / total)
210 self.stdout.write("%s (%s%%)" % (i, percent), ending='\r')
211 self.stdout.flush()
212
213 yield self.parser.get_unit_data(unit)
214
215 if i != total:
216 self.stdout.write("Expected %d, loaded %d." % (total, i))
217
218 def _initialize(self, *args, **options):
219 if not getattr(settings, 'POOTLE_TM_SERVER', False):
220 raise CommandError('POOTLE_TM_SERVER setting is missing.')
221
222 try:
223 self.tm_settings = settings.POOTLE_TM_SERVER[options.get('tm')]
224 except KeyError:
225 raise CommandError("Translation Memory '%s' is not defined in the "
226 "POOTLE_TM_SERVER setting. Please ensure it "
227 "exists and double-check you typed it "
228 "correctly." % options.get('tm'))
229
230 self.INDEX_NAME = self.tm_settings['INDEX_NAME']
231 self.is_local_tm = options.get('tm') == 'local'
232
233 self.es = Elasticsearch([{
234 'host': self.tm_settings['HOST'],
235 'port': self.tm_settings['PORT'],
236 }],
237 retry_on_timeout=True
238 )
239
240 # If files to import have been provided.
241 if len(args):
242 if self.is_local_tm:
243 raise CommandError('You cannot add translations from files to '
244 'a local TM.')
245
246 self.target_language = options.pop('target_language')
247 self.project = options.pop('project')
248
249 if not self.project:
250 raise CommandError('You must specify a project with '
251 '--project.')
252 self.parser = FileParser(stdout=self.stdout, index=self.INDEX_NAME,
253 language=self.target_language,
254 project=self.project)
255 elif not self.is_local_tm:
256 raise CommandError('You cannot add translations from database to '
257 'an external TM.')
258 else:
259 self.parser = DBParser(stdout=self.stdout, index=self.INDEX_NAME)
260
261 def _set_latest_indexed_revision(self, **options):
262 self.last_indexed_revision = -1
263
264 if (not options['rebuild'] and
265 not options['refresh'] and
266 self.es.indices.exists(self.INDEX_NAME)):
267
268 result = self.es.search(
269 index=self.INDEX_NAME,
270 body={
271 'query': {
272 'match_all': {}
273 },
274 'facets': {
275 'stat1': {
276 'statistical': {
277 'field': 'revision'
278 }
279 }
280 }
281 }
282 )
283 self.last_indexed_revision = result['facets']['stat1']['max']
284
285 self.parser.last_indexed_revision = self.last_indexed_revision
286
287 self.stdout.write("Last indexed revision = %s" %
288 self.last_indexed_revision)
289
290 def handle(self, *args, **options):
291 self._initialize(*args, **options)
292
293 if (options['rebuild'] and
294 not options['dry_run'] and
295 self.es.indices.exists(self.INDEX_NAME)):
296
297 self.es.indices.delete(index=self.INDEX_NAME)
298
299 if (not options['dry_run'] and
300 not self.es.indices.exists(self.INDEX_NAME)):
301
302 self.es.indices.create(index=self.INDEX_NAME)
303
304 if self.is_local_tm:
305 self._set_latest_indexed_revision(**options)
306
307 success, _ = helpers.bulk(self.es,
308 self._parse_translations(*args, **options))
309
[end of pootle/apps/pootle_app/management/commands/update_tmserver.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/apps/pootle_app/management/commands/update_tmserver.py b/pootle/apps/pootle_app/management/commands/update_tmserver.py
--- a/pootle/apps/pootle_app/management/commands/update_tmserver.py
+++ b/pootle/apps/pootle_app/management/commands/update_tmserver.py
@@ -32,6 +32,7 @@
def __init__(self, *args, **kwargs):
self.stdout = kwargs.pop('stdout')
self.INDEX_NAME = kwargs.pop('index', None)
+ self.exclude_disabled_projects = not kwargs.pop('disabled_projects')
def get_units(self, *filenames):
"""Gets the units to import and its total count."""
@@ -44,7 +45,14 @@
'store',
'store__translation_project__project',
'store__translation_project__language'
- ).values(
+ )
+
+ if self.exclude_disabled_projects:
+ units_qs = units_qs.exclude(
+ store__translation_project__project__disabled=True
+ )
+
+ units_qs = units_qs.values(
'id',
'revision',
'source_f',
@@ -169,6 +177,12 @@
dest='dry_run',
default=False,
help='Report the number of translations to index and quit'),
+ # Local TM specific options.
+ make_option('--include-disabled-projects',
+ action='store_true',
+ dest='disabled_projects',
+ default=False,
+ help='Add translations from disabled projects'),
# External TM specific options.
make_option('--tm',
action='store',
@@ -256,7 +270,8 @@
raise CommandError('You cannot add translations from database to '
'an external TM.')
else:
- self.parser = DBParser(stdout=self.stdout, index=self.INDEX_NAME)
+ self.parser = DBParser(stdout=self.stdout, index=self.INDEX_NAME,
+ disabled_projects=options.pop('disabled_projects'))
def _set_latest_indexed_revision(self, **options):
self.last_indexed_revision = -1
| {"golden_diff": "diff --git a/pootle/apps/pootle_app/management/commands/update_tmserver.py b/pootle/apps/pootle_app/management/commands/update_tmserver.py\n--- a/pootle/apps/pootle_app/management/commands/update_tmserver.py\n+++ b/pootle/apps/pootle_app/management/commands/update_tmserver.py\n@@ -32,6 +32,7 @@\n def __init__(self, *args, **kwargs):\n self.stdout = kwargs.pop('stdout')\n self.INDEX_NAME = kwargs.pop('index', None)\n+ self.exclude_disabled_projects = not kwargs.pop('disabled_projects')\n \n def get_units(self, *filenames):\n \"\"\"Gets the units to import and its total count.\"\"\"\n@@ -44,7 +45,14 @@\n 'store',\n 'store__translation_project__project',\n 'store__translation_project__language'\n- ).values(\n+ )\n+\n+ if self.exclude_disabled_projects:\n+ units_qs = units_qs.exclude(\n+ store__translation_project__project__disabled=True\n+ )\n+\n+ units_qs = units_qs.values(\n 'id',\n 'revision',\n 'source_f',\n@@ -169,6 +177,12 @@\n dest='dry_run',\n default=False,\n help='Report the number of translations to index and quit'),\n+ # Local TM specific options.\n+ make_option('--include-disabled-projects',\n+ action='store_true',\n+ dest='disabled_projects',\n+ default=False,\n+ help='Add translations from disabled projects'),\n # External TM specific options.\n make_option('--tm',\n action='store',\n@@ -256,7 +270,8 @@\n raise CommandError('You cannot add translations from database to '\n 'an external TM.')\n else:\n- self.parser = DBParser(stdout=self.stdout, index=self.INDEX_NAME)\n+ self.parser = DBParser(stdout=self.stdout, index=self.INDEX_NAME,\n+ disabled_projects=options.pop('disabled_projects'))\n \n def _set_latest_indexed_revision(self, **options):\n self.last_indexed_revision = -1\n", "issue": "update_tmserver shouldn't use disabled projects\n`update_tmserver` command shouldn't use disabled projects unless they are specifically requested.\n\nBy default we shouldn't use them. If the user supplies a command line option or uses a specific project name they we should load that project into the TM.\n\n", "before_files": [{"content": "#!/usr/bin/env python\n# -*- 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\nfrom hashlib import md5\nfrom optparse import make_option\nimport os\nimport sys\n\n# This must be run before importing Django.\nos.environ['DJANGO_SETTINGS_MODULE'] = 'pootle.settings'\n\nfrom elasticsearch import helpers, Elasticsearch\nfrom translate.storage import factory\n\nfrom django.conf import settings\nfrom django.core.management.base import BaseCommand, CommandError\n\nfrom pootle_store.models import Unit\n\n\nBULK_CHUNK_SIZE = 5000\n\n\nclass DBParser(object):\n\n def __init__(self, *args, **kwargs):\n self.stdout = kwargs.pop('stdout')\n self.INDEX_NAME = kwargs.pop('index', None)\n\n def get_units(self, *filenames):\n \"\"\"Gets the units to import and its total count.\"\"\"\n units_qs = Unit.simple_objects \\\n .exclude(target_f__isnull=True) \\\n .exclude(target_f__exact='') \\\n .filter(revision__gt=self.last_indexed_revision) \\\n .select_related(\n 'submitted_by',\n 'store',\n 'store__translation_project__project',\n 'store__translation_project__language'\n ).values(\n 'id',\n 'revision',\n 'source_f',\n 'target_f',\n 'submitted_by__username',\n 'submitted_by__full_name',\n 'submitted_by__email',\n 'store__translation_project__project__fullname',\n 'store__pootle_path',\n 'store__translation_project__language__code'\n ).order_by()\n\n return units_qs.iterator(), units_qs.count()\n\n def get_unit_data(self, unit):\n \"\"\"Return dict with data to import for a single unit.\"\"\"\n fullname = (unit['submitted_by__full_name'] or\n unit['submitted_by__username'])\n\n email_md5 = None\n if unit['submitted_by__email']:\n email_md5 = md5(unit['submitted_by__email']).hexdigest()\n\n return {\n '_index': self.INDEX_NAME,\n '_type': unit['store__translation_project__language__code'],\n '_id': unit['id'],\n 'revision': int(unit['revision']),\n 'project': unit['store__translation_project__project__fullname'],\n 'path': unit['store__pootle_path'],\n 'username': unit['submitted_by__username'],\n 'fullname': fullname,\n 'email_md5': email_md5,\n 'source': unit['source_f'],\n 'target': unit['target_f'],\n }\n\n\nclass FileParser(object):\n\n def __init__(self, *args, **kwargs):\n self.stdout = kwargs.pop('stdout')\n self.INDEX_NAME = kwargs.pop('index', None)\n self.target_language = kwargs.pop('language', None)\n self.project = kwargs.pop('project', None)\n\n def get_units(self, *filenames):\n \"\"\"Gets the units to import and its total count.\"\"\"\n units = []\n all_filenames = set()\n\n for filename in filenames:\n if not os.path.exists(filename):\n self.stdout.write(\"File %s doesn't exist. Skipping it.\" %\n filename)\n continue\n\n if os.path.isdir(filename):\n for dirpath, dirs, fnames in os.walk(filename):\n if (os.path.basename(dirpath) in\n [\"CVS\", \".svn\", \"_darcs\", \".git\", \".hg\", \".bzr\"]):\n\n continue\n\n for f in fnames:\n all_filenames.add(os.path.join(dirpath, f))\n else:\n all_filenames.add(filename)\n\n for filename in all_filenames:\n store = factory.getobject(filename)\n if not store.gettargetlanguage() and not self.target_language:\n raise CommandError(\"Unable to determine target language for \"\n \"'%s'. Try again specifying a fallback \"\n \"target language with --target-language\" %\n filename)\n\n self.filename = filename\n units.extend([unit for unit in store.units if unit.istranslated()])\n\n return units, len(units)\n\n def get_unit_data(self, unit):\n \"\"\"Return dict with data to import for a single unit.\"\"\"\n target_language = unit.gettargetlanguage()\n if target_language is None:\n target_language = self.target_language\n\n return {\n '_index': self.INDEX_NAME,\n '_type': target_language,\n '_id': unit.getid(),\n 'revision': 0,\n 'project': self.project,\n 'path': self.filename,\n 'username': None,\n 'fullname': None,\n 'email_md5': None,\n 'source': unit.source,\n 'target': unit.target,\n }\n\n\nclass Command(BaseCommand):\n help = \"Load Translation Memory with translations\"\n args = \"[files]\"\n option_list = BaseCommand.option_list + (\n make_option('--refresh',\n action='store_true',\n dest='refresh',\n default=False,\n help='Process all items, not just the new ones, so '\n 'existing translations are refreshed'),\n make_option('--rebuild',\n action='store_true',\n dest='rebuild',\n default=False,\n help='Drop the entire TM on start and update everything '\n 'from scratch'),\n make_option('--dry-run',\n action='store_true',\n dest='dry_run',\n default=False,\n help='Report the number of translations to index and quit'),\n # External TM specific options.\n make_option('--tm',\n action='store',\n dest='tm',\n default='local',\n help=\"TM to use. TM must exist on settings. TM will be \"\n \"created on the server if it doesn't exist\"),\n make_option('--target-language',\n action='store',\n dest='target_language',\n default='',\n help=\"Target language to fallback to use in case it can't \"\n \"be guessed for any of the input files.\"),\n make_option('--display-name',\n action='store',\n dest='project',\n default='',\n help='Name used when displaying TM matches for these '\n 'translations.'),\n )\n\n def _parse_translations(self, *args, **options):\n units, total = self.parser.get_units(*args)\n\n if total == 0:\n self.stdout.write(\"No translations to index\")\n sys.exit()\n\n self.stdout.write(\"%s translations to index\" % total)\n\n if options['dry_run']:\n sys.exit()\n\n self.stdout.write(\"\")\n\n for i, unit in enumerate(units, start=1):\n if (i % 1000 == 0) or (i == total):\n percent = \"%.1f\" % (i * 100.0 / total)\n self.stdout.write(\"%s (%s%%)\" % (i, percent), ending='\\r')\n self.stdout.flush()\n\n yield self.parser.get_unit_data(unit)\n\n if i != total:\n self.stdout.write(\"Expected %d, loaded %d.\" % (total, i))\n\n def _initialize(self, *args, **options):\n if not getattr(settings, 'POOTLE_TM_SERVER', False):\n raise CommandError('POOTLE_TM_SERVER setting is missing.')\n\n try:\n self.tm_settings = settings.POOTLE_TM_SERVER[options.get('tm')]\n except KeyError:\n raise CommandError(\"Translation Memory '%s' is not defined in the \"\n \"POOTLE_TM_SERVER setting. Please ensure it \"\n \"exists and double-check you typed it \"\n \"correctly.\" % options.get('tm'))\n\n self.INDEX_NAME = self.tm_settings['INDEX_NAME']\n self.is_local_tm = options.get('tm') == 'local'\n\n self.es = Elasticsearch([{\n 'host': self.tm_settings['HOST'],\n 'port': self.tm_settings['PORT'],\n }],\n retry_on_timeout=True\n )\n\n # If files to import have been provided.\n if len(args):\n if self.is_local_tm:\n raise CommandError('You cannot add translations from files to '\n 'a local TM.')\n\n self.target_language = options.pop('target_language')\n self.project = options.pop('project')\n\n if not self.project:\n raise CommandError('You must specify a project with '\n '--project.')\n self.parser = FileParser(stdout=self.stdout, index=self.INDEX_NAME,\n language=self.target_language,\n project=self.project)\n elif not self.is_local_tm:\n raise CommandError('You cannot add translations from database to '\n 'an external TM.')\n else:\n self.parser = DBParser(stdout=self.stdout, index=self.INDEX_NAME)\n\n def _set_latest_indexed_revision(self, **options):\n self.last_indexed_revision = -1\n\n if (not options['rebuild'] and\n not options['refresh'] and\n self.es.indices.exists(self.INDEX_NAME)):\n\n result = self.es.search(\n index=self.INDEX_NAME,\n body={\n 'query': {\n 'match_all': {}\n },\n 'facets': {\n 'stat1': {\n 'statistical': {\n 'field': 'revision'\n }\n }\n }\n }\n )\n self.last_indexed_revision = result['facets']['stat1']['max']\n\n self.parser.last_indexed_revision = self.last_indexed_revision\n\n self.stdout.write(\"Last indexed revision = %s\" %\n self.last_indexed_revision)\n\n def handle(self, *args, **options):\n self._initialize(*args, **options)\n\n if (options['rebuild'] and\n not options['dry_run'] and\n self.es.indices.exists(self.INDEX_NAME)):\n\n self.es.indices.delete(index=self.INDEX_NAME)\n\n if (not options['dry_run'] and\n not self.es.indices.exists(self.INDEX_NAME)):\n\n self.es.indices.create(index=self.INDEX_NAME)\n\n if self.is_local_tm:\n self._set_latest_indexed_revision(**options)\n\n success, _ = helpers.bulk(self.es,\n self._parse_translations(*args, **options))\n", "path": "pootle/apps/pootle_app/management/commands/update_tmserver.py"}]} | 3,645 | 466 |
gh_patches_debug_11734 | rasdani/github-patches | git_diff | optuna__optuna-4886 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
RuntimeError caused by fail processing after liveness judgment in distributed optimization
### Expected behavior
Optuna incorporates a Heartbeat mechanism, which evaluates trials by detecting those that haven't recorded a heartbeat within a certain time period and transitions them from "Running" to "Fail". However, the function responsible for this liveness judgment, `_get_stale_trial_ids` within `BaseHeartbeat.fail_stale_trials`, is not atomic. Consequently, during distributed optimization, different processes might acquire the same trial ID, leading to parallel invocations of `storage.set_trial_state_values` for the same trial ID. This can result in a `RuntimeError`, as Optuna triggers a `RuntimeError` when calling `storage.set_trial_state_values` for trials that have already completed.
This issue aims to discuss and address a solution to this problem.
### Environment
- Optuna version: 3.2.0
- Python version: 3.9
- OS: Ubuntu 22.04
- (Optional) Other libraries and their versions:
### Error messages, stack traces, or logs
```shell
Traceback (most recent call last):
File "<string>", line 3, in <module>
File "xxxxx", line 149, in chiran_study_search_task
study.search(n_trials)
File "xxxxx", line 170, in search
self._study.optimize(self._objective, callbacks=[MaxTrialsCallback(n_trials)])
File "/usr/local/lib/python3.9/dist-packages/optuna/study/study.py", line 443, in optimize
_optimize(
File "/usr/local/lib/python3.9/dist-packages/optuna/study/_optimize.py", line 66, in _optimize
_optimize_sequential(
File "/usr/local/lib/python3.9/dist-packages/optuna/study/_optimize.py", line 163, in _optimize_sequential
frozen_trial = _run_trial(study, func, catch)
File "/usr/local/lib/python3.9/dist-packages/optuna/study/_optimize.py", line 189, in _run_trial
optuna.storages.fail_stale_trials(study)
File "/usr/local/lib/python3.9/dist-packages/optuna/_experimental.py", line 74, in wrapper
return func(*args, **kwargs)
File "/usr/local/lib/python3.9/dist-packages/optuna/storages/_heartbeat.py", line 169, in fail_stale_trials
if storage.set_trial_state_values(trial_id, state=TrialState.FAIL):
File "/usr/local/lib/python3.9/dist-packages/optuna/storages/_cached_storage.py", line 187, in set_trial_state_values
return self._backend.set_trial_state_values(trial_id, state=state, values=values)
File "/usr/local/lib/python3.9/dist-packages/optuna/storages/_rdb/storage.py", line 640, in set_trial_state_values
self.check_trial_is_updatable(trial_id, trial.state)
File "/usr/local/lib/python3.9/dist-packages/optuna/storages/_base.py", line 626, in check_trial_is_updatable
raise RuntimeError(
RuntimeError: Trial#63444 has already finished and can not be updated.
```
### Steps to reproduce
Run Optuna optimization with 50 parallelism in k8s cluster environments, in which the pods are preempted frequently.
### Additional context (optional)
As a solution, one possible approach is to make the `_get_stale_trial_ids` call atomic for a single DB. However, this would involve introducing reference locks on the DB, potentially becoming a bottleneck as the parallelism of distributed optimization increases. Therefore, personally, I don't consider this to be an ideal solution.
Another solution could involve reducing the frequency of `fail_stale_trials` calls, rather than invoking it for every trial. This entails adding an argument like `trial_interval_of_heartbeat` to the storage that inherits from `BaseHeartbeat`, and invoking `fail_stale_trials` for trials at this interval. With settings where the level of parallelism is smaller than `trial_interval_of_heartbeat`, it is expected that the issue at hand would not occur.
</issue>
<code>
[start of optuna/storages/_heartbeat.py]
1 import abc
2 import copy
3 from threading import Event
4 from threading import Thread
5 from types import TracebackType
6 from typing import Callable
7 from typing import List
8 from typing import Optional
9 from typing import Type
10
11 import optuna
12 from optuna._experimental import experimental_func
13 from optuna.storages import BaseStorage
14 from optuna.trial import FrozenTrial
15 from optuna.trial import TrialState
16
17
18 class BaseHeartbeat(metaclass=abc.ABCMeta):
19 """Base class for heartbeat.
20
21 This class is not supposed to be directly accessed by library users.
22
23 The heartbeat mechanism periodically checks whether each trial process is alive during an
24 optimization loop. To support this mechanism, the methods of
25 :class:`~optuna.storages._heartbeat.BaseHeartbeat` is implemented for the target database
26 backend, typically with multiple inheritance of :class:`~optuna.storages._base.BaseStorage`
27 and :class:`~optuna.storages._heartbeat.BaseHeartbeat`.
28
29 .. seealso::
30 See :class:`~optuna.storages.RDBStorage`, where the backend supports heartbeat.
31 """
32
33 @abc.abstractmethod
34 def record_heartbeat(self, trial_id: int) -> None:
35 """Record the heartbeat of the trial.
36
37 Args:
38 trial_id:
39 ID of the trial.
40 """
41 raise NotImplementedError()
42
43 @abc.abstractmethod
44 def _get_stale_trial_ids(self, study_id: int) -> List[int]:
45 """Get the stale trial ids of the study.
46
47 Args:
48 study_id:
49 ID of the study.
50 Returns:
51 List of IDs of trials whose heartbeat has not been updated for a long time.
52 """
53 raise NotImplementedError()
54
55 @abc.abstractmethod
56 def get_heartbeat_interval(self) -> Optional[int]:
57 """Get the heartbeat interval if it is set.
58
59 Returns:
60 The heartbeat interval if it is set, otherwise :obj:`None`.
61 """
62 raise NotImplementedError()
63
64 @abc.abstractmethod
65 def get_failed_trial_callback(self) -> Optional[Callable[["optuna.Study", FrozenTrial], None]]:
66 """Get the failed trial callback function.
67
68 Returns:
69 The failed trial callback function if it is set, otherwise :obj:`None`.
70 """
71 raise NotImplementedError()
72
73
74 class BaseHeartbeatThread(metaclass=abc.ABCMeta):
75 def __enter__(self) -> None:
76 self.start()
77
78 def __exit__(
79 self,
80 exc_type: Optional[Type[Exception]],
81 exc_value: Optional[Exception],
82 traceback: Optional[TracebackType],
83 ) -> None:
84 self.join()
85
86 @abc.abstractmethod
87 def start(self) -> None:
88 raise NotImplementedError()
89
90 @abc.abstractmethod
91 def join(self) -> None:
92 raise NotImplementedError()
93
94
95 class NullHeartbeatThread(BaseHeartbeatThread):
96 def __init__(self) -> None:
97 pass
98
99 def start(self) -> None:
100 pass
101
102 def join(self) -> None:
103 pass
104
105
106 class HeartbeatThread(BaseHeartbeatThread):
107 def __init__(self, trial_id: int, heartbeat: BaseHeartbeat) -> None:
108 self._trial_id = trial_id
109 self._heartbeat = heartbeat
110 self._thread: Optional[Thread] = None
111 self._stop_event: Optional[Event] = None
112
113 def start(self) -> None:
114 self._stop_event = Event()
115 self._thread = Thread(
116 target=self._record_heartbeat, args=(self._trial_id, self._heartbeat, self._stop_event)
117 )
118 self._thread.start()
119
120 def join(self) -> None:
121 assert self._stop_event is not None
122 assert self._thread is not None
123 self._stop_event.set()
124 self._thread.join()
125
126 @staticmethod
127 def _record_heartbeat(trial_id: int, heartbeat: BaseHeartbeat, stop_event: Event) -> None:
128 heartbeat_interval = heartbeat.get_heartbeat_interval()
129 assert heartbeat_interval is not None
130 while True:
131 heartbeat.record_heartbeat(trial_id)
132 if stop_event.wait(timeout=heartbeat_interval):
133 return
134
135
136 def get_heartbeat_thread(trial_id: int, storage: BaseStorage) -> BaseHeartbeatThread:
137 if is_heartbeat_enabled(storage):
138 assert isinstance(storage, BaseHeartbeat)
139 return HeartbeatThread(trial_id, storage)
140 else:
141 return NullHeartbeatThread()
142
143
144 @experimental_func("2.9.0")
145 def fail_stale_trials(study: "optuna.Study") -> None:
146 """Fail stale trials and run their failure callbacks.
147
148 The running trials whose heartbeat has not been updated for a long time will be failed,
149 that is, those states will be changed to :obj:`~optuna.trial.TrialState.FAIL`.
150
151 .. seealso::
152
153 See :class:`~optuna.storages.RDBStorage`.
154
155 Args:
156 study:
157 Study holding the trials to check.
158 """
159 storage = study._storage
160
161 if not isinstance(storage, BaseHeartbeat):
162 return
163
164 if not is_heartbeat_enabled(storage):
165 return
166
167 failed_trial_ids = []
168 for trial_id in storage._get_stale_trial_ids(study._study_id):
169 if storage.set_trial_state_values(trial_id, state=TrialState.FAIL):
170 failed_trial_ids.append(trial_id)
171
172 failed_trial_callback = storage.get_failed_trial_callback()
173 if failed_trial_callback is not None:
174 for trial_id in failed_trial_ids:
175 failed_trial = copy.deepcopy(storage.get_trial(trial_id))
176 failed_trial_callback(study, failed_trial)
177
178
179 def is_heartbeat_enabled(storage: BaseStorage) -> bool:
180 """Check whether the storage enables the heartbeat.
181
182 Returns:
183 :obj:`True` if the storage also inherits :class:`~optuna.storages._heartbeat.BaseHeartbeat`
184 and the return value of :meth:`~optuna.storages.BaseStorage.get_heartbeat_interval` is an
185 integer, otherwise :obj:`False`.
186 """
187 return isinstance(storage, BaseHeartbeat) and storage.get_heartbeat_interval() is not None
188
[end of optuna/storages/_heartbeat.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/storages/_heartbeat.py b/optuna/storages/_heartbeat.py
--- a/optuna/storages/_heartbeat.py
+++ b/optuna/storages/_heartbeat.py
@@ -166,8 +166,12 @@
failed_trial_ids = []
for trial_id in storage._get_stale_trial_ids(study._study_id):
- if storage.set_trial_state_values(trial_id, state=TrialState.FAIL):
- failed_trial_ids.append(trial_id)
+ try:
+ if storage.set_trial_state_values(trial_id, state=TrialState.FAIL):
+ failed_trial_ids.append(trial_id)
+ except RuntimeError:
+ # If another process fails the trial, the storage raises RuntimeError.
+ pass
failed_trial_callback = storage.get_failed_trial_callback()
if failed_trial_callback is not None:
| {"golden_diff": "diff --git a/optuna/storages/_heartbeat.py b/optuna/storages/_heartbeat.py\n--- a/optuna/storages/_heartbeat.py\n+++ b/optuna/storages/_heartbeat.py\n@@ -166,8 +166,12 @@\n \n failed_trial_ids = []\n for trial_id in storage._get_stale_trial_ids(study._study_id):\n- if storage.set_trial_state_values(trial_id, state=TrialState.FAIL):\n- failed_trial_ids.append(trial_id)\n+ try:\n+ if storage.set_trial_state_values(trial_id, state=TrialState.FAIL):\n+ failed_trial_ids.append(trial_id)\n+ except RuntimeError:\n+ # If another process fails the trial, the storage raises RuntimeError.\n+ pass\n \n failed_trial_callback = storage.get_failed_trial_callback()\n if failed_trial_callback is not None:\n", "issue": "RuntimeError caused by fail processing after liveness judgment in distributed optimization\n### Expected behavior\r\n\r\nOptuna incorporates a Heartbeat mechanism, which evaluates trials by detecting those that haven't recorded a heartbeat within a certain time period and transitions them from \"Running\" to \"Fail\". However, the function responsible for this liveness judgment, `_get_stale_trial_ids` within `BaseHeartbeat.fail_stale_trials`, is not atomic. Consequently, during distributed optimization, different processes might acquire the same trial ID, leading to parallel invocations of `storage.set_trial_state_values` for the same trial ID. This can result in a `RuntimeError`, as Optuna triggers a `RuntimeError` when calling `storage.set_trial_state_values` for trials that have already completed.\r\n\r\nThis issue aims to discuss and address a solution to this problem.\r\n\r\n### Environment\r\n\r\n- Optuna version: 3.2.0\r\n- Python version: 3.9\r\n- OS: Ubuntu 22.04\r\n- (Optional) Other libraries and their versions:\r\n\r\n\r\n### Error messages, stack traces, or logs\r\n\r\n```shell\r\nTraceback (most recent call last):\r\n File \"<string>\", line 3, in <module>\r\n File \"xxxxx\", line 149, in chiran_study_search_task\r\n study.search(n_trials)\r\n File \"xxxxx\", line 170, in search\r\n self._study.optimize(self._objective, callbacks=[MaxTrialsCallback(n_trials)])\r\n File \"/usr/local/lib/python3.9/dist-packages/optuna/study/study.py\", line 443, in optimize\r\n _optimize(\r\n File \"/usr/local/lib/python3.9/dist-packages/optuna/study/_optimize.py\", line 66, in _optimize\r\n _optimize_sequential(\r\n File \"/usr/local/lib/python3.9/dist-packages/optuna/study/_optimize.py\", line 163, in _optimize_sequential\r\n frozen_trial = _run_trial(study, func, catch)\r\n File \"/usr/local/lib/python3.9/dist-packages/optuna/study/_optimize.py\", line 189, in _run_trial\r\n optuna.storages.fail_stale_trials(study)\r\n File \"/usr/local/lib/python3.9/dist-packages/optuna/_experimental.py\", line 74, in wrapper\r\n return func(*args, **kwargs)\r\n File \"/usr/local/lib/python3.9/dist-packages/optuna/storages/_heartbeat.py\", line 169, in fail_stale_trials\r\n if storage.set_trial_state_values(trial_id, state=TrialState.FAIL):\r\n File \"/usr/local/lib/python3.9/dist-packages/optuna/storages/_cached_storage.py\", line 187, in set_trial_state_values\r\n return self._backend.set_trial_state_values(trial_id, state=state, values=values)\r\n File \"/usr/local/lib/python3.9/dist-packages/optuna/storages/_rdb/storage.py\", line 640, in set_trial_state_values\r\n self.check_trial_is_updatable(trial_id, trial.state)\r\n File \"/usr/local/lib/python3.9/dist-packages/optuna/storages/_base.py\", line 626, in check_trial_is_updatable\r\n raise RuntimeError(\r\nRuntimeError: Trial#63444 has already finished and can not be updated.\r\n```\r\n\r\n\r\n### Steps to reproduce\r\n\r\nRun Optuna optimization with 50 parallelism in k8s cluster environments, in which the pods are preempted frequently.\r\n\r\n### Additional context (optional)\r\n\r\nAs a solution, one possible approach is to make the `_get_stale_trial_ids` call atomic for a single DB. However, this would involve introducing reference locks on the DB, potentially becoming a bottleneck as the parallelism of distributed optimization increases. Therefore, personally, I don't consider this to be an ideal solution.\r\n\r\nAnother solution could involve reducing the frequency of `fail_stale_trials` calls, rather than invoking it for every trial. This entails adding an argument like `trial_interval_of_heartbeat` to the storage that inherits from `BaseHeartbeat`, and invoking `fail_stale_trials` for trials at this interval. With settings where the level of parallelism is smaller than `trial_interval_of_heartbeat`, it is expected that the issue at hand would not occur.\n", "before_files": [{"content": "import abc\nimport copy\nfrom threading import Event\nfrom threading import Thread\nfrom types import TracebackType\nfrom typing import Callable\nfrom typing import List\nfrom typing import Optional\nfrom typing import Type\n\nimport optuna\nfrom optuna._experimental import experimental_func\nfrom optuna.storages import BaseStorage\nfrom optuna.trial import FrozenTrial\nfrom optuna.trial import TrialState\n\n\nclass BaseHeartbeat(metaclass=abc.ABCMeta):\n \"\"\"Base class for heartbeat.\n\n This class is not supposed to be directly accessed by library users.\n\n The heartbeat mechanism periodically checks whether each trial process is alive during an\n optimization loop. To support this mechanism, the methods of\n :class:`~optuna.storages._heartbeat.BaseHeartbeat` is implemented for the target database\n backend, typically with multiple inheritance of :class:`~optuna.storages._base.BaseStorage`\n and :class:`~optuna.storages._heartbeat.BaseHeartbeat`.\n\n .. seealso::\n See :class:`~optuna.storages.RDBStorage`, where the backend supports heartbeat.\n \"\"\"\n\n @abc.abstractmethod\n def record_heartbeat(self, trial_id: int) -> None:\n \"\"\"Record the heartbeat of the trial.\n\n Args:\n trial_id:\n ID of the trial.\n \"\"\"\n raise NotImplementedError()\n\n @abc.abstractmethod\n def _get_stale_trial_ids(self, study_id: int) -> List[int]:\n \"\"\"Get the stale trial ids of the study.\n\n Args:\n study_id:\n ID of the study.\n Returns:\n List of IDs of trials whose heartbeat has not been updated for a long time.\n \"\"\"\n raise NotImplementedError()\n\n @abc.abstractmethod\n def get_heartbeat_interval(self) -> Optional[int]:\n \"\"\"Get the heartbeat interval if it is set.\n\n Returns:\n The heartbeat interval if it is set, otherwise :obj:`None`.\n \"\"\"\n raise NotImplementedError()\n\n @abc.abstractmethod\n def get_failed_trial_callback(self) -> Optional[Callable[[\"optuna.Study\", FrozenTrial], None]]:\n \"\"\"Get the failed trial callback function.\n\n Returns:\n The failed trial callback function if it is set, otherwise :obj:`None`.\n \"\"\"\n raise NotImplementedError()\n\n\nclass BaseHeartbeatThread(metaclass=abc.ABCMeta):\n def __enter__(self) -> None:\n self.start()\n\n def __exit__(\n self,\n exc_type: Optional[Type[Exception]],\n exc_value: Optional[Exception],\n traceback: Optional[TracebackType],\n ) -> None:\n self.join()\n\n @abc.abstractmethod\n def start(self) -> None:\n raise NotImplementedError()\n\n @abc.abstractmethod\n def join(self) -> None:\n raise NotImplementedError()\n\n\nclass NullHeartbeatThread(BaseHeartbeatThread):\n def __init__(self) -> None:\n pass\n\n def start(self) -> None:\n pass\n\n def join(self) -> None:\n pass\n\n\nclass HeartbeatThread(BaseHeartbeatThread):\n def __init__(self, trial_id: int, heartbeat: BaseHeartbeat) -> None:\n self._trial_id = trial_id\n self._heartbeat = heartbeat\n self._thread: Optional[Thread] = None\n self._stop_event: Optional[Event] = None\n\n def start(self) -> None:\n self._stop_event = Event()\n self._thread = Thread(\n target=self._record_heartbeat, args=(self._trial_id, self._heartbeat, self._stop_event)\n )\n self._thread.start()\n\n def join(self) -> None:\n assert self._stop_event is not None\n assert self._thread is not None\n self._stop_event.set()\n self._thread.join()\n\n @staticmethod\n def _record_heartbeat(trial_id: int, heartbeat: BaseHeartbeat, stop_event: Event) -> None:\n heartbeat_interval = heartbeat.get_heartbeat_interval()\n assert heartbeat_interval is not None\n while True:\n heartbeat.record_heartbeat(trial_id)\n if stop_event.wait(timeout=heartbeat_interval):\n return\n\n\ndef get_heartbeat_thread(trial_id: int, storage: BaseStorage) -> BaseHeartbeatThread:\n if is_heartbeat_enabled(storage):\n assert isinstance(storage, BaseHeartbeat)\n return HeartbeatThread(trial_id, storage)\n else:\n return NullHeartbeatThread()\n\n\n@experimental_func(\"2.9.0\")\ndef fail_stale_trials(study: \"optuna.Study\") -> None:\n \"\"\"Fail stale trials and run their failure callbacks.\n\n The running trials whose heartbeat has not been updated for a long time will be failed,\n that is, those states will be changed to :obj:`~optuna.trial.TrialState.FAIL`.\n\n .. seealso::\n\n See :class:`~optuna.storages.RDBStorage`.\n\n Args:\n study:\n Study holding the trials to check.\n \"\"\"\n storage = study._storage\n\n if not isinstance(storage, BaseHeartbeat):\n return\n\n if not is_heartbeat_enabled(storage):\n return\n\n failed_trial_ids = []\n for trial_id in storage._get_stale_trial_ids(study._study_id):\n if storage.set_trial_state_values(trial_id, state=TrialState.FAIL):\n failed_trial_ids.append(trial_id)\n\n failed_trial_callback = storage.get_failed_trial_callback()\n if failed_trial_callback is not None:\n for trial_id in failed_trial_ids:\n failed_trial = copy.deepcopy(storage.get_trial(trial_id))\n failed_trial_callback(study, failed_trial)\n\n\ndef is_heartbeat_enabled(storage: BaseStorage) -> bool:\n \"\"\"Check whether the storage enables the heartbeat.\n\n Returns:\n :obj:`True` if the storage also inherits :class:`~optuna.storages._heartbeat.BaseHeartbeat`\n and the return value of :meth:`~optuna.storages.BaseStorage.get_heartbeat_interval` is an\n integer, otherwise :obj:`False`.\n \"\"\"\n return isinstance(storage, BaseHeartbeat) and storage.get_heartbeat_interval() is not None\n", "path": "optuna/storages/_heartbeat.py"}]} | 3,226 | 188 |
gh_patches_debug_39854 | rasdani/github-patches | git_diff | akvo__akvo-rsr-3918 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
PE API flag
Flag all requests made from PE with `project_editor_change: true`
</issue>
<code>
[start of akvo/rest/viewsets.py]
1 # -*- coding: utf-8 -*-
2
3 # Akvo RSR is covered by the GNU Affero General Public License.
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 import logging
8
9 from django.db.models.fields import FieldDoesNotExist
10 from django.db.models.fields.related import ForeignObject
11 from django.core.exceptions import FieldError
12
13 from akvo.rsr.models import PublishingStatus, Project
14 from akvo.rest.models import TastyTokenAuthentication
15 from akvo.utils import log_project_changes
16
17 from rest_framework import authentication, filters, permissions, viewsets
18
19 from .filters import RSRGenericFilterBackend
20 from .pagination import TastypieOffsetPagination
21
22 logger = logging.getLogger(__name__)
23
24
25 class SafeMethodsPermissions(permissions.DjangoObjectPermissions):
26 """
27 Base class to allow any safe methods ('GET', 'OPTIONS' and 'HEAD') without needing to
28 authenticate.
29 """
30
31 def has_permission(self, request, view):
32 if request.method in permissions.SAFE_METHODS:
33 return True
34 return super(SafeMethodsPermissions, self).has_permission(request, view)
35
36
37 class BaseRSRViewSet(viewsets.ModelViewSet):
38 """
39 Base class used for the view sets for RSR models. Provides unified auth and perms settings.
40 """
41 authentication_classes = (authentication.SessionAuthentication, TastyTokenAuthentication, )
42 permission_classes = (SafeMethodsPermissions, )
43 filter_backends = (filters.OrderingFilter, RSRGenericFilterBackend,)
44 ordering_fields = '__all__'
45
46 def paginate_queryset(self, queryset):
47 """ Custom offset-based pagination for the Tastypie API emulation
48 """
49 if self.request and '/api/v1/' in self.request.path:
50 self.pagination_class = TastypieOffsetPagination
51 return super(BaseRSRViewSet, self).paginate_queryset(queryset)
52
53 def get_queryset(self):
54
55 def django_filter_filters(request):
56 """
57 Support emulating the DjangoFilterBackend-based filtering that some views used to have
58 """
59 # query string keys reserved by the RSRGenericFilterBackend
60 qs_params = ['filter', 'exclude', 'select_related', 'prefetch_related', ]
61 # query string keys used by core DRF, OrderingFilter and Akvo custom views
62 exclude_params = ['limit', 'format', 'page', 'offset', 'ordering', 'partner_type',
63 'sync_owner', 'reporting_org', ]
64 filters = {}
65 for key in request.query_params:
66 if key not in qs_params + exclude_params and not key.startswith('image_thumb_'):
67 filters.update({key: request.query_params.get(key)})
68 return filters
69
70 def get_lookups_from_filters(legacy_filters):
71 """
72 Cast the values in DjangoFilterBackend-styled query string filters to correct types to
73 be able to use them in regular queryset-filter() calls
74 """
75 # types of lookups supported by the views using DjangoFilterBackend
76 LEGACY_FIELD_LOOKUPS = ['exact', 'contains', 'icontains', 'gt', 'gte', 'lt',
77 'lte', ]
78 query_set_lookups = []
79 for key, value in legacy_filters.items():
80 parts = key.split('__')
81 if parts[-1] in LEGACY_FIELD_LOOKUPS:
82 parts = parts[:-1]
83 model = queryset.model
84 for part in parts:
85 try:
86 field_object = model._meta.get_field(part)
87 related_model = field_object.model
88 direct = not field_object.auto_created or field_object.concrete
89
90 if direct:
91 if issubclass(field_object.__class__, ForeignObject):
92 model = field_object.related_model
93 else:
94 value = field_object.to_python(value)
95 break
96 else:
97 model = related_model
98 except FieldDoesNotExist:
99 pass
100 query_set_lookups += [{key: value}]
101 return query_set_lookups
102
103 queryset = super(BaseRSRViewSet, self).get_queryset()
104
105 # support for old DjangoFilterBackend-based filtering if not pk is given
106 if not self.kwargs.get('pk'):
107 # find all "old styled" filters
108 legacy_filters = django_filter_filters(self.request)
109 # create lookup dicts from the filters found
110 lookups = get_lookups_from_filters(legacy_filters)
111 for lookup in lookups:
112 try:
113 queryset = queryset.filter(**lookup)
114 except (FieldError, ValueError):
115 # In order to mimick 'old' behaviour of the API, we should ignore non-valid
116 # parameters or values. Returning a warning would be more preferable.
117 pass
118
119 return queryset
120
121
122 class ReadOnlyPublicProjectViewSet(viewsets.ReadOnlyModelViewSet):
123 """
124 Read only viewset for public projects or objects related to public projects will be shown.
125 """
126 authentication_classes = (authentication.SessionAuthentication, TastyTokenAuthentication, )
127 permission_classes = (SafeMethodsPermissions, )
128 ordering_fields = '__all__'
129 project_relation = 'project__'
130
131 def get_queryset(self):
132
133 request = self.request
134 user = request.user
135
136 queryset = super(ReadOnlyPublicProjectViewSet, self).get_queryset()
137
138 # filter projects if user is "non-privileged"
139 if user.is_anonymous() or not (user.is_superuser or user.is_admin):
140 queryset = _projects_filter_for_non_privileged_users(
141 user, queryset, self.project_relation, action=self.action
142 )
143
144 return queryset.distinct()
145
146
147 class PublicProjectViewSet(BaseRSRViewSet):
148 """
149 Only public projects or objects related to public projects will be shown.
150 """
151 # project_relation is the default string for constructing a field lookup to the is_public field
152 # on the related Project. Override this in when the viewset is for a model that doesn't have a
153 # direct FK to Project or the FK field isn't named project. E.g. IndicatorViewSet:
154 # project_relation = 'result__project__'
155 # The lookup is used to filter out objects associated with private projects, see below.
156 project_relation = 'project__'
157
158 def get_queryset(self):
159
160 request = self.request
161 user = request.user
162
163 queryset = super(PublicProjectViewSet, self).get_queryset()
164
165 # filter projects if user is "non-privileged"
166 if user.is_anonymous() or not (user.is_superuser or user.is_admin):
167 queryset = self.projects_filter_for_non_privileged_users(
168 user, queryset, self.project_relation, action=self.action
169 )
170
171 return queryset.distinct()
172
173 def create(self, request, *args, **kwargs):
174 response = super(PublicProjectViewSet, self).create(request, *args, **kwargs)
175 obj = self.queryset.model.objects.get(pk=response.data['id'])
176 project = self.get_project(obj)
177 if project is not None:
178 project.update_iati_checks()
179 log_project_changes(request.user, project, obj, {}, 'added')
180 return response
181
182 def destroy(self, request, *args, **kwargs):
183 obj = self.get_object()
184 project = self.get_project(obj)
185 response = super(PublicProjectViewSet, self).destroy(request, *args, **kwargs)
186 if project is not None:
187 project.update_iati_checks()
188 log_project_changes(request.user, project, obj, {}, 'deleted')
189 return response
190
191 def update(self, request, *args, **kwargs):
192 response = super(PublicProjectViewSet, self).update(request, *args, **kwargs)
193 obj = self.get_object()
194 project = self.get_project(obj)
195 if project is not None:
196 project.update_iati_checks()
197 log_project_changes(request.user, project, obj, request.data, 'changed')
198 return response
199
200 @staticmethod
201 def get_project(obj):
202 obj_model = obj._meta.model
203 model_project_relation = getattr(obj_model, 'project_relation', None)
204 if model_project_relation:
205 query = {model_project_relation: [obj.id]}
206 project = Project.objects.get(**query)
207 elif obj_model == Project:
208 project = obj
209 elif hasattr(obj, 'project'):
210 project = obj.project
211 else:
212 logger.error('%s does not define a relation to a project', obj_model)
213 project = None
214 return project
215
216 @staticmethod
217 def projects_filter_for_non_privileged_users(user, queryset, project_relation, action='create'):
218 return _projects_filter_for_non_privileged_users(user, queryset, project_relation, action)
219
220
221 def _projects_filter_for_non_privileged_users(user, queryset, project_relation, action='create'):
222
223 if not user.is_anonymous() and (user.is_admin or user.is_superuser):
224 return queryset.distinct()
225
226 # Construct the public projects filter field lookup.
227 project_filter = project_relation + 'is_public'
228
229 # Filter the object list into two querysets;
230 # One where the related Projects are public and one where they are private
231 public_objects = queryset.filter(**{project_filter: True}).distinct()
232 private_objects = queryset.filter(**{project_filter: False}).distinct()
233
234 # In case of an anonymous user, only return the public objects
235 if user.is_anonymous():
236 unpublished_exclude = project_relation + 'publishingstatus__status'
237 queryset = public_objects.exclude(
238 **{unpublished_exclude: PublishingStatus.STATUS_UNPUBLISHED}
239 ).distinct()
240
241 # Otherwise, check to which objects the user has (change) permission
242 elif private_objects.exists():
243 include_user_owned = hasattr(queryset.model, 'user')
244 if action == 'list':
245 # The view permission is new, and previously only the change
246 # permission existed. To avoid adding new view permissions for
247 # all the objects, we also check if a user has change
248 # permissions, which implicitly implies view permissions.
249 change_permission = type(private_objects[0])._meta.db_table.replace('_', '.change_')
250 change_filter = user.get_permission_filter(
251 change_permission, project_relation, include_user_owned
252 )
253 change_objects = private_objects.filter(change_filter).distinct()
254
255 # Check if user has view permission on the queryset
256 view_permission = change_permission.replace('.change_', '.view_')
257 view_filter = user.get_permission_filter(
258 view_permission, project_relation, include_user_owned
259 )
260 view_objects = private_objects.filter(view_filter).distinct()
261
262 private_objects = (change_objects | view_objects).distinct()
263 else:
264 permission = type(private_objects[0])._meta.db_table.replace('_', '.change_')
265 filter_ = user.get_permission_filter(permission, project_relation, include_user_owned)
266 private_objects = private_objects.filter(filter_).distinct()
267
268 queryset = public_objects | private_objects
269
270 return queryset.distinct()
271
[end of akvo/rest/viewsets.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/viewsets.py b/akvo/rest/viewsets.py
--- a/akvo/rest/viewsets.py
+++ b/akvo/rest/viewsets.py
@@ -14,7 +14,7 @@
from akvo.rest.models import TastyTokenAuthentication
from akvo.utils import log_project_changes
-from rest_framework import authentication, filters, permissions, viewsets
+from rest_framework import authentication, exceptions, filters, permissions, viewsets
from .filters import RSRGenericFilterBackend
from .pagination import TastypieOffsetPagination
@@ -171,30 +171,36 @@
return queryset.distinct()
def create(self, request, *args, **kwargs):
+ project_editor_change = is_project_editor_change(request)
response = super(PublicProjectViewSet, self).create(request, *args, **kwargs)
obj = self.queryset.model.objects.get(pk=response.data['id'])
project = self.get_project(obj)
if project is not None:
- project.update_iati_checks()
log_project_changes(request.user, project, obj, {}, 'added')
+ if project_editor_change:
+ project.update_iati_checks()
return response
def destroy(self, request, *args, **kwargs):
+ project_editor_change = is_project_editor_change(request)
obj = self.get_object()
project = self.get_project(obj)
response = super(PublicProjectViewSet, self).destroy(request, *args, **kwargs)
if project is not None:
- project.update_iati_checks()
log_project_changes(request.user, project, obj, {}, 'deleted')
+ if project_editor_change:
+ project.update_iati_checks()
return response
def update(self, request, *args, **kwargs):
+ project_editor_change = is_project_editor_change(request)
response = super(PublicProjectViewSet, self).update(request, *args, **kwargs)
obj = self.get_object()
project = self.get_project(obj)
if project is not None:
- project.update_iati_checks()
log_project_changes(request.user, project, obj, request.data, 'changed')
+ if project_editor_change:
+ project.update_iati_checks()
return response
@staticmethod
@@ -268,3 +274,11 @@
queryset = public_objects | private_objects
return queryset.distinct()
+
+
+def is_project_editor_change(request):
+ try:
+ project_editor_change = request.data.get('project_editor_change', False)
+ except exceptions.UnsupportedMediaType:
+ project_editor_change = False
+ return project_editor_change
| {"golden_diff": "diff --git a/akvo/rest/viewsets.py b/akvo/rest/viewsets.py\n--- a/akvo/rest/viewsets.py\n+++ b/akvo/rest/viewsets.py\n@@ -14,7 +14,7 @@\n from akvo.rest.models import TastyTokenAuthentication\n from akvo.utils import log_project_changes\n \n-from rest_framework import authentication, filters, permissions, viewsets\n+from rest_framework import authentication, exceptions, filters, permissions, viewsets\n \n from .filters import RSRGenericFilterBackend\n from .pagination import TastypieOffsetPagination\n@@ -171,30 +171,36 @@\n return queryset.distinct()\n \n def create(self, request, *args, **kwargs):\n+ project_editor_change = is_project_editor_change(request)\n response = super(PublicProjectViewSet, self).create(request, *args, **kwargs)\n obj = self.queryset.model.objects.get(pk=response.data['id'])\n project = self.get_project(obj)\n if project is not None:\n- project.update_iati_checks()\n log_project_changes(request.user, project, obj, {}, 'added')\n+ if project_editor_change:\n+ project.update_iati_checks()\n return response\n \n def destroy(self, request, *args, **kwargs):\n+ project_editor_change = is_project_editor_change(request)\n obj = self.get_object()\n project = self.get_project(obj)\n response = super(PublicProjectViewSet, self).destroy(request, *args, **kwargs)\n if project is not None:\n- project.update_iati_checks()\n log_project_changes(request.user, project, obj, {}, 'deleted')\n+ if project_editor_change:\n+ project.update_iati_checks()\n return response\n \n def update(self, request, *args, **kwargs):\n+ project_editor_change = is_project_editor_change(request)\n response = super(PublicProjectViewSet, self).update(request, *args, **kwargs)\n obj = self.get_object()\n project = self.get_project(obj)\n if project is not None:\n- project.update_iati_checks()\n log_project_changes(request.user, project, obj, request.data, 'changed')\n+ if project_editor_change:\n+ project.update_iati_checks()\n return response\n \n @staticmethod\n@@ -268,3 +274,11 @@\n queryset = public_objects | private_objects\n \n return queryset.distinct()\n+\n+\n+def is_project_editor_change(request):\n+ try:\n+ project_editor_change = request.data.get('project_editor_change', False)\n+ except exceptions.UnsupportedMediaType:\n+ project_editor_change = False\n+ return project_editor_change\n", "issue": "PE API flag\nFlag all requests made from PE with `project_editor_change: true`\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\n\n# Akvo RSR is covered by the GNU Affero General Public License.\n# See more details in the license.txt file located at the root folder of the Akvo RSR module.\n# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.\n\nimport logging\n\nfrom django.db.models.fields import FieldDoesNotExist\nfrom django.db.models.fields.related import ForeignObject\nfrom django.core.exceptions import FieldError\n\nfrom akvo.rsr.models import PublishingStatus, Project\nfrom akvo.rest.models import TastyTokenAuthentication\nfrom akvo.utils import log_project_changes\n\nfrom rest_framework import authentication, filters, permissions, viewsets\n\nfrom .filters import RSRGenericFilterBackend\nfrom .pagination import TastypieOffsetPagination\n\nlogger = logging.getLogger(__name__)\n\n\nclass SafeMethodsPermissions(permissions.DjangoObjectPermissions):\n \"\"\"\n Base class to allow any safe methods ('GET', 'OPTIONS' and 'HEAD') without needing to\n authenticate.\n \"\"\"\n\n def has_permission(self, request, view):\n if request.method in permissions.SAFE_METHODS:\n return True\n return super(SafeMethodsPermissions, self).has_permission(request, view)\n\n\nclass BaseRSRViewSet(viewsets.ModelViewSet):\n \"\"\"\n Base class used for the view sets for RSR models. Provides unified auth and perms settings.\n \"\"\"\n authentication_classes = (authentication.SessionAuthentication, TastyTokenAuthentication, )\n permission_classes = (SafeMethodsPermissions, )\n filter_backends = (filters.OrderingFilter, RSRGenericFilterBackend,)\n ordering_fields = '__all__'\n\n def paginate_queryset(self, queryset):\n \"\"\" Custom offset-based pagination for the Tastypie API emulation\n \"\"\"\n if self.request and '/api/v1/' in self.request.path:\n self.pagination_class = TastypieOffsetPagination\n return super(BaseRSRViewSet, self).paginate_queryset(queryset)\n\n def get_queryset(self):\n\n def django_filter_filters(request):\n \"\"\"\n Support emulating the DjangoFilterBackend-based filtering that some views used to have\n \"\"\"\n # query string keys reserved by the RSRGenericFilterBackend\n qs_params = ['filter', 'exclude', 'select_related', 'prefetch_related', ]\n # query string keys used by core DRF, OrderingFilter and Akvo custom views\n exclude_params = ['limit', 'format', 'page', 'offset', 'ordering', 'partner_type',\n 'sync_owner', 'reporting_org', ]\n filters = {}\n for key in request.query_params:\n if key not in qs_params + exclude_params and not key.startswith('image_thumb_'):\n filters.update({key: request.query_params.get(key)})\n return filters\n\n def get_lookups_from_filters(legacy_filters):\n \"\"\"\n Cast the values in DjangoFilterBackend-styled query string filters to correct types to\n be able to use them in regular queryset-filter() calls\n \"\"\"\n # types of lookups supported by the views using DjangoFilterBackend\n LEGACY_FIELD_LOOKUPS = ['exact', 'contains', 'icontains', 'gt', 'gte', 'lt',\n 'lte', ]\n query_set_lookups = []\n for key, value in legacy_filters.items():\n parts = key.split('__')\n if parts[-1] in LEGACY_FIELD_LOOKUPS:\n parts = parts[:-1]\n model = queryset.model\n for part in parts:\n try:\n field_object = model._meta.get_field(part)\n related_model = field_object.model\n direct = not field_object.auto_created or field_object.concrete\n\n if direct:\n if issubclass(field_object.__class__, ForeignObject):\n model = field_object.related_model\n else:\n value = field_object.to_python(value)\n break\n else:\n model = related_model\n except FieldDoesNotExist:\n pass\n query_set_lookups += [{key: value}]\n return query_set_lookups\n\n queryset = super(BaseRSRViewSet, self).get_queryset()\n\n # support for old DjangoFilterBackend-based filtering if not pk is given\n if not self.kwargs.get('pk'):\n # find all \"old styled\" filters\n legacy_filters = django_filter_filters(self.request)\n # create lookup dicts from the filters found\n lookups = get_lookups_from_filters(legacy_filters)\n for lookup in lookups:\n try:\n queryset = queryset.filter(**lookup)\n except (FieldError, ValueError):\n # In order to mimick 'old' behaviour of the API, we should ignore non-valid\n # parameters or values. Returning a warning would be more preferable.\n pass\n\n return queryset\n\n\nclass ReadOnlyPublicProjectViewSet(viewsets.ReadOnlyModelViewSet):\n \"\"\"\n Read only viewset for public projects or objects related to public projects will be shown.\n \"\"\"\n authentication_classes = (authentication.SessionAuthentication, TastyTokenAuthentication, )\n permission_classes = (SafeMethodsPermissions, )\n ordering_fields = '__all__'\n project_relation = 'project__'\n\n def get_queryset(self):\n\n request = self.request\n user = request.user\n\n queryset = super(ReadOnlyPublicProjectViewSet, self).get_queryset()\n\n # filter projects if user is \"non-privileged\"\n if user.is_anonymous() or not (user.is_superuser or user.is_admin):\n queryset = _projects_filter_for_non_privileged_users(\n user, queryset, self.project_relation, action=self.action\n )\n\n return queryset.distinct()\n\n\nclass PublicProjectViewSet(BaseRSRViewSet):\n \"\"\"\n Only public projects or objects related to public projects will be shown.\n \"\"\"\n # project_relation is the default string for constructing a field lookup to the is_public field\n # on the related Project. Override this in when the viewset is for a model that doesn't have a\n # direct FK to Project or the FK field isn't named project. E.g. IndicatorViewSet:\n # project_relation = 'result__project__'\n # The lookup is used to filter out objects associated with private projects, see below.\n project_relation = 'project__'\n\n def get_queryset(self):\n\n request = self.request\n user = request.user\n\n queryset = super(PublicProjectViewSet, self).get_queryset()\n\n # filter projects if user is \"non-privileged\"\n if user.is_anonymous() or not (user.is_superuser or user.is_admin):\n queryset = self.projects_filter_for_non_privileged_users(\n user, queryset, self.project_relation, action=self.action\n )\n\n return queryset.distinct()\n\n def create(self, request, *args, **kwargs):\n response = super(PublicProjectViewSet, self).create(request, *args, **kwargs)\n obj = self.queryset.model.objects.get(pk=response.data['id'])\n project = self.get_project(obj)\n if project is not None:\n project.update_iati_checks()\n log_project_changes(request.user, project, obj, {}, 'added')\n return response\n\n def destroy(self, request, *args, **kwargs):\n obj = self.get_object()\n project = self.get_project(obj)\n response = super(PublicProjectViewSet, self).destroy(request, *args, **kwargs)\n if project is not None:\n project.update_iati_checks()\n log_project_changes(request.user, project, obj, {}, 'deleted')\n return response\n\n def update(self, request, *args, **kwargs):\n response = super(PublicProjectViewSet, self).update(request, *args, **kwargs)\n obj = self.get_object()\n project = self.get_project(obj)\n if project is not None:\n project.update_iati_checks()\n log_project_changes(request.user, project, obj, request.data, 'changed')\n return response\n\n @staticmethod\n def get_project(obj):\n obj_model = obj._meta.model\n model_project_relation = getattr(obj_model, 'project_relation', None)\n if model_project_relation:\n query = {model_project_relation: [obj.id]}\n project = Project.objects.get(**query)\n elif obj_model == Project:\n project = obj\n elif hasattr(obj, 'project'):\n project = obj.project\n else:\n logger.error('%s does not define a relation to a project', obj_model)\n project = None\n return project\n\n @staticmethod\n def projects_filter_for_non_privileged_users(user, queryset, project_relation, action='create'):\n return _projects_filter_for_non_privileged_users(user, queryset, project_relation, action)\n\n\ndef _projects_filter_for_non_privileged_users(user, queryset, project_relation, action='create'):\n\n if not user.is_anonymous() and (user.is_admin or user.is_superuser):\n return queryset.distinct()\n\n # Construct the public projects filter field lookup.\n project_filter = project_relation + 'is_public'\n\n # Filter the object list into two querysets;\n # One where the related Projects are public and one where they are private\n public_objects = queryset.filter(**{project_filter: True}).distinct()\n private_objects = queryset.filter(**{project_filter: False}).distinct()\n\n # In case of an anonymous user, only return the public objects\n if user.is_anonymous():\n unpublished_exclude = project_relation + 'publishingstatus__status'\n queryset = public_objects.exclude(\n **{unpublished_exclude: PublishingStatus.STATUS_UNPUBLISHED}\n ).distinct()\n\n # Otherwise, check to which objects the user has (change) permission\n elif private_objects.exists():\n include_user_owned = hasattr(queryset.model, 'user')\n if action == 'list':\n # The view permission is new, and previously only the change\n # permission existed. To avoid adding new view permissions for\n # all the objects, we also check if a user has change\n # permissions, which implicitly implies view permissions.\n change_permission = type(private_objects[0])._meta.db_table.replace('_', '.change_')\n change_filter = user.get_permission_filter(\n change_permission, project_relation, include_user_owned\n )\n change_objects = private_objects.filter(change_filter).distinct()\n\n # Check if user has view permission on the queryset\n view_permission = change_permission.replace('.change_', '.view_')\n view_filter = user.get_permission_filter(\n view_permission, project_relation, include_user_owned\n )\n view_objects = private_objects.filter(view_filter).distinct()\n\n private_objects = (change_objects | view_objects).distinct()\n else:\n permission = type(private_objects[0])._meta.db_table.replace('_', '.change_')\n filter_ = user.get_permission_filter(permission, project_relation, include_user_owned)\n private_objects = private_objects.filter(filter_).distinct()\n\n queryset = public_objects | private_objects\n\n return queryset.distinct()\n", "path": "akvo/rest/viewsets.py"}]} | 3,566 | 568 |
gh_patches_debug_40141 | rasdani/github-patches | git_diff | optuna__optuna-855 | You will be provided with a partial code base and an issue statement explaining a problem to resolve.
<issue>
TensorFlow examples do not work with TensorFlow==2.0.0.
**Conditions**
- Optuna version: 0.16.0
- Python version: 3.7.2
- OS: macOS 10.13.6
- Machine Learning library to be optimized: TensorFlow 2.0.0
**Code to reproduce**
`examples/tensorflow_*` and `examples/pruning/tensorflow_*` do not work with TensorFlow==2.0.0.
```
$ python examples/tensorflow_estimator_simple.py
Traceback (most recent call last):
File "examples/tensorflow_estimator_simple.py", line 137, in <module>
tf.app.run()
AttributeError: module 'tensorflow' has no attribute 'app'
```
```
$ python examples/tensorflow_eager_simple.py
Traceback (most recent call last):
File "examples/tensorflow_eager_simple.py", line 22, in <module>
import tensorflow.contrib.eager as tfe
ModuleNotFoundError: No module named 'tensorflow.contrib'
```
Related PR #564.
</issue>
<code>
[start of setup.py]
1 import os
2 import sys
3
4 import pkg_resources
5 from setuptools import find_packages
6 from setuptools import setup
7
8 from typing import Dict # NOQA
9 from typing import List # NOQA
10 from typing import Optional # NOQA
11
12
13 def get_version():
14 # type: () -> str
15
16 version_filepath = os.path.join(os.path.dirname(__file__), 'optuna', 'version.py')
17 with open(version_filepath) as f:
18 for line in f:
19 if line.startswith('__version__'):
20 return line.strip().split()[-1][1:-1]
21 assert False
22
23
24 def get_long_description():
25 # type: () -> str
26
27 readme_filepath = os.path.join(os.path.dirname(__file__), 'README.md')
28 with open(readme_filepath) as f:
29 return f.read()
30
31
32 def get_install_requires():
33 # type: () -> List[str]
34
35 return [
36 'alembic',
37 'cliff',
38 'colorlog',
39 'numpy',
40 'scipy!=1.4.0',
41 'sqlalchemy>=1.1.0',
42 'tqdm',
43 'joblib',
44 ]
45
46
47 def get_tests_require():
48 # type: () -> List[str]
49
50 return get_extras_require()['testing']
51
52
53 def get_extras_require():
54 # type: () -> Dict[str, List[str]]
55
56 requirements = {
57 'checking': [
58 'autopep8',
59 'hacking',
60 'mypy',
61 ],
62 'codecov': [
63 'codecov',
64 'pytest-cov',
65 ],
66 'doctest': [
67 'pandas',
68 # TODO(Yanase): Update sklearn integration to support v0.22.1 or newer.
69 # See https://github.com/optuna/optuna/issues/825 for further details.
70 'scikit-learn>=0.19.0,<=0.22.0',
71 ],
72 'document': [
73 'lightgbm',
74 'sphinx',
75 'sphinx_rtd_theme',
76 ],
77 'example': [
78 'catboost',
79 'chainer',
80 'lightgbm',
81 'mlflow',
82 'mxnet',
83 'scikit-image',
84 # TODO(Yanase): Update sklearn integration to support v0.22.1 or newer.
85 # See https://github.com/optuna/optuna/issues/825 for further details.
86 'scikit-learn<=0.22.0',
87 'xgboost',
88 ] + (['fastai<2'] if (3, 5) < sys.version_info[:2] < (3, 8) else [])
89 + ([
90 'dask[dataframe]',
91 'dask-ml',
92 'keras',
93 'pytorch-ignite',
94 'pytorch-lightning',
95 # TODO(Yanase): Update examples to support TensorFlow 2.0.
96 # See https://github.com/optuna/optuna/issues/565 for further details.
97 'tensorflow<2.0.0',
98 'torch',
99 'torchvision>=0.5.0'
100 ] if sys.version_info[:2] < (3, 8) else []),
101 'testing': [
102 'bokeh',
103 'chainer>=5.0.0',
104 'cma',
105 'lightgbm',
106 'mock',
107 'mpi4py',
108 'mxnet',
109 'pandas',
110 'plotly>=4.0.0',
111 'pytest',
112 # TODO(Yanase): Update sklearn integration to support v0.22.1 or newer.
113 # See https://github.com/optuna/optuna/issues/825 for further details.
114 'scikit-learn>=0.19.0,<=0.22.0',
115 'scikit-optimize',
116 'xgboost',
117 ] + (['fastai<2'] if (3, 5) < sys.version_info[:2] < (3, 8) else [])
118 + ([
119 'keras',
120 'pytorch-ignite',
121 'pytorch-lightning',
122 'tensorflow',
123 'tensorflow-datasets',
124 'torch',
125 'torchvision>=0.5.0'
126 ] if sys.version_info[:2] < (3, 8) else []),
127 }
128
129 return requirements
130
131
132 def find_any_distribution(pkgs):
133 # type: (List[str]) -> Optional[pkg_resources.Distribution]
134
135 for pkg in pkgs:
136 try:
137 return pkg_resources.get_distribution(pkg)
138 except pkg_resources.DistributionNotFound:
139 pass
140 return None
141
142
143 pfnopt_pkg = find_any_distribution(['pfnopt'])
144 if pfnopt_pkg is not None:
145 msg = 'We detected that PFNOpt is installed in your environment.\n' \
146 'PFNOpt has been renamed Optuna. Please uninstall the old\n' \
147 'PFNOpt in advance (e.g. by executing `$ pip uninstall pfnopt`).'
148 print(msg)
149 exit(1)
150
151 setup(
152 name='optuna',
153 version=get_version(),
154 description='A hyperparameter optimization framework',
155 long_description=get_long_description(),
156 long_description_content_type='text/markdown',
157 author='Takuya Akiba',
158 author_email='[email protected]',
159 url='https://optuna.org/',
160 packages=find_packages(),
161 package_data={
162 'optuna': [
163 'storages/rdb/alembic.ini',
164 'storages/rdb/alembic/*.*',
165 'storages/rdb/alembic/versions/*.*'
166 ]
167 },
168 install_requires=get_install_requires(),
169 tests_require=get_tests_require(),
170 extras_require=get_extras_require(),
171 entry_points={'console_scripts': ['optuna = optuna.cli:main']})
172
[end of setup.py]
[start of examples/tensorflow_eager_simple.py]
1 """
2 Optuna example that optimizes multi-layer perceptrons using Tensorflow (Eager Execution).
3
4 In this example, we optimize the validation accuracy of hand-written digit recognition using
5 Tensorflow and MNIST. We optimize the neural network architecture as well as the optimizer
6 configuration.
7
8 We have the following two ways to execute this example:
9
10 (1) Execute this code directly.
11 $ python tensorflow_eager_simple.py
12
13
14 (2) Execute through CLI.
15 $ STUDY_NAME=`optuna create-study --direction maximize --storage sqlite:///example.db`
16 $ optuna study optimize tensorflow_eager_simple.py objective --n-trials=100 \
17 --study $STUDY_NAME --storage sqlite:///example.db
18
19 """
20
21 import tensorflow as tf
22 from tensorflow.keras.datasets import mnist
23
24 import optuna
25
26 N_TRAIN_EXAMPLES = 3000
27 N_TEST_EXAMPLES = 1000
28 BATCHSIZE = 128
29 CLASSES = 10
30 EPOCHS = 1
31 tf.enable_eager_execution()
32
33
34 def create_model(trial):
35 # We optimize the numbers of layers, their units and weight decay parameter.
36 n_layers = trial.suggest_int('n_layers', 1, 3)
37 weight_decay = trial.suggest_loguniform('weight_decay', 1e-10, 1e-3)
38 model = tf.keras.Sequential()
39 model.add(tf.keras.layers.Flatten())
40 for i in range(n_layers):
41 num_hidden = int(trial.suggest_loguniform('n_units_l{}'.format(i), 4, 128))
42 model.add(
43 tf.keras.layers.Dense(num_hidden,
44 activation='relu',
45 kernel_regularizer=tf.keras.regularizers.l2(weight_decay)))
46 model.add(
47 tf.keras.layers.Dense(CLASSES, kernel_regularizer=tf.keras.regularizers.l2(weight_decay)))
48 return model
49
50
51 def create_optimizer(trial):
52 # We optimize the choice of optimizers as well as their parameters.
53 kwargs = {}
54 optimizer_options = ['RMSPropOptimizer', 'AdamOptimizer', 'MomentumOptimizer']
55 optimizer_selected = trial.suggest_categorical('optimizer', optimizer_options)
56 if optimizer_selected == 'RMSPropOptimizer':
57 kwargs['learning_rate'] = trial.suggest_loguniform('rmsprop_learning_rate', 1e-5, 1e-1)
58 kwargs['decay'] = trial.suggest_uniform('rmsprop_decay', 0.85, 0.99)
59 kwargs['momentum'] = trial.suggest_loguniform('rmsprop_momentum', 1e-5, 1e-1)
60 elif optimizer_selected == 'AdamOptimizer':
61 kwargs['learning_rate'] = trial.suggest_loguniform('adam_learning_rate', 1e-5, 1e-1)
62 elif optimizer_selected == 'MomentumOptimizer':
63 kwargs['learning_rate'] = trial.suggest_loguniform('momentum_opt_learning_rate', 1e-5,
64 1e-1)
65 kwargs['momentum'] = trial.suggest_loguniform('momentum_opt_momentum', 1e-5, 1e-1)
66
67 optimizer = getattr(tf.train, optimizer_selected)(**kwargs)
68 return optimizer
69
70
71 def learn(model, optimizer, dataset, mode='eval'):
72 accuracy = tf.contrib.eager.metrics.Accuracy('accuracy', dtype=tf.float32)
73
74 for batch, (images, labels) in enumerate(dataset):
75 with tf.GradientTape() as tape:
76 logits = model(images, training=(mode == 'train'))
77 loss_value = tf.reduce_mean(
78 tf.nn.sparse_softmax_cross_entropy_with_logits(logits=logits, labels=labels))
79 if mode == 'eval':
80 accuracy(tf.argmax(logits, axis=1, output_type=tf.int64),
81 tf.cast(labels, tf.int64))
82 else:
83 grads = tape.gradient(loss_value, model.variables)
84 optimizer.apply_gradients(zip(grads, model.variables))
85
86 if mode == 'eval':
87 return accuracy
88
89
90 def get_mnist():
91 (x_train, y_train), (x_test, y_test) = mnist.load_data()
92 x_train = x_train.astype('float32') / 255
93 x_test = x_test.astype('float32') / 255
94
95 y_train = y_train.astype('int32')
96 y_test = y_test.astype('int32')
97
98 train_ds = tf.data.Dataset.from_tensor_slices((x_train, y_train))
99 train_ds = train_ds.shuffle(60000).batch(BATCHSIZE).take(N_TRAIN_EXAMPLES)
100
101 test_ds = tf.data.Dataset.from_tensor_slices((x_test, y_test))
102 test_ds = test_ds.shuffle(10000).batch(BATCHSIZE).take(N_TEST_EXAMPLES)
103 return train_ds, test_ds
104
105
106 # FYI: Objective functions can take additional arguments
107 # (https://optuna.readthedocs.io/en/stable/faq.html#objective-func-additional-args).
108 def objective(trial):
109 # Get MNIST data.
110 train_ds, test_ds = get_mnist()
111
112 # Build model and optimizer.
113 model = create_model(trial)
114 optimizer = create_optimizer(trial)
115
116 # Training and validating cycle.
117 with tf.device("/cpu:0"):
118 for _ in range(EPOCHS):
119 learn(model, optimizer, train_ds, 'train')
120
121 accuracy = learn(model, optimizer, test_ds, 'eval')
122
123 # Return last validation accuracy.
124 return accuracy.result()
125
126
127 if __name__ == '__main__':
128 study = optuna.create_study(direction='maximize')
129 study.optimize(objective, n_trials=100)
130
131 print('Number of finished trials: ', len(study.trials))
132
133 print('Best trial:')
134 trial = study.best_trial
135
136 print(' Value: ', trial.value)
137
138 print(' Params: ')
139 for key, value in trial.params.items():
140 print(' {}: {}'.format(key, value))
141
[end of examples/tensorflow_eager_simple.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/examples/tensorflow_eager_simple.py b/examples/tensorflow_eager_simple.py
--- a/examples/tensorflow_eager_simple.py
+++ b/examples/tensorflow_eager_simple.py
@@ -18,17 +18,20 @@
"""
+import pkg_resources
import tensorflow as tf
from tensorflow.keras.datasets import mnist
import optuna
+if pkg_resources.parse_version(tf.__version__) < pkg_resources.parse_version('2.0.0'):
+ raise RuntimeError('tensorflow>=2.0.0 is required for this example.')
+
N_TRAIN_EXAMPLES = 3000
N_TEST_EXAMPLES = 1000
BATCHSIZE = 128
CLASSES = 10
EPOCHS = 1
-tf.enable_eager_execution()
def create_model(trial):
@@ -51,25 +54,25 @@
def create_optimizer(trial):
# We optimize the choice of optimizers as well as their parameters.
kwargs = {}
- optimizer_options = ['RMSPropOptimizer', 'AdamOptimizer', 'MomentumOptimizer']
+ optimizer_options = ['RMSprop', 'Adam', 'SGD']
optimizer_selected = trial.suggest_categorical('optimizer', optimizer_options)
- if optimizer_selected == 'RMSPropOptimizer':
+ if optimizer_selected == 'RMSprop':
kwargs['learning_rate'] = trial.suggest_loguniform('rmsprop_learning_rate', 1e-5, 1e-1)
kwargs['decay'] = trial.suggest_uniform('rmsprop_decay', 0.85, 0.99)
kwargs['momentum'] = trial.suggest_loguniform('rmsprop_momentum', 1e-5, 1e-1)
- elif optimizer_selected == 'AdamOptimizer':
+ elif optimizer_selected == 'Adam':
kwargs['learning_rate'] = trial.suggest_loguniform('adam_learning_rate', 1e-5, 1e-1)
- elif optimizer_selected == 'MomentumOptimizer':
- kwargs['learning_rate'] = trial.suggest_loguniform('momentum_opt_learning_rate', 1e-5,
+ elif optimizer_selected == 'SGD':
+ kwargs['learning_rate'] = trial.suggest_loguniform('sgd_opt_learning_rate', 1e-5,
1e-1)
- kwargs['momentum'] = trial.suggest_loguniform('momentum_opt_momentum', 1e-5, 1e-1)
+ kwargs['momentum'] = trial.suggest_loguniform('sgd_opt_momentum', 1e-5, 1e-1)
- optimizer = getattr(tf.train, optimizer_selected)(**kwargs)
+ optimizer = getattr(tf.optimizers, optimizer_selected)(**kwargs)
return optimizer
def learn(model, optimizer, dataset, mode='eval'):
- accuracy = tf.contrib.eager.metrics.Accuracy('accuracy', dtype=tf.float32)
+ accuracy = tf.metrics.Accuracy('accuracy', dtype=tf.float32)
for batch, (images, labels) in enumerate(dataset):
with tf.GradientTape() as tape:
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -92,9 +92,7 @@
'keras',
'pytorch-ignite',
'pytorch-lightning',
- # TODO(Yanase): Update examples to support TensorFlow 2.0.
- # See https://github.com/optuna/optuna/issues/565 for further details.
- 'tensorflow<2.0.0',
+ 'tensorflow>=2.0.0',
'torch',
'torchvision>=0.5.0'
] if sys.version_info[:2] < (3, 8) else []),
| {"golden_diff": "diff --git a/examples/tensorflow_eager_simple.py b/examples/tensorflow_eager_simple.py\n--- a/examples/tensorflow_eager_simple.py\n+++ b/examples/tensorflow_eager_simple.py\n@@ -18,17 +18,20 @@\n \n \"\"\"\n \n+import pkg_resources\n import tensorflow as tf\n from tensorflow.keras.datasets import mnist\n \n import optuna\n \n+if pkg_resources.parse_version(tf.__version__) < pkg_resources.parse_version('2.0.0'):\n+ raise RuntimeError('tensorflow>=2.0.0 is required for this example.')\n+\n N_TRAIN_EXAMPLES = 3000\n N_TEST_EXAMPLES = 1000\n BATCHSIZE = 128\n CLASSES = 10\n EPOCHS = 1\n-tf.enable_eager_execution()\n \n \n def create_model(trial):\n@@ -51,25 +54,25 @@\n def create_optimizer(trial):\n # We optimize the choice of optimizers as well as their parameters.\n kwargs = {}\n- optimizer_options = ['RMSPropOptimizer', 'AdamOptimizer', 'MomentumOptimizer']\n+ optimizer_options = ['RMSprop', 'Adam', 'SGD']\n optimizer_selected = trial.suggest_categorical('optimizer', optimizer_options)\n- if optimizer_selected == 'RMSPropOptimizer':\n+ if optimizer_selected == 'RMSprop':\n kwargs['learning_rate'] = trial.suggest_loguniform('rmsprop_learning_rate', 1e-5, 1e-1)\n kwargs['decay'] = trial.suggest_uniform('rmsprop_decay', 0.85, 0.99)\n kwargs['momentum'] = trial.suggest_loguniform('rmsprop_momentum', 1e-5, 1e-1)\n- elif optimizer_selected == 'AdamOptimizer':\n+ elif optimizer_selected == 'Adam':\n kwargs['learning_rate'] = trial.suggest_loguniform('adam_learning_rate', 1e-5, 1e-1)\n- elif optimizer_selected == 'MomentumOptimizer':\n- kwargs['learning_rate'] = trial.suggest_loguniform('momentum_opt_learning_rate', 1e-5,\n+ elif optimizer_selected == 'SGD':\n+ kwargs['learning_rate'] = trial.suggest_loguniform('sgd_opt_learning_rate', 1e-5,\n 1e-1)\n- kwargs['momentum'] = trial.suggest_loguniform('momentum_opt_momentum', 1e-5, 1e-1)\n+ kwargs['momentum'] = trial.suggest_loguniform('sgd_opt_momentum', 1e-5, 1e-1)\n \n- optimizer = getattr(tf.train, optimizer_selected)(**kwargs)\n+ optimizer = getattr(tf.optimizers, optimizer_selected)(**kwargs)\n return optimizer\n \n \n def learn(model, optimizer, dataset, mode='eval'):\n- accuracy = tf.contrib.eager.metrics.Accuracy('accuracy', dtype=tf.float32)\n+ accuracy = tf.metrics.Accuracy('accuracy', dtype=tf.float32)\n \n for batch, (images, labels) in enumerate(dataset):\n with tf.GradientTape() as tape:\ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -92,9 +92,7 @@\n 'keras',\n 'pytorch-ignite',\n 'pytorch-lightning',\n- # TODO(Yanase): Update examples to support TensorFlow 2.0.\n- # See https://github.com/optuna/optuna/issues/565 for further details.\n- 'tensorflow<2.0.0',\n+ 'tensorflow>=2.0.0',\n 'torch',\n 'torchvision>=0.5.0'\n ] if sys.version_info[:2] < (3, 8) else []),\n", "issue": "TensorFlow examples do not work with TensorFlow==2.0.0.\n**Conditions**\r\n- Optuna version: 0.16.0\r\n- Python version: 3.7.2\r\n- OS: macOS 10.13.6\r\n- Machine Learning library to be optimized: TensorFlow 2.0.0\r\n\r\n**Code to reproduce**\r\n\r\n`examples/tensorflow_*` and `examples/pruning/tensorflow_*` do not work with TensorFlow==2.0.0.\r\n\r\n```\r\n$ python examples/tensorflow_estimator_simple.py\r\n\r\nTraceback (most recent call last):\r\n File \"examples/tensorflow_estimator_simple.py\", line 137, in <module>\r\n tf.app.run()\r\nAttributeError: module 'tensorflow' has no attribute 'app'\r\n```\r\n\r\n```\r\n$ python examples/tensorflow_eager_simple.py\r\nTraceback (most recent call last):\r\n File \"examples/tensorflow_eager_simple.py\", line 22, in <module>\r\n import tensorflow.contrib.eager as tfe\r\nModuleNotFoundError: No module named 'tensorflow.contrib'\r\n```\r\n\r\nRelated PR #564.\n", "before_files": [{"content": "import os\nimport sys\n\nimport pkg_resources\nfrom setuptools import find_packages\nfrom setuptools import setup\n\nfrom typing import Dict # NOQA\nfrom typing import List # NOQA\nfrom typing import Optional # NOQA\n\n\ndef get_version():\n # type: () -> str\n\n version_filepath = os.path.join(os.path.dirname(__file__), 'optuna', 'version.py')\n with open(version_filepath) as f:\n for line in f:\n if line.startswith('__version__'):\n return line.strip().split()[-1][1:-1]\n assert False\n\n\ndef get_long_description():\n # type: () -> str\n\n readme_filepath = os.path.join(os.path.dirname(__file__), 'README.md')\n with open(readme_filepath) as f:\n return f.read()\n\n\ndef get_install_requires():\n # type: () -> List[str]\n\n return [\n 'alembic',\n 'cliff',\n 'colorlog',\n 'numpy',\n 'scipy!=1.4.0',\n 'sqlalchemy>=1.1.0',\n 'tqdm',\n 'joblib',\n ]\n\n\ndef get_tests_require():\n # type: () -> List[str]\n\n return get_extras_require()['testing']\n\n\ndef get_extras_require():\n # type: () -> Dict[str, List[str]]\n\n requirements = {\n 'checking': [\n 'autopep8',\n 'hacking',\n 'mypy',\n ],\n 'codecov': [\n 'codecov',\n 'pytest-cov',\n ],\n 'doctest': [\n 'pandas',\n # TODO(Yanase): Update sklearn integration to support v0.22.1 or newer.\n # See https://github.com/optuna/optuna/issues/825 for further details.\n 'scikit-learn>=0.19.0,<=0.22.0',\n ],\n 'document': [\n 'lightgbm',\n 'sphinx',\n 'sphinx_rtd_theme',\n ],\n 'example': [\n 'catboost',\n 'chainer',\n 'lightgbm',\n 'mlflow',\n 'mxnet',\n 'scikit-image',\n # TODO(Yanase): Update sklearn integration to support v0.22.1 or newer.\n # See https://github.com/optuna/optuna/issues/825 for further details.\n 'scikit-learn<=0.22.0',\n 'xgboost',\n ] + (['fastai<2'] if (3, 5) < sys.version_info[:2] < (3, 8) else [])\n + ([\n 'dask[dataframe]',\n 'dask-ml',\n 'keras',\n 'pytorch-ignite',\n 'pytorch-lightning',\n # TODO(Yanase): Update examples to support TensorFlow 2.0.\n # See https://github.com/optuna/optuna/issues/565 for further details.\n 'tensorflow<2.0.0',\n 'torch',\n 'torchvision>=0.5.0'\n ] if sys.version_info[:2] < (3, 8) else []),\n 'testing': [\n 'bokeh',\n 'chainer>=5.0.0',\n 'cma',\n 'lightgbm',\n 'mock',\n 'mpi4py',\n 'mxnet',\n 'pandas',\n 'plotly>=4.0.0',\n 'pytest',\n # TODO(Yanase): Update sklearn integration to support v0.22.1 or newer.\n # See https://github.com/optuna/optuna/issues/825 for further details.\n 'scikit-learn>=0.19.0,<=0.22.0',\n 'scikit-optimize',\n 'xgboost',\n ] + (['fastai<2'] if (3, 5) < sys.version_info[:2] < (3, 8) else [])\n + ([\n 'keras',\n 'pytorch-ignite',\n 'pytorch-lightning',\n 'tensorflow',\n 'tensorflow-datasets',\n 'torch',\n 'torchvision>=0.5.0'\n ] if sys.version_info[:2] < (3, 8) else []),\n }\n\n return requirements\n\n\ndef find_any_distribution(pkgs):\n # type: (List[str]) -> Optional[pkg_resources.Distribution]\n\n for pkg in pkgs:\n try:\n return pkg_resources.get_distribution(pkg)\n except pkg_resources.DistributionNotFound:\n pass\n return None\n\n\npfnopt_pkg = find_any_distribution(['pfnopt'])\nif pfnopt_pkg is not None:\n msg = 'We detected that PFNOpt is installed in your environment.\\n' \\\n 'PFNOpt has been renamed Optuna. Please uninstall the old\\n' \\\n 'PFNOpt in advance (e.g. by executing `$ pip uninstall pfnopt`).'\n print(msg)\n exit(1)\n\nsetup(\n name='optuna',\n version=get_version(),\n description='A hyperparameter optimization framework',\n long_description=get_long_description(),\n long_description_content_type='text/markdown',\n author='Takuya Akiba',\n author_email='[email protected]',\n url='https://optuna.org/',\n packages=find_packages(),\n package_data={\n 'optuna': [\n 'storages/rdb/alembic.ini',\n 'storages/rdb/alembic/*.*',\n 'storages/rdb/alembic/versions/*.*'\n ]\n },\n install_requires=get_install_requires(),\n tests_require=get_tests_require(),\n extras_require=get_extras_require(),\n entry_points={'console_scripts': ['optuna = optuna.cli:main']})\n", "path": "setup.py"}, {"content": "\"\"\"\nOptuna example that optimizes multi-layer perceptrons using Tensorflow (Eager Execution).\n\nIn this example, we optimize the validation accuracy of hand-written digit recognition using\nTensorflow and MNIST. We optimize the neural network architecture as well as the optimizer\nconfiguration.\n\nWe have the following two ways to execute this example:\n\n(1) Execute this code directly.\n $ python tensorflow_eager_simple.py\n\n\n(2) Execute through CLI.\n $ STUDY_NAME=`optuna create-study --direction maximize --storage sqlite:///example.db`\n $ optuna study optimize tensorflow_eager_simple.py objective --n-trials=100 \\\n --study $STUDY_NAME --storage sqlite:///example.db\n\n\"\"\"\n\nimport tensorflow as tf\nfrom tensorflow.keras.datasets import mnist\n\nimport optuna\n\nN_TRAIN_EXAMPLES = 3000\nN_TEST_EXAMPLES = 1000\nBATCHSIZE = 128\nCLASSES = 10\nEPOCHS = 1\ntf.enable_eager_execution()\n\n\ndef create_model(trial):\n # We optimize the numbers of layers, their units and weight decay parameter.\n n_layers = trial.suggest_int('n_layers', 1, 3)\n weight_decay = trial.suggest_loguniform('weight_decay', 1e-10, 1e-3)\n model = tf.keras.Sequential()\n model.add(tf.keras.layers.Flatten())\n for i in range(n_layers):\n num_hidden = int(trial.suggest_loguniform('n_units_l{}'.format(i), 4, 128))\n model.add(\n tf.keras.layers.Dense(num_hidden,\n activation='relu',\n kernel_regularizer=tf.keras.regularizers.l2(weight_decay)))\n model.add(\n tf.keras.layers.Dense(CLASSES, kernel_regularizer=tf.keras.regularizers.l2(weight_decay)))\n return model\n\n\ndef create_optimizer(trial):\n # We optimize the choice of optimizers as well as their parameters.\n kwargs = {}\n optimizer_options = ['RMSPropOptimizer', 'AdamOptimizer', 'MomentumOptimizer']\n optimizer_selected = trial.suggest_categorical('optimizer', optimizer_options)\n if optimizer_selected == 'RMSPropOptimizer':\n kwargs['learning_rate'] = trial.suggest_loguniform('rmsprop_learning_rate', 1e-5, 1e-1)\n kwargs['decay'] = trial.suggest_uniform('rmsprop_decay', 0.85, 0.99)\n kwargs['momentum'] = trial.suggest_loguniform('rmsprop_momentum', 1e-5, 1e-1)\n elif optimizer_selected == 'AdamOptimizer':\n kwargs['learning_rate'] = trial.suggest_loguniform('adam_learning_rate', 1e-5, 1e-1)\n elif optimizer_selected == 'MomentumOptimizer':\n kwargs['learning_rate'] = trial.suggest_loguniform('momentum_opt_learning_rate', 1e-5,\n 1e-1)\n kwargs['momentum'] = trial.suggest_loguniform('momentum_opt_momentum', 1e-5, 1e-1)\n\n optimizer = getattr(tf.train, optimizer_selected)(**kwargs)\n return optimizer\n\n\ndef learn(model, optimizer, dataset, mode='eval'):\n accuracy = tf.contrib.eager.metrics.Accuracy('accuracy', dtype=tf.float32)\n\n for batch, (images, labels) in enumerate(dataset):\n with tf.GradientTape() as tape:\n logits = model(images, training=(mode == 'train'))\n loss_value = tf.reduce_mean(\n tf.nn.sparse_softmax_cross_entropy_with_logits(logits=logits, labels=labels))\n if mode == 'eval':\n accuracy(tf.argmax(logits, axis=1, output_type=tf.int64),\n tf.cast(labels, tf.int64))\n else:\n grads = tape.gradient(loss_value, model.variables)\n optimizer.apply_gradients(zip(grads, model.variables))\n\n if mode == 'eval':\n return accuracy\n\n\ndef get_mnist():\n (x_train, y_train), (x_test, y_test) = mnist.load_data()\n x_train = x_train.astype('float32') / 255\n x_test = x_test.astype('float32') / 255\n\n y_train = y_train.astype('int32')\n y_test = y_test.astype('int32')\n\n train_ds = tf.data.Dataset.from_tensor_slices((x_train, y_train))\n train_ds = train_ds.shuffle(60000).batch(BATCHSIZE).take(N_TRAIN_EXAMPLES)\n\n test_ds = tf.data.Dataset.from_tensor_slices((x_test, y_test))\n test_ds = test_ds.shuffle(10000).batch(BATCHSIZE).take(N_TEST_EXAMPLES)\n return train_ds, test_ds\n\n\n# FYI: Objective functions can take additional arguments\n# (https://optuna.readthedocs.io/en/stable/faq.html#objective-func-additional-args).\ndef objective(trial):\n # Get MNIST data.\n train_ds, test_ds = get_mnist()\n\n # Build model and optimizer.\n model = create_model(trial)\n optimizer = create_optimizer(trial)\n\n # Training and validating cycle.\n with tf.device(\"/cpu:0\"):\n for _ in range(EPOCHS):\n learn(model, optimizer, train_ds, 'train')\n\n accuracy = learn(model, optimizer, test_ds, 'eval')\n\n # Return last validation accuracy.\n return accuracy.result()\n\n\nif __name__ == '__main__':\n study = optuna.create_study(direction='maximize')\n study.optimize(objective, n_trials=100)\n\n print('Number of finished trials: ', len(study.trials))\n\n print('Best trial:')\n trial = study.best_trial\n\n print(' Value: ', trial.value)\n\n print(' Params: ')\n for key, value in trial.params.items():\n print(' {}: {}'.format(key, value))\n", "path": "examples/tensorflow_eager_simple.py"}]} | 4,072 | 828 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.