pytrendy 2.0.0.dev2__py3-none-any.whl → 2.0.0.dev3__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -24,6 +24,23 @@ def _safe_adjacent(index, pos, offset):
24
24
  return index[new_pos]
25
25
  return None
26
26
 
27
+ def _adjacent_to(index, value, offset):
28
+ """
29
+ Return the index value adjacent to *value* (``offset`` of +1 or -1), or None.
30
+
31
+ Boundary displacement must follow the actual point spacing rather than a
32
+ hard-coded daily step, otherwise non-daily data (e.g. weekly dates) leaves
33
+ white gaps between shaded segments. For a contiguous daily index this is
34
+ equivalent to ``value +/- 1 day``.
35
+ """
36
+ try:
37
+ pos = index.get_loc(value)
38
+ except KeyError:
39
+ return None
40
+ if not isinstance(pos, int):
41
+ return None # non-unique index: no well-defined adjacent point
42
+ return _safe_adjacent(index, pos, offset)
43
+
27
44
  def plot_pytrendy(df: pd.DataFrame, value_col: str, segments_enhanced: list[dict], index_type: str = "date", suppress_show: bool = False, plot_params: dict = None) -> plt.Figure:
28
45
  """
29
46
  Visualizes detected trend segments over the original time series signal.
@@ -116,7 +133,8 @@ def plot_pytrendy(df: pd.DataFrame, value_col: str, segments_enhanced: list[dict
116
133
  # Get context on prev seg if possible
117
134
  prev_seg = segments_enhanced[i-1] if i-1 >= 0 else None
118
135
  if index_type == "date":
119
- prev_neighbouring = prev_seg and (pd.to_datetime(prev_seg['end']) == (start - pd.Timedelta(days=1)))
136
+ prev_point = _adjacent_to(df.index, start, -1)
137
+ prev_neighbouring = prev_seg and (prev_point is not None) and (pd.to_datetime(prev_seg['end']) == prev_point)
120
138
  elif index_type == 'string':
121
139
  prev_neighbouring = prev_seg and (prev_seg['end'] == df.index[df.index.get_loc(start) - 1])
122
140
  else:
@@ -132,7 +150,8 @@ def plot_pytrendy(df: pd.DataFrame, value_col: str, segments_enhanced: list[dict
132
150
  # Get context on next seg if possible
133
151
  next_seg = segments_enhanced[i+1] if i+1 < len(segments_enhanced) else None
134
152
  if index_type == 'date':
135
- next_neighbouring = next_seg and (pd.to_datetime(next_seg['start']) == (end + pd.Timedelta(days=1)))
153
+ next_point = _adjacent_to(df.index, end, 1)
154
+ next_neighbouring = next_seg and (next_point is not None) and (pd.to_datetime(next_seg['start']) == next_point)
136
155
  elif index_type == 'string':
137
156
  end_pos = df.index.get_loc(end)
138
157
  next_neighbouring = next_seg and (next_seg['start'] == _safe_adjacent(df.index, end_pos, 1))
@@ -147,7 +166,7 @@ def plot_pytrendy(df: pd.DataFrame, value_col: str, segments_enhanced: list[dict
147
166
  pass # Keep start as-is for abrupt/noise segments
148
167
  else:
149
168
  if index_type == 'date':
150
- new_start = start - pd.Timedelta(days=1) # Everything else displaced left start
169
+ new_start = _adjacent_to(df.index, start, -1) # Everything else displaced left start
151
170
  elif index_type == 'string':
152
171
  start_pos = df.index.get_loc(start)
153
172
  new_start = _safe_adjacent(df.index, start_pos, -1)
@@ -161,14 +180,15 @@ def plot_pytrendy(df: pd.DataFrame, value_col: str, segments_enhanced: list[dict
161
180
 
162
181
  valid_up_start = (value_new_start) and (seg['direction'] == 'Up') and (value_new_start < value)
163
182
  valid_down_start = (value_new_start) and (seg['direction'] == 'Down') and (value_new_start > value)
164
- if valid_up_start or valid_down_start or is_not_trend:
183
+ if (valid_up_start or valid_down_start or is_not_trend) and new_start is not None:
165
184
  start = new_start # Apply left displacement only if valid
166
185
  else:
167
186
  # if not displaced and prev is not trend, adjust by plotting (as prev has already been drawn)
168
187
  if is_prev_not_trend and prev_neighbouring:
169
188
  if index_type == 'date':
170
189
  prev_end = pd.to_datetime(segments_enhanced[i-1]['end'])
171
- prev_new_end = (prev_end + pd.Timedelta(days=1)).strftime('%Y-%m-%d')
190
+ prev_adj_end = _adjacent_to(df.index, prev_end, 1)
191
+ prev_new_end = prev_adj_end.strftime('%Y-%m-%d') if prev_adj_end is not None else None
172
192
  elif index_type == 'string':
173
193
  prev_end = segments_enhanced[i-1]['end']
174
194
  prev_end_pos = df.index.get_loc(prev_end)
@@ -188,7 +208,7 @@ def plot_pytrendy(df: pd.DataFrame, value_col: str, segments_enhanced: list[dict
188
208
  # Adjust ends when appropriate
189
209
  if (next_seg_abrupt or next_seg_noise) and next_neighbouring:
190
210
  if index_type == 'date':
191
- new_end = end + pd.Timedelta(days=1)
211
+ new_end = _adjacent_to(df.index, end, 1)
192
212
  elif index_type == 'string':
193
213
  end_pos = df.index.get_loc(end)
194
214
  new_end = _safe_adjacent(df.index, end_pos, 1)
@@ -202,13 +222,16 @@ def plot_pytrendy(df: pd.DataFrame, value_col: str, segments_enhanced: list[dict
202
222
  valid_up_end = (value_new_end) and (seg['direction'] == 'Up') and (value_new_end > value)
203
223
  valid_down_end = (value_new_end) and (seg['direction'] == 'Down') and (value_new_end < value)
204
224
  is_not_trend = not ('trend_class' in seg)
205
- if valid_up_end or valid_down_end or is_not_trend:
225
+ if (valid_up_end or valid_down_end or is_not_trend) and new_end is not None:
206
226
  end = new_end # Apply right displacement only if valid
207
227
  else:
208
228
  # if not displaced and next is noise, adjust for next plotting round
209
229
  if next_seg_noise and next_neighbouring:
210
230
  if index_type == 'date':
211
- segments_enhanced[i+1]['start'] = (pd.to_datetime(segments_enhanced[i+1]['start']) - pd.Timedelta(days=1)).strftime('%Y-%m-%d')
231
+ next_start = pd.to_datetime(segments_enhanced[i+1]['start'])
232
+ next_adj_start = _adjacent_to(df.index, next_start, -1)
233
+ if next_adj_start is not None:
234
+ segments_enhanced[i+1]['start'] = next_adj_start.strftime('%Y-%m-%d')
212
235
  elif index_type == 'string':
213
236
  next_start_pos = df.index.get_loc(segments_enhanced[i+1]['start'])
214
237
  segments_enhanced[i+1]['start'] = _safe_adjacent(df.index, next_start_pos, -1)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pytrendy
3
- Version: 2.0.0.dev2
3
+ Version: 2.0.0.dev3
4
4
  Summary: Trend Detection in Python. Applicable for real-world industry use cases in time series.
5
5
  License: MIT License
6
6
 
@@ -55,6 +55,7 @@ Requires-Dist: pytest ; extra == "dev"
55
55
  Requires-Dist: pytest-cov ; extra == "dev"
56
56
  Requires-Dist: pytest-mpl ; extra == "dev"
57
57
  Requires-Dist: pytest-timeout ; extra == "dev"
58
+ Requires-Dist: ruff ; extra == "dev"
58
59
  Requires-Dist: scipy
59
60
  Project-URL: Documentation, https://russellsb.github.io/pytrendy/main/
60
61
  Project-URL: Homepage, https://russellsb.github.io/pytrendy/main/
@@ -4,7 +4,7 @@ pytrendy/io/__init__.py,sha256=-cUdMdV4Apjev8QH_6VOWISp4UPaJHu02BTNIYO3rb0,1357
4
4
  pytrendy/io/data/classes_signals.csv,sha256=D9sPKQjSvAQc3ZCWUwahyzU4fKOjYMRbXPM4aSj8gsY,251
5
5
  pytrendy/io/data/series_synthetic.csv,sha256=NHsAKmNu5uWYkOXg_uAJ3xZKEEFaXYsjT4dhcZJvjLY,8681
6
6
  pytrendy/io/data_loader.py,sha256=p49OVeFw-39fc0BDD32w8s90N0UZnO3gHz_1hby4evE,1136
7
- pytrendy/io/plot_pytrendy.py,sha256=U2tPKypgfYXnfixS2loB1JZETA3dot-bvmA_xNu4gK0,14344
7
+ pytrendy/io/plot_pytrendy.py,sha256=EHPF4vcF0fTrYHLxWuPxg27jkJl5g5wz29kSExXrlBc,15448
8
8
  pytrendy/io/prepare_index.py,sha256=QTquO_iktcx6UKRduVfdT5oTBlHJtStGMJnniBG4f-Q,8345
9
9
  pytrendy/io/results_pytrendy.py,sha256=h5Frarg6FpCORHP3s7a7t85lBkv8A0n0OqXc3yFFyNw,8384
10
10
  pytrendy/post_processing/__init__.py,sha256=bvn1pcxRAoyq5C1P7v5gnb6HiPzteyxT3y9dOY8Pemc,2569
@@ -19,7 +19,7 @@ pytrendy/post_processing/segments_refine/trend_classify.py,sha256=aJwutjfMz64t7f
19
19
  pytrendy/post_processing/segments_refine/update_neighbours.py,sha256=4MqOEllUADv8W5nBwfGL3NZNlM9cEYwh3ohb3VWIWU8,3784
20
20
  pytrendy/process_signals.py,sha256=eE7gpnagkNuIcWDKxMvq8tdiv15XrK7rbOqcF_Tdg3c,11564
21
21
  pytrendy/simpledtw.py,sha256=tGsbnRgh4VqnA5XVxPCfYHnJXjvLlVHVGHQ4cGX4eUw,2945
22
- pytrendy-2.0.0.dev2.dist-info/METADATA,sha256=EcbKrHtCML6KZKiq-vVIftrRFabYiIjTYQNhbMzOY0A,8684
23
- pytrendy-2.0.0.dev2.dist-info/WHEEL,sha256=EGEvSphFYqXKs23-kQBeyNoJP1nrT8ZJKQoi5p5DYL8,88
24
- pytrendy-2.0.0.dev2.dist-info/licenses/LICENSE,sha256=I00f93GihSG6Gqqw3qerxzO53oj_crz0sjynXCiHX_0,1079
25
- pytrendy-2.0.0.dev2.dist-info/RECORD,,
22
+ pytrendy-2.0.0.dev3.dist-info/METADATA,sha256=DzXRaI_ghIm78g5ejTE4jN2H0zorvcmWQl93yW1Mnog,8721
23
+ pytrendy-2.0.0.dev3.dist-info/WHEEL,sha256=EGEvSphFYqXKs23-kQBeyNoJP1nrT8ZJKQoi5p5DYL8,88
24
+ pytrendy-2.0.0.dev3.dist-info/licenses/LICENSE,sha256=I00f93GihSG6Gqqw3qerxzO53oj_crz0sjynXCiHX_0,1079
25
+ pytrendy-2.0.0.dev3.dist-info/RECORD,,