pipeline-eds 0.2.22__py3-none-any.whl → 0.2.24__py3-none-any.whl

pipeline/cli.py

@@ -154,15 +154,15 @@ def trend(
         queries_manager = QueriesManager(wm)
         dt_start = queries_manager.get_most_recent_successful_timestamp(api_id=zd)
     else:
-        dt_start = pendulum.parse(starttime, strict=False)
+        dt_start = pendulum.parse(helpers.sanitize_date_input(starttime), strict=False)
     if endtime is None:
         dt_finish = helpers.get_now_time_rounded(wm)
     else:
-        dt_finish = pendulum.parse(endtime, strict=False)
+        dt_finish = pendulum.parse(helpers.sanitize_date_input(endtime), strict=False)
 
     # Should automatically choose time step granularity based on time length; map 
     if step_seconds is None:
-        step_seconds = helpers.nice_step(TimeManager(dt_finish).as_unix()-TimeManager(dt_start.as_unix())) # TimeManager(starttime).as_unix()
+        step_seconds = helpers.nice_step(TimeManager(dt_finish).as_unix()-TimeManager(dt_start).as_unix()) # TimeManager(starttime).as_unix()
     results = load_historic_data(session, iess_list, dt_start, dt_finish, step_seconds) 
     if not results:
         return 

pipeline/helpers.py

@@ -6,6 +6,7 @@ import types
 import os
 import logging
 import socket
+import re
 
 from pipeline.time_manager import TimeManager
 
@@ -120,6 +121,20 @@ def nice_step(delta_sec: int) -> int:
         if n >= target_step:
             return n
     return nice_numbers[-1]
+
+
+
+def sanitize_date_input(date_str: str) -> str:
+    '''Sanitize date input strings by adding spaces where needed, to overcome error in fuzzy date parsing by the pendulum library.'''
+    # 1. Add space between letters and numbers
+    date_str = re.sub(r'([A-Za-z])(\d)', r'\1 \2', date_str)
+    # 2. Ensure a space after commas
+    date_str = re.sub(r',\s*', ', ', date_str)
+    # 3. Normalize multiple spaces
+    date_str = re.sub(r'\s+', ' ', date_str).strip()
+    return date_str
     
 if __name__ == "__main__":
-    function_view()
+    function_view()
+    # Example
+    sanitize_date_input("December12,2024")  # -> "December 12,2024"

pipeline/workspace_manager.py

@@ -3,7 +3,22 @@ import toml
 import logging
 from pathlib import Path
 import sys
-import mulch
+#import mulch
+import importlib.util
+import sys
+from pathlib import Path
+
+# current_dir = this pipeline repo
+repo_root = Path(__file__).resolve().parents[3]  # adjust if needed
+mulch_path = repo_root / "mulch" / "src" / "mulch" / "__init__.py"
+
+if not mulch_path.exists():
+    raise FileNotFoundError(f"Expected mulch at {mulch_path}")
+
+spec = importlib.util.spec_from_file_location("mulch", str(mulch_path))
+mulch = importlib.util.module_from_spec(spec)
+sys.modules["mulch"] = mulch
+spec.loader.exec_module(mulch)
 
 '''
 Goal:
@@ -313,7 +328,7 @@ class WorkspaceManager:
             pass
             #default_file.write_text("# Default workspace config\n")
         mulch_scaffold = []
-        mulch.seed(target_dir = workspaces_dir,scaffold_dict = mulch_scaffold)
+        mulch.seed(target_dir = workspaces_dir,scaffold_dict = mulch_scaffold, skip_if_exists=True)
         workspace_path = workspaces_dir / "eds"
         mulch.workspace(base_path = workspaces_dir.parent, scaffold_filepath = workspaces_dir / '.mulch' / 'mulch.toml', workspace_path = workspace_path) # allow date based default if no workspace_name is provided
         return workspaces_dir

{pipeline_eds-0.2.22.dist-info → pipeline_eds-0.2.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pipeline-eds
-Version: 0.2.22
+Version: 0.2.24
 Summary: The official API pipeline library for mulch-based projects. Key target: Emerson Ovation EDS REST API.
 License: BSD-3
 Author: George Clayton Bennett
@@ -15,7 +15,7 @@ Provides-Extra: windb
 Requires-Dist: certifi (>=2025.1.31,<2026.0.0)
 Requires-Dist: fastapi (>=0.116.1,<0.117.0)
 Requires-Dist: matplotlib (>=3.10.6,<4.0.0)
-Requires-Dist: mulch (==0.2.58)
+Requires-Dist: mulch (>=0.2.62,<0.3.0)
 Requires-Dist: mysql-connector-python (>=9.3.0,<10.0.0)
 Requires-Dist: pendulum (>=3.1.0,<4.0.0)
 Requires-Dist: plotly (>=6.2.0,<7.0.0)

{pipeline_eds-0.2.22.dist-info → pipeline_eds-0.2.24.dist-info}/RECORD

@@ -5,7 +5,7 @@ pipeline/api/eds.py,sha256=O6kHH9KsBKIXiLrT0Cj84g_UUIhjlK8vPPJbG2MP0DU,45087
 pipeline/api/rjn.py,sha256=Fhbc3tE_WgUywVJimnLzhWnxyMzGiIUu54hRFR3sdUA,7102
 pipeline/api/status_api.py,sha256=KJG7e4GXmTjqQxK3LFUcdAxj1jqzvNLJ0f9-tuisk00,202
 pipeline/calls.py,sha256=FexXJK0_fwgQMPx9dy5eFai_6xqVOsOGoEUw8yP3eSU,4187
-pipeline/cli.py,sha256=KRn68XZ708GTRw-JB3fUbLAtSFulbpgFDTvXNfoXsHg,11899
+pipeline/cli.py,sha256=o8DP1npD3dxgt043tEbf19RFHpMoT9fAcd8SBo8getA,11957
 pipeline/configrationmanager.py,sha256=UPqa91117jNm59vvTBE7sET1ThisqRf6B2Dhtk7x9tM,624
 pipeline/decorators.py,sha256=5fIIVqxSvQFaSI4ZkqPd3yqajzDxaRhgYwlC1jD2k5A,411
 pipeline/env.py,sha256=aVYssr6b5fVXt1GxehloyOv7fbRmuUzSQ7uQz4zwI_0,1926
@@ -13,7 +13,7 @@ pipeline/environment.py,sha256=ABXv5DAWW0EGrnE27dJNkj_aKmyD6e84RDSMyW1qKzE,1523
 pipeline/gui_fastapi_plotly_live.py,sha256=bje-W93yWb7G7A5H7Rg7BgNpfV_fjxhbl7x7zwkUCXc,3246
 pipeline/gui_mpl_live.py,sha256=JLh2YWK2SwGykik7mC_HfNMVzVVYymoEnwzSB7VHrIk,4286
 pipeline/gui_plotly_static.py,sha256=wUNTjLqsuldWRYu65w5-HDco4201FKAO5esMe2NOras,1133
-pipeline/helpers.py,sha256=-GGFz5t22wlFfHwtEDwWOBslzguLXXSYNzxxRBvclLI,4457
+pipeline/helpers.py,sha256=8tbg0EB_7Jg3oFJxvPmb0n1QtOdqa4zIogEIOuJM2ko,5050
 pipeline/install_appdata.py,sha256=DGemGRogMVAmFzqSKladfxgLQOslIHyul2Xxq34do8A,2814
 pipeline/logging_setup.py,sha256=CAqWfchscCdzJ63Wf1dC3QGRnFnQqBELxyTmPZxsxgs,1674
 pipeline/pastehelpers.py,sha256=pkmtULW5Zk_-ffUDDp_VsGzruIjsNB1xAIPbb9jtofE,265
@@ -22,7 +22,7 @@ pipeline/plotbuffer.py,sha256=jCsFbT47TdR8Sq5tjj2JdhVELjRiebLPN7O4r2LjPeY,625
 pipeline/points_loader.py,sha256=4OCGLiatbP3D5hixVnYcFGThvBRYt_bf5DhNGdGw_9k,519
 pipeline/queriesmanager.py,sha256=iQRPZDnllhQ4_nI7764SgUCxA0Wy5-cA32y-7tR5vBE,5011
 pipeline/time_manager.py,sha256=gSK430SyHvhgUWLRg_z2nBiyad01v7ByyKafB138IkU,8351
-pipeline/workspace_manager.py,sha256=cpBecFipE7f1_xTxiE9jmQ7U7Nnk6Ovg22lxlchnzI8,15335
+pipeline/workspace_manager.py,sha256=_5NwwD6vF9XthoFAiY3COwBcZ_ZcDcxrq962kwkAIDk,15872
 workspaces/default-workspace.toml,sha256=dI8y2l2WlEbIck6IZpbuQUP8-Bf48bBE1CKKsnVMc8w,300
 workspaces/eds_to_rjn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 workspaces/eds_to_rjn/code/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -57,8 +57,8 @@ workspaces/eds_to_rjn/scripts/daemon_runner.py,sha256=gBCYrJ-FYPCTt_l5O07_YNrrGj
 workspaces/eds_to_rjn/secrets/README.md,sha256=tWf2bhopA0C08C8ImtHNZoPde9ub-sLMjX6EMe7lyJw,600
 workspaces/eds_to_rjn/secrets/secrets-example.yaml,sha256=qKGrKsKBC0ulDQRVbr1zkfNlr8WPWK4lg5GAvTqZ-T4,365
 workspaces/eds_to_termux/..txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pipeline_eds-0.2.22.dist-info/entry_points.txt,sha256=jmU0FQ7-2AHXhKcj4TXPn61xLbHlycHA2lkDlRZT-pg,124
-pipeline_eds-0.2.22.dist-info/LICENSE,sha256=LKdx0wS1t9vFZpbRhDg_iLQ6ny-XsXRwhKAoCfrF6iA,1501
-pipeline_eds-0.2.22.dist-info/METADATA,sha256=l-zeLOv48wC5ceym6O7c_f0lIULO1QJOb0cPv6Ocxfo,10021
-pipeline_eds-0.2.22.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pipeline_eds-0.2.22.dist-info/RECORD,,
+pipeline_eds-0.2.24.dist-info/entry_points.txt,sha256=jmU0FQ7-2AHXhKcj4TXPn61xLbHlycHA2lkDlRZT-pg,124
+pipeline_eds-0.2.24.dist-info/LICENSE,sha256=LKdx0wS1t9vFZpbRhDg_iLQ6ny-XsXRwhKAoCfrF6iA,1501
+pipeline_eds-0.2.24.dist-info/METADATA,sha256=hYReh3SL6rhx91IV0WXzCfD1faKLIXPOs3d06TwvHbo,10028
+pipeline_eds-0.2.24.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pipeline_eds-0.2.24.dist-info/RECORD,,