pipeline-eds 0.2.10__tar.gz → 0.2.13__tar.gz

{pipeline_eds-0.2.10 → pipeline_eds-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pipeline-eds
-Version: 0.2.10
+Version: 0.2.13
 Summary: The official API pipeline library for mulch-based projects. Key target: Emerson Ovation EDS REST API.
 License: BSD-3
 Author: George Clayton Bennett
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: windb
 Requires-Dist: certifi (>=2025.1.31,<2026.0.0)
-Requires-Dist: fastapi (==0.100.0)
+Requires-Dist: fastapi (==0.103.0)
 Requires-Dist: mulch (>=0.2.8,<0.3.0)
 Requires-Dist: mysql-connector-python (>=9.3.0,<10.0.0)
 Requires-Dist: pendulum (>=3.1.0,<4.0.0)

{pipeline_eds-0.2.10 → pipeline_eds-0.2.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pipeline-eds"
-version = "0.2.10"
+version = "0.2.13"
 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"
@@ -18,7 +18,8 @@ repository = "https://github.com/city-of-memphis-wastewater/pipeline"
 #collector = "pipeline.collector:main"
 #eds-client = "pipeline.api.eds:main"
 #rjn-client = "pipeline.api.rjn:main"
-pipeline = "pipeline.cli:app" # for installation of pipeline as a cli. Ex: pipeline trend M100FI -s June3 -f June17
+pipeline = "pipeline.cli:app" # for installation of pipeline as a CLI. Ex: pipeline trend M100FI -s June3 -f June17
+eds = "pipeline.cli:app" # alias eds for pipeline CLI
 
 
 [tool.pytest.ini_options]
@@ -38,7 +39,7 @@ pyyaml = ">=6.0.2,<7.0.0"
 certifi = ">=2025.1.31,<2026.0.0"
 schedule = ">=1.2.2,<2.0.0"
 #fastapi = ">=0.115.12,<0.116.0"
-fastapi = "0.100.0"
+fastapi = "0.103.0"
 pydantic = "1.10.13"
 urllib3 = "^2.4.0"
 plotly = "^6.2.0"

{pipeline_eds-0.2.10 → pipeline_eds-0.2.13}/src/pipeline/api/eds.py

@@ -726,13 +726,8 @@ def demo_eds_webplot_point_live():
     gui_fastapi_plotly_live.run_gui(data_buffer)
 
 @log_function_call(level=logging.DEBUG)    
-def load_historic_data(queries_manager, workspace_manager, session, iess_list, starttime=None, endtime=None):    
-    if starttime is None:
-        # back_to_last_success = True
-        starttime = queries_manager.get_most_recent_successful_timestamp(api_id=zd)
-
-    if endtime is None:
-        endtime = helpers.get_now_time_rounded(workspace_manager)
+def load_historic_data(session, iess_list, starttime, endtime):    
+    
 
     starttime = TimeManager(starttime).as_unix()
     endtime = TimeManager(endtime).as_unix() 

{pipeline_eds-0.2.10 → pipeline_eds-0.2.13}/src/pipeline/cli.py

@@ -1,9 +1,4 @@
 '''
-import typer
-from pathlib import Path
-
-app = typer.Typer()
-
 @app.command()
 def list_workspaces(workspaces_dir: Path = Path("workspaces")):
     """List valid mulch workspaces in the given directory."""
@@ -14,37 +9,51 @@ def list_workspaces(workspaces_dir: Path = Path("workspaces")):
         if path.is_dir() and (path / ".mulch").is_dir():
             typer.echo(f"🪴 {path.name}")
 
-@app.command()
-def list_mulch_folders(start: Path = Path(".")):
-    """Recursively find folders containing a .mulch/ directory."""
-    for path in start.rglob(".mulch"):
-        typer.echo(f"📁 {path.parent}")
-
-@app.command()
-def inspect(workspace: Path):
-    """Show scaffold or metadata info from a workspace."""
-    metadata = workspace / ".mulch" / "mulch-scaffold.json"
-    if metadata.exists():
-        typer.echo(f"🔍 {workspace.name}: {metadata}")
-        typer.echo(metadata.read_text())
-    else:
-        typer.echo(f"No scaffold found in {workspace}")
 '''
-# src/pipeline/cli.py
-
 import typer
 import importlib
 from pathlib import Path
+from importlib.metadata import version, PackageNotFoundError
 
 from pipeline.env import SecretConfig
 #from pipeline.helpers import setup_logging
 from pipeline.workspace_manager import WorkspaceManager
 
+### Versioning
+def print_version(value: bool):
+    if value:
+        try:
+            typer.secho(f"mulch {MULCH_VERSION}",fg=typer.colors.GREEN, bold=True)
+        except PackageNotFoundError:
+            typer.echo("Version info not found")
+        raise typer.Exit()
+try:
+    MULCH_VERSION = version("mulch")
+    __version__ = version("mulch")
+except PackageNotFoundError:
+    MULCH_VERSION = "unknown"
+
+try:
+    from importlib.metadata import version
+    __version__ = version("mulch")
+except PackageNotFoundError:
+    # fallback if running from source
+    try:
+        with open(Path(__file__).parent / "VERSION") as f:
+            __version__ = f.read().strip()
+    except FileNotFoundError:
+        __version__ = "dev"
+
+### Pipeline CLI
+
 app = typer.Typer(help="CLI for running pipeline workspaces.")
 
 
 @app.callback(invoke_without_command=True)
-def main(ctx: typer.Context):
+def main(
+    ctx: typer.Context,
+    version: bool = typer.Option(None, "--version", callback=lambda v: print_version(v), is_eager=True, help="Show the version and exit.")
+    ):
     """
     Pipeline CLI – run workspaces built on the pipeline framework.
     """
@@ -52,6 +61,7 @@ def main(ctx: typer.Context):
         typer.echo(ctx.get_help())
         raise typer.Exit()
 
+
 @app.command()
 def run(
     workspace: str = typer.Option(None, help="Workspace to run"),
@@ -92,7 +102,7 @@ def trend(
     starttime: str = typer.Option(None, "--start", "-s", help="Index from 'mulch order' to choose scaffold source."),
     endtime: str = typer.Option(None, "--end", "-end", help="Reference a known template for workspace organization."),
     zd: str = typer.Option('Maxson', "--zd", "-z", help = "Define the EDS ZD from your secrets file. This must correlate with your idcs point selection(s)."),
-    workspace: str = typer.Option(WorkspaceManager.identify_default_workspace_name(),"--workspace","-w", help = "Provide the name of the workspace you want to use, for the secrets.yaml credentials and for the timezone config. If a start time is not provided, the workspace queries can checked for the most recent successful timestamp. ")
+    workspace: str = typer.Option(None,"--workspace","-w", help = "Provide the name of the workspace you want to use, for the secrets.yaml credentials and for the timezone config. If a start time is not provided, the workspace queries can checked for the most recent successful timestamp. ")
     ):
     """
     Show a curve for a sensor over time.
@@ -101,10 +111,17 @@ def trend(
     import pendulum
     from pipeline.api.eds import EdsClient, load_historic_data
     from pipeline import helpers
-    from pipeline.queriesmanager import QueriesManager
     from pipeline.plotbuffer import PlotBuffer
     from pipeline import gui_fastapi_plotly_live
     from pipeline import environment
+    from pipeline.workspace_manager import WorkspaceManager
+    ws_dir = WorkspaceManager.ensure_workspace()
+
+    # must set up %appdata for pip/x installation. Use mulch or yeoman for this. And have a secrets filler.
+    if workspace is None:
+        WorkspaceManager.identify_default_workspace_name()
+    wm = WorkspaceManager(workspace)
+    secrets_dict = SecretConfig.load_config(secrets_file_path = wm.get_secrets_file_path())
 
     if zd.lower() == "stiles":
         zd = "WWTF"
@@ -118,20 +135,18 @@ def trend(
         idcs_to_iess_suffix = ".UNIT0@NET0"
     iess_list = [x+idcs_to_iess_suffix for x in idcs]
 
-
-    wm = WorkspaceManager(workspace)
-    secrets_dict = SecretConfig.load_config(secrets_file_path = wm.get_secrets_file_path())
-
     base_url = secrets_dict.get("eds_apis", {}).get(zd, {}).get("url").rstrip("/")
     session = EdsClient.login_to_session(api_url = base_url,
                                                 username = secrets_dict.get("eds_apis", {}).get(zd, {}).get("username"),
                                                 password = secrets_dict.get("eds_apis", {}).get(zd, {}).get("password"))
     session.base_url = base_url
     session.zd = secrets_dict.get("eds_apis", {}).get(zd, {}).get("zd")
-    queries_manager = QueriesManager(wm)
+    
 
     if starttime is None:
         # back_to_last_success = True
+        from pipeline.queriesmanager import QueriesManager
+        queries_manager = QueriesManager(wm)
         dt_start = queries_manager.get_most_recent_successful_timestamp(api_id=zd)
     else:
         dt_start = pendulum.parse(starttime, strict=False)
@@ -142,7 +157,7 @@ def trend(
 
     # Should automatically choose time step granularity based on time length; map 
     
-    results = load_historic_data(queries_manager, wm, session, iess_list, dt_start, dt_finish) 
+    results = load_historic_data(session, iess_list, dt_start, dt_finish) 
     
     data_buffer = PlotBuffer()
     for idx, rows in enumerate(results):
@@ -150,7 +165,7 @@ def trend(
             label = f"{row.get('rjn_entityid')} ({row.get('units')})"
             ts = helpers.iso(row.get("ts"))
             av = row.get("value")
-            data_buffer.append(label, ts, av)
+            data_buffer.append(label, ts, av) # needs to be adapted for multiple iess sensor results
     
     if not environment.matplotlib_enabled():
         gui_fastapi_plotly_live.run_gui(data_buffer)
@@ -158,8 +173,6 @@ def trend(
         from pipeline import gui_mpl_live
         gui_mpl_live.run_gui(data_buffer)
 
-
-
 @app.command()
 def list_workspaces():
     """

pipeline_eds-0.2.13/src/pipeline/install_appdata.py

@@ -0,0 +1,84 @@
+# install_appdata.py
+import typer
+from pathlib import Path
+import sys
+import os
+import shutil
+
+app = typer.Typer(help="Manage mulch-like pipeline workspace installation")
+
+def setup():
+    platform = sys.platform
+    if platform.startswith("win"):
+        from mulch import reg_winreg
+        # Always build LocalAppData mulch folder first
+
+        # Copy files
+        source_dir = Path(__file__).parent  # this is src/mulch/scripts/install
+        target_dir = Path(os.environ['LOCALAPPDATA']) / "pipeline"
+        target_dir.mkdir(parents=True, exist_ok=True)
+
+        copy_mulch_installation_files(source_dir, target_dir)
+
+        # Registry
+        reg_winreg.call()
+        reg_winreg.verify_registry()  # deterministic check
+
+        print("Mulch context menu installed successfully.")
+
+    elif platform.startswith("linux"):
+        thunar_action_dir = Path.home() / ".local/share/file-manager/actions"
+        thunar_action_dir.mkdir(parents=True, exist_ok=True)
+
+        menu_items = [
+            ("mulch-workspace.desktop", "mulch workspace"),
+            ("mulch-seed.desktop", "mulch seed"),
+        ]
+
+        for filename, label in menu_items:
+            src = Path(__file__).parent / filename
+            dest = thunar_action_dir / filename
+            if src.exists():
+                # Use copy2 to preserve metadata
+                shutil.copy2(src, dest)
+                os.chmod(dest, 0o755)
+                print(f"Installed `{label}` context menu item to {dest}")
+            else:
+                print(f"Skipping `{label}` context menu installation (no .desktop file found).")
+
+    elif platform == "darwin":
+        print("macOS detected: please implement context menu setup via Automator or Finder Service")
+        # You can extend this with AppleScript or Automator commands here
+    else:
+        raise RuntimeError(f"Unsupported platform for setup: {platform}")
+
+def copy_mulch_installation_files(source_dir, target_dir):
+    required_files = [
+        "call-mulch-workspace.ps1",
+        "mulch-workspace.ps1",
+        "call-mulch-seed.ps1",
+        "mulch-seed.ps1",
+        "mulch-icon.ico",
+        ".mulchvision"
+    ]
+    missing_files = []
+    for f in required_files:
+        src = source_dir / f
+        if src.exists():
+            shutil.copy2(src, target_dir)
+            print(f"Copied {f} to {target_dir}")
+        else:
+            missing_files.append(f)
+
+    if missing_files:
+        raise FileNotFoundError(
+            f"Missing required files in {source_dir}: {', '.join(missing_files)}"
+        )
+    
+@app.command()
+def install_appdata():
+    """Install the mulch workspace and mulch seed right-click context menu items."""
+    setup()
+
+if __name__ == "__main__":
+    app()

{pipeline_eds-0.2.10 → pipeline_eds-0.2.13}/src/pipeline/workspace_manager.py

@@ -26,6 +26,8 @@ class WorkspaceManager:
     SECRETS_YAML_FILE_NAME ='secrets.yaml'
     SECRETS_EXAMPLE_YAML_FILE_NAME ='secrets-example.yaml'
     DEFAULT_WORKSPACE_TOML_FILE_NAME = 'default-workspace.toml'
+    APP_NAME = "pipeline"
+
     TIMESTAMPS_JSON_FILE_NAME = 'timestamps_success.json'
     ROOT_DIR = Path(__file__).resolve().parents[2]  # root directory
     
@@ -230,6 +232,29 @@ class WorkspaceManager:
     def name(self):
         return self.workspace_name
     
+    @classmethod
+    def get_appdata_dir(cls) -> Path:
+        """Return platform-appropriate appdata folder."""
+        if os.name == "nt":  # Windows
+            base = Path(os.getenv("APPDATA", Path.home() / "AppData" / "Roaming"))
+        elif os.name == "posix" and "ANDROID_ROOT" in os.environ:  # Termux
+            base = Path.home() / ".local" / "share"
+        else:  # macOS/Linux
+            base = Path(os.getenv("XDG_DATA_HOME", Path.home() / ".local" / "share"))
+        return base / cls.APP_NAME
+
+    @classmethod
+    def ensure_workspace(cls) -> Path:
+        """Create workspace folder and default toml if missing."""
+        workspaces_dir = cls.get_appdata_dir() / "workspaces"
+        workspaces_dir.mkdir(parents=True, exist_ok=True)
+
+        default_file = workspaces_dir / cls.DEFAULT_WORKSPACE_TOML_FILE_NAME
+        if not default_file.exists():
+            default_file.write_text("# Default workspace config\n")
+        return workspaces_dir
+
+    
 def establish_default_workspace():
     workspace_name = WorkspaceManager.identify_default_workspace_name()
     logging.info(f"workspace_name = {workspace_name}")