pipeline-eds 0.2.23__tar.gz → 0.2.24__tar.gz

{pipeline_eds-0.2.23 → pipeline_eds-0.2.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pipeline-eds
-Version: 0.2.23
+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.59)
+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.23 → pipeline_eds-0.2.24}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pipeline-eds"
-version = "0.2.23"
+version = "0.2.24"
 description = "The official API pipeline library for mulch-based projects. Key target: Emerson Ovation EDS REST API."
 authors = ["George Clayton Bennett <george.bennett@memphistn.gov>"]
 license = "BSD-3"
@@ -48,7 +48,7 @@ tzdata = "^2025.2"
 pendulum = "^3.1.0"
 fastapi = "^0.116.1"
 matplotlib = "^3.10.6"
-mulch = "0.2.59"
+mulch = "^0.2.62"
 
 [tool.poetry.extras]
 windb = ["pyodbc"]

{pipeline_eds-0.2.23 → pipeline_eds-0.2.24}/src/pipeline/cli.py

@@ -154,11 +154,11 @@ 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:

{pipeline_eds-0.2.23 → pipeline_eds-0.2.24}/src/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_eds-0.2.23 → pipeline_eds-0.2.24}/src/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