pipeline-eds 0.2.15__tar.gz → 0.2.18__tar.gz

{pipeline_eds-0.2.15 → pipeline_eds-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pipeline-eds
-Version: 0.2.15
+Version: 0.2.18
 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.8,<0.3.0)
+Requires-Dist: mulch (==0.2.58)
 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.15 → pipeline_eds-0.2.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pipeline-eds"
-version = "0.2.15"
+version = "0.2.18"
 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"
@@ -43,12 +43,12 @@ pydantic = "1.10.13"
 urllib3 = "^2.4.0"
 plotly = "^6.2.0"
 uvicorn = "^0.34.3"
-mulch = "^0.2.8"
 mysql-connector-python = "^9.3.0"
 tzdata = "^2025.2"
 pendulum = "^3.1.0"
 fastapi = "^0.116.1"
 matplotlib = "^3.10.6"
+mulch = "0.2.58"
 
 [tool.poetry.extras]
 windb = ["pyodbc"]

{pipeline_eds-0.2.15 → pipeline_eds-0.2.18}/src/pipeline/cli.py

@@ -17,7 +17,7 @@ from importlib.metadata import version, PackageNotFoundError
 
 from pipeline.env import SecretConfig
 #from pipeline.helpers import setup_logging
-from pipeline.workspace_manager import WorkspaceManager
+#from pipeline.workspace_manager import WorkspaceManager
 
 ### Versioning
 CLI_APP_NAME = "pipeline"
@@ -71,6 +71,7 @@ def run(
     Import and run a workspace's main() function.
     """
     # Determine workspace name
+    from pipeline.workspace_manager import WorkspaceManager
     if workspace is None:
         workspace = WorkspaceManager.identify_default_workspace_name()
     wm = WorkspaceManager(workspace)
@@ -160,7 +161,7 @@ def trend(
 
     # Should automatically choose time step granularity based on time length; map 
     if step_seconds is None:
-        step_seconds = helpers.nice_step(endtime-starttime)
+        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_eds-0.2.15 → pipeline_eds-0.2.18}/src/pipeline/env.py

@@ -1,8 +1,6 @@
 #env.__main__.py
  
 import yaml
-from pipeline.workspace_manager import WorkspaceManager 
-
 '''
 migrate this to ConfigurationManager
 '''
@@ -49,6 +47,8 @@ def demo_secrets():
     caed defaut_workspace.toml - Clayton Bennett 26 April 2025.
     However this call can also be made if another project is made the active project.
     """
+    from pipeline.workspace_manager import WorkspaceManager 
+
     workspace_name = WorkspaceManager.identify_default_workspace_name()
     workspace_manager = WorkspaceManager(workspace_name)
     config = SecretConfig.load_config(secrets_file_path = workspace_manager.get_secrets_file_path())

{pipeline_eds-0.2.15 → pipeline_eds-0.2.18}/src/pipeline/workspace_manager.py

@@ -3,6 +3,7 @@ import toml
 import logging
 from pathlib import Path
 import sys
+import mulch
 
 '''
 Goal:
@@ -220,12 +221,20 @@ class WorkspaceManager:
         """
         Class method that reads default-workspace.toml to identify the default-workspace path.
         """
-        workspace_name = cls.identify_default_workspace_name()
+
         workspaces_dir = cls.ROOT_DIR / cls.WORKSPACES_DIR_NAME
-        default_workspace_path = workspaces_dir / workspace_name
-        if not default_workspace_path.exists():
-            raise FileNotFoundError(f"Default workspace directory not found: {default_workspace_path}")
-        return default_workspace_path
+        workspace_name = cls.identify_default_workspace_name()
+        if workspace_name is None:
+            workspace_name = cls.most_recent_workspace_name() # if 
+        if workspace_name is None:
+            mulch.workspace(target_dir = workspaces_dir, scaffold = workspaces_dir / '.mulch' / 'mulch.toml', workspace_name = 'eds') # allow date based default if no workspace_name is provided
+            workspace_name = 'eds'    
+        workspace_path = workspaces_dir / workspace_name
+        if not workspace_path.exists():
+            #raise FileNotFoundError(f"Workspace directory not found: {default_workspace_path}")
+            print("No default_workspace.toml file to identify a default workspace folder, so the most recently edited folder will be used.")
+            
+        return workspace_path
     
     '''
     @classmethod
@@ -249,7 +258,8 @@ class WorkspaceManager:
         default_toml_path = workspaces_dir / cls.DEFAULT_WORKSPACE_TOML_FILE_NAME
 
         if not default_toml_path.exists():
-            raise FileNotFoundError(f"Missing {cls.DEFAULT_WORKSPACE_TOML_FILE_NAME} in {workspaces_dir}")
+            return None
+            #raise FileNotFoundError(f"Missing {cls.DEFAULT_WORKSPACE_TOML_FILE_NAME} in {workspaces_dir}")
 
         with open(default_toml_path, 'r') as f:
             data = toml.load(f)
@@ -298,7 +308,12 @@ class WorkspaceManager:
         cls.workspaces_dir = workspaces_dir 
         default_file = workspaces_dir / cls.DEFAULT_WORKSPACE_TOML_FILE_NAME
         if not default_file.exists():
-            default_file.write_text("# Default workspace config\n")
+            pass
+            #default_file.write_text("# Default workspace config\n")
+        mulch_scaffold = []
+        mulch.seed(target_dir = workspaces_dir,scaffold_dict = mulch_scaffold)
+        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
     
 def establish_default_workspace():