pipeline-eds 0.2.10__py3-none-any.whl → 0.2.12__py3-none-any.whl

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/cli.py

@@ -92,7 +92,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,11 +101,16 @@ 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
 
+    # 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 +123,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 +145,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 +153,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 +161,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.10.dist-info → pipeline_eds-0.2.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pipeline-eds
-Version: 0.2.10
+Version: 0.2.12
 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.dist-info → pipeline_eds-0.2.12.dist-info}/RECORD

@@ -1,11 +1,11 @@
 pipeline/__init__.py,sha256=DAy4hBleDDk9Wen4qIOGlS03qWqdt7K7n4rUpL3cIL4,173
 pipeline/__main__.py,sha256=TtbGYUm7Np5eLPCHZ3iX5QPL0rSgGJ5tXVuBEORvQIE,19
 pipeline/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pipeline/api/eds.py,sha256=P-oRQzy1CGqrE2o2oEK1mQMNMZk13o2bWqQBSTFPEuw,43999
+pipeline/api/eds.py,sha256=M7XkSwDKb2wGs5j69yaAS8-5JwGbLfs6uVz70RjG6WQ,43714
 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=9pdl8k127IvB9mvmKmhot6DzV2m6egx0VRFSYAaE4x8,10029
+pipeline/cli.py,sha256=72UDPcGxiZfyiIVz1D1fGlL8Z9slH0OsbZG-TsbSFnQ,10221
 pipeline/configrationmanager.py,sha256=UPqa91117jNm59vvTBE7sET1ThisqRf6B2Dhtk7x9tM,624
 pipeline/decorators.py,sha256=5fIIVqxSvQFaSI4ZkqPd3yqajzDxaRhgYwlC1jD2k5A,411
 pipeline/env.py,sha256=Ibs0K_wluUTJXCcBjUofZ1jexks-UmJ0dvbXhWPLdJ0,1922
@@ -55,8 +55,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.10.dist-info/entry_points.txt,sha256=t1hTaepU6pSowdqa8OSzohoTbmDRLA3Jnp8MfqagwEs,103
-pipeline_eds-0.2.10.dist-info/LICENSE,sha256=LKdx0wS1t9vFZpbRhDg_iLQ6ny-XsXRwhKAoCfrF6iA,1501
-pipeline_eds-0.2.10.dist-info/METADATA,sha256=m7Bu0vNdVIB31Y8r7u2GkaqwJUF9MFJv8gKwcGjBPpc,9974
-pipeline_eds-0.2.10.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pipeline_eds-0.2.10.dist-info/RECORD,,
+pipeline_eds-0.2.12.dist-info/entry_points.txt,sha256=t1hTaepU6pSowdqa8OSzohoTbmDRLA3Jnp8MfqagwEs,103
+pipeline_eds-0.2.12.dist-info/LICENSE,sha256=LKdx0wS1t9vFZpbRhDg_iLQ6ny-XsXRwhKAoCfrF6iA,1501
+pipeline_eds-0.2.12.dist-info/METADATA,sha256=HFKEtFItZoyZXuw1Uk5cPX-IAr3ze1ekpO48vXiWs5Y,9974
+pipeline_eds-0.2.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pipeline_eds-0.2.12.dist-info/RECORD,,