pipeline-eds 0.2.5__tar.gz → 0.2.6__tar.gz

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pipeline-eds
-Version: 0.2.5
+Version: 0.2.6
 Summary: The official API pipeline library for mulch-based projects. Key target: Emerson Ovation EDS REST API.
 License: BSD-3
 Author: George Clayton Bennett

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pipeline-eds"
-version = "0.2.5"
+version = "0.2.6"
 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"

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/src/pipeline/api/eds.py

@@ -11,11 +11,11 @@ import platform
 import mysql.connector
 from functools import lru_cache
 
-from src.pipeline.env import SecretConfig
-from src.pipeline.workspace_manager import WorkspaceManager
-from src.pipeline import helpers
-from src.pipeline.decorators import log_function_call
-from src.pipeline.time_manager import TimeManager
+from pipeline.env import SecretConfig
+from pipeline.workspace_manager import WorkspaceManager
+from pipeline import helpers
+from pipeline.decorators import log_function_call
+from pipeline.time_manager import TimeManager
 
 logger = logging.getLogger(__name__)
 #logger.setLevel(logging.INFO)
@@ -214,7 +214,7 @@ class EdsClient:
         """
         import socket
         from urllib.parse import urlparse
-        from src.pipeline.helpers import get_lan_ip_address_of_current_machine
+        from pipeline.helpers import get_lan_ip_address_of_current_machine
         # Check if the session_key exists in the secrets_dict
         url = secrets_dict["eds_apis"][session_key]["url"]
         parsed = urlparse(url)
@@ -575,7 +575,7 @@ def _demo_eds_start_session_CoM_WWTPs():
 
 @log_function_call(level=logging.DEBUG)
 def demo_eds_print_point_live_alt():
-    from src.pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
+    from pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
 
     workspace_manager, sessions = _demo_eds_start_session_CoM_WWTPs()
     queries_file_path_list = workspace_manager.get_default_query_file_paths_list() # use default identified by the default-queries.toml file
@@ -603,7 +603,7 @@ def demo_eds_print_point_live_alt():
 
 @log_function_call(level=logging.DEBUG)
 def demo_eds_print_point_live():
-    from src.pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
+    from pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
     from workspaces.eds_to_rjn.code import collector
     workspace_manager, sessions = _demo_eds_start_session_CoM_WWTPs()
     queries_file_path_list = workspace_manager.get_default_query_file_paths_list() # use default identified by the default-queries.toml file
@@ -629,10 +629,10 @@ def demo_eds_print_point_live():
 def demo_eds_plot_point_live():
     from threading import Thread
 
-    from src.pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
+    from pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
     from workspaces.eds_to_rjn.code import collector, sanitizer
-    from src.pipeline.plotbuffer import PlotBuffer
-    from src.pipeline import gui_mpl_live
+    from pipeline.plotbuffer import PlotBuffer
+    from pipeline import gui_mpl_live
 
     # Initialize the workspace based on configs and defaults, in the demo initializtion script
     workspace_manager, sessions = _demo_eds_start_session_CoM_WWTPs()
@@ -674,11 +674,11 @@ def demo_eds_plot_point_live():
 def demo_eds_webplot_point_live():
     from threading import Thread
 
-    from src.pipeline.queriesmanager import QueriesManager, load_query_rows_from_csv_files, group_queries_by_col
+    from pipeline.queriesmanager import QueriesManager, load_query_rows_from_csv_files, group_queries_by_col
     from workspaces.eds_to_rjn.code import collector, sanitizer
-    from src.pipeline.plotbuffer import PlotBuffer
-    #from src.pipeline import gui_flaskplotly_live
-    from src.pipeline import gui_fastapi_plotly_live
+    from pipeline.plotbuffer import PlotBuffer
+    #from pipeline import gui_flaskplotly_live
+    from pipeline import gui_fastapi_plotly_live
 
     # Initialize the workspace based on configs and defaults, in the demo initializtion script
     workspace_manager, sessions = _demo_eds_start_session_CoM_WWTPs()
@@ -801,8 +801,8 @@ def demo_eds_save_graphics_export():
 @log_function_call(level=logging.DEBUG)
 def demo_eds_print_tabular_trend():
     
-    from src.pipeline.queriesmanager import QueriesManager
-    from src.pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
+    from pipeline.queriesmanager import QueriesManager
+    from pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
     
     workspace_manager, sessions = _demo_eds_start_session_CoM_WWTPs()
     
@@ -837,8 +837,8 @@ def demo_eds_print_tabular_trend():
 
 @log_function_call(level=logging.DEBUG)
 def demo_eds_local_database_access():
-    from src.pipeline.queriesmanager import QueriesManager
-    from src.pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
+    from pipeline.queriesmanager import QueriesManager
+    from pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
     workspace_name = 'eds_to_rjn' # workspace_name = WorkspaceManager.identify_default_workspace_name()
     workspace_manager = WorkspaceManager(workspace_name)
     queries_manager = QueriesManager(workspace_manager)
@@ -912,7 +912,7 @@ def demo_eds_print_license():
 
 @log_function_call(level=logging.DEBUG)
 def demo_eds_ping():
-    from src.pipeline.calls import call_ping
+    from pipeline.calls import call_ping
     workspace_manager, sessions = _demo_eds_start_session_CoM_WWTPs()
     session_maxson = sessions["Maxson"]
 
@@ -926,7 +926,7 @@ if __name__ == "__main__":
     - print only which vars succeed
     '''
     import sys
-    from src.pipeline.logging_setup import setup_logging
+    from pipeline.logging_setup import setup_logging
     cmd = sys.argv[1] if len(sys.argv) > 1 else "default"
 
     setup_logging()

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/src/pipeline/api/rjn.py

@@ -2,11 +2,11 @@ import requests
 import logging
 from typing import Union
 
-from src.pipeline.calls import make_request, call_ping
-from src.pipeline.env import find_urls
-from src.pipeline.decorators import log_function_call
-from src.pipeline import helpers
-from src.pipeline.time_manager import TimeManager
+from pipeline.calls import make_request, call_ping
+from pipeline.env import find_urls
+from pipeline.decorators import log_function_call
+from pipeline import helpers
+from pipeline.time_manager import TimeManager
 
 logger = logging.getLogger(__name__)
 
@@ -106,8 +106,8 @@ class RjnClient:
                 
     @staticmethod
     def ping():
-        from src.pipeline.env import SecretConfig
-        from src.pipeline.workspace_manager import WorkspaceManager
+        from pipeline.env import SecretConfig
+        from pipeline.workspace_manager import WorkspaceManager
         workspace_name = WorkspaceManager.identify_default_workspace_name()
         workspace_manager = WorkspaceManager(workspace_name)
         secrets_dict = SecretConfig.load_config(secrets_file_path = workspace_manager.get_secrets_file_path())
@@ -123,12 +123,12 @@ class RjnClient:
 
 @log_function_call(level=logging.DEBUG)
 def demo_rjn_ping():
-    from src.pipeline.calls import call_ping
-    from src.pipeline.env import SecretConfig
-    from src.pipeline.workspace_manager import WorkspaceManager
+    from pipeline.calls import call_ping
+    from pipeline.env import SecretConfig
+    from pipeline.workspace_manager import WorkspaceManager
 
-    from src.pipeline.env import SecretConfig
-    from src.pipeline.workspace_manager import WorkspaceManager
+    from pipeline.env import SecretConfig
+    from pipeline.workspace_manager import WorkspaceManager
     workspace_name = WorkspaceManager.identify_default_workspace_name()
     workspace_manager = WorkspaceManager(workspace_name)
 

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/src/pipeline/api/status_api.py

@@ -1,6 +1,6 @@
 # src/api/status_api.py
 from fastapi import FastAPI
-from src.pipeline.daemon.status import get_latest_status
+from pipeline.daemon.status import get_latest_status
 
 app = FastAPI()
 

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/src/pipeline/calls.py

@@ -104,5 +104,5 @@ def find_urls(config_dict):
     return url_set
 
 if __name__ == "__main__":
-    from src.pipeline.helpers import function_view
+    from pipeline.helpers import function_view
     function_view()

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/src/pipeline/cli.py

@@ -36,9 +36,9 @@ import typer
 import importlib
 from pathlib import Path
 
-from src.pipeline.env import SecretConfig
-#from src.pipeline.helpers import setup_logging
-from src.pipeline.workspace_manager import WorkspaceManager
+from pipeline.env import SecretConfig
+#from pipeline.helpers import setup_logging
+from pipeline.workspace_manager import WorkspaceManager
 
 app = typer.Typer(help="CLI for running pipeline workspaces.")
 
@@ -102,9 +102,9 @@ def trend(
     from pipeline.api.eds import EdsClient, load_historic_data
     from pipeline import helpers
     from pipeline.queriesmanager import QueriesManager
-    from src.pipeline.plotbuffer import PlotBuffer
-    from src.pipeline import gui_fastapi_plotly_live
-    from src.pipeline import environment
+    from pipeline.plotbuffer import PlotBuffer
+    from pipeline import gui_fastapi_plotly_live
+    from pipeline import environment
 
     if zd.lower() == "stiles":
         zd = "WWTF"
@@ -179,11 +179,11 @@ def demo_rjn_ping():
     """
     Demo function to ping RJN service.
     """
-    from src.pipeline.api.rjn import RjnClient
-    from src.pipeline.calls import call_ping
-    from src.pipeline.env import SecretConfig
-    from src.pipeline.workspace_manager import WorkspaceManager
-    from src.pipeline import helpers
+    from pipeline.api.rjn import RjnClient
+    from pipeline.calls import call_ping
+    from pipeline.env import SecretConfig
+    from pipeline.workspace_manager import WorkspaceManager
+    from pipeline import helpers
     import logging
 
     logger = logging.getLogger(__name__)
@@ -208,9 +208,9 @@ def ping_rjn_services():
     """
     Ping all RJN services found in the secrets configuration.
     """
-    from src.pipeline.calls import find_urls, call_ping
-    from src.pipeline.env import SecretConfig
-    from src.pipeline.workspace_manager import WorkspaceManager
+    from pipeline.calls import find_urls, call_ping
+    from pipeline.env import SecretConfig
+    from pipeline.workspace_manager import WorkspaceManager
     import logging
 
     logger = logging.getLogger(__name__)
@@ -232,9 +232,9 @@ def ping_eds_services():
     """
     Ping all EDS services found in the secrets configuration.
     """
-    from src.pipeline.calls import find_urls, call_ping
-    from src.pipeline.env import SecretConfig
-    from src.pipeline.workspace_manager import WorkspaceManager
+    from pipeline.calls import find_urls, call_ping
+    from pipeline.env import SecretConfig
+    from pipeline.workspace_manager import WorkspaceManager
     import logging
 
     logger = logging.getLogger(__name__)

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/src/pipeline/env.py

@@ -1,7 +1,7 @@
 #env.__main__.py
  
 import yaml
-from src.pipeline.workspace_manager import WorkspaceManager 
+from pipeline.workspace_manager import WorkspaceManager 
 
 '''
 migrate this to ConfigurationManager

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/src/pipeline/gui_mpl_live.py

@@ -3,9 +3,9 @@ import time
 import logging
 import matplotlib.pyplot as plt
 import matplotlib.animation as animation
-from src.pipeline import helpers
-from src.pipeline.plotbuffer import PlotBuffer  # Adjust import path as needed
-from src.pipeline.time_manager import TimeManager
+from pipeline import helpers
+from pipeline.plotbuffer import PlotBuffer  # Adjust import path as needed
+from pipeline.time_manager import TimeManager
 
 logger = logging.getLogger(__name__)
 

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/src/pipeline/helpers.py

@@ -7,7 +7,7 @@ import os
 import logging
 import socket
 
-from src.pipeline.time_manager import TimeManager
+from pipeline.time_manager import TimeManager
 
 logger = logging.getLogger(__name__)
 

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/src/pipeline/queriesmanager.py

@@ -6,8 +6,8 @@ import csv
 from collections import defaultdict
 import logging
 
-from src.pipeline import helpers
-from src.pipeline.time_manager import TimeManager
+from pipeline import helpers
+from pipeline.time_manager import TimeManager
 
 logger = logging.getLogger(__name__)
 '''
@@ -52,7 +52,7 @@ class QueriesManager:
     
     def get_most_recent_successful_timestamp(self, api_id):# -> int:
         print("QueriesManager.get_most_recent_successful_timestamp()")
-        from src.pipeline.helpers import load_toml
+        from pipeline.helpers import load_toml
         try:
             config = load_toml(self.workspace_manager.get_configuration_file_path())
             timezone_config = config["settings"]["timezone"]

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/workspaces/eds_to_rjn/code/aggregator.py

@@ -4,8 +4,8 @@ from collections import defaultdict
 import os
 from pprint import pprint
 
-from src.pipeline.api.rjn import RjnClient #send_data_to_rjn2
-from src.pipeline.time_manager import TimeManager
+from pipeline.api.rjn import RjnClient #send_data_to_rjn2
+from pipeline.time_manager import TimeManager
 
 
 def aggregate_and_send(session_rjn, data_file, checkpoint_file):

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/workspaces/eds_to_rjn/code/collector.py

@@ -3,8 +3,8 @@ from datetime import datetime
 import logging
 logger = logging.getLogger(__name__)
 
-from src.pipeline.helpers import round_datetime_to_nearest_past_five_minutes
-from src.pipeline.api.eds import EdsClient
+from pipeline.helpers import round_datetime_to_nearest_past_five_minutes
+from pipeline.api.eds import EdsClient
 
 
 def collect_live_values(session, queries_dictlist_filtered_by_session_key):   
@@ -55,6 +55,6 @@ def collect_live_values(session, queries_dictlist_filtered_by_session_key):
     return data
 
 if __name__ == "__main__":
-    print("[x] from src.pipeline import collector")
-    print("[x] from src.pipeline import collector.collector_live_vales(session,query_list)")
-    print("[ ] from src.pipeline import collector.collector_live_vales(session,query_dict)")
+    print("[x] from pipeline import collector")
+    print("[x] from pipeline import collector.collector_live_vales(session,query_list)")
+    print("[ ] from pipeline import collector.collector_live_vales(session,query_dict)")

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/workspaces/eds_to_rjn/code/sanitizer.py

@@ -8,7 +8,7 @@ I like it when data gathered is data returned. Sanitization should not happen du
 So. We need explicit and discernible sanitization scenarios, called a scripted approach, following the preparation, collection, and aggregation, insert buzz words here, etc.
 '''
 from datetime import datetime
-from src.pipeline.helpers import round_datetime_to_nearest_past_five_minutes
+from pipeline.helpers import round_datetime_to_nearest_past_five_minutes
 
 def sanitize_data_for_printing(data):
     #data_sanitized_for_printing = data

{pipeline_eds-0.2.5 → pipeline_eds-0.2.6}/workspaces/eds_to_rjn/scripts/daemon_runner.py

@@ -4,14 +4,14 @@ import logging
 import csv
 from datetime import datetime
 
-from src.pipeline.api.eds import EdsClient, identify_relevant_tables
-from src.pipeline.api.rjn import RjnClient
-from src.pipeline import helpers
-from src.pipeline.env import SecretConfig
-from src.pipeline.workspace_manager import WorkspaceManager
-from src.pipeline.queriesmanager import QueriesManager
-from src.pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
-from src.pipeline.time_manager import TimeManager
+from pipeline.api.eds import EdsClient, identify_relevant_tables
+from pipeline.api.rjn import RjnClient
+from pipeline import helpers
+from pipeline.env import SecretConfig
+from pipeline.workspace_manager import WorkspaceManager
+from pipeline.queriesmanager import QueriesManager
+from pipeline.queriesmanager import load_query_rows_from_csv_files, group_queries_by_col
+from pipeline.time_manager import TimeManager
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)