meerschaum 2.3.6__py3-none-any.whl → 2.4.0.dev1__py3-none-any.whl

meerschaum/plugins/_Plugin.py

@@ -7,8 +7,12 @@ Plugin metadata class
 """
 
 from __future__ import annotations
-import os, pathlib, shutil
-from site import venv
+
+import os
+import pathlib
+import shutil
+
+import meerschaum as mrsm
 from meerschaum.utils.typing import (
     Dict,
     List,
@@ -40,8 +44,8 @@ class Plugin:
         attributes: Optional[Dict[str, Any]] = None,
         archive_path: Optional[pathlib.Path] = None,
         venv_path: Optional[pathlib.Path] = None,
-        repo_connector: Optional['meerschaum.connectors.api.APIConnector'] = None,
-        repo: Union['meerschaum.connectors.api.APIConnector', str, None] = None,
+        repo_connector: Optional['mrsm.connectors.api.APIConnector'] = None,
+        repo: Union['mrsm.connectors.api.APIConnector', str, None] = None,
     ):
         from meerschaum.config.static import STATIC_CONFIG
         sep = STATIC_CONFIG['plugins']['repo_separator']
@@ -470,9 +474,9 @@ class Plugin:
 
 
     def remove_archive(
-            self,        
-            debug: bool = False
-        ) -> SuccessTuple:
+        self,        
+        debug: bool = False
+    ) -> SuccessTuple:
         """Remove a plugin's archive file."""
         if not self.archive_path.exists():
             return True, f"Archive file for plugin '{self}' does not exist."
@@ -484,9 +488,9 @@ class Plugin:
 
 
     def remove_venv(
-            self,        
-            debug: bool = False
-        ) -> SuccessTuple:
+        self,        
+        debug: bool = False
+    ) -> SuccessTuple:
         """Remove a plugin's virtual environment."""
         if not self.venv_path.exists():
             return True, f"Virtual environment for plugin '{self}' does not exist."
@@ -608,9 +612,9 @@ class Plugin:
 
 
     def get_dependencies(
-            self,
-            debug: bool = False,
-        ) -> List[str]:
+        self,
+        debug: bool = False,
+    ) -> List[str]:
         """
         If the Plugin has specified dependencies in a list called `required`, return the list.
         

meerschaum/utils/_get_pipes.py

@@ -16,19 +16,18 @@ from meerschaum.utils.typing import (
 __pdoc__ = {'get_pipes': True, 'fetch_pipes_keys': True}
 
 def get_pipes(
-        connector_keys: Union[str, List[str], None] = None,
-        metric_keys: Union[str, List[str], None] = None,
-        location_keys: Union[str, List[str], None] = None,
-        tags: Optional[List[str]] = None,
-        params: Optional[Dict[str, Any]] = None,
-        mrsm_instance: Union[str, InstanceConnector, None] = None,
-        instance: Union[str, InstanceConnector, None] = None,
-        as_list: bool = False,
-        method: str = 'registered',
-        wait: bool = False,
-        debug: bool = False,
-        **kw: Any
-    ) -> Union[PipesDict, List[mrsm.Pipe]]:
+    connector_keys: Union[str, List[str], None] = None,
+    metric_keys: Union[str, List[str], None] = None,
+    location_keys: Union[str, List[str], None] = None,
+    tags: Optional[List[str]] = None,
+    params: Optional[Dict[str, Any]] = None,
+    mrsm_instance: Union[str, InstanceConnector, None] = None,
+    instance: Union[str, InstanceConnector, None] = None,
+    as_list: bool = False,
+    method: str = 'registered',
+    debug: bool = False,
+    **kw: Any
+) -> Union[PipesDict, List[mrsm.Pipe]]:
     """
     Return a dictionary or list of `meerschaum.Pipe` objects.
 
@@ -72,10 +71,6 @@ def get_pipes(
         If `'all'`, create pipes from predefined metrics and locations. Required `connector_keys`.
         **NOTE:** Method `'all'` is not implemented!
 
-    wait: bool, default False
-        Wait for a connection before getting Pipes. Should only be true for cases where the
-        database might not be running (like the API).
-
     **kw: Any:
         Keyword arguments to pass to the `meerschaum.Pipe` constructor.
         
@@ -133,15 +128,14 @@ def get_pipes(
         location_keys = [location_keys]
 
     ### Get SQL or API connector (keys come from `connector.fetch_pipes_keys()`).
-    ### If `wait`, wait until a connection is made
     if mrsm_instance is None:
         mrsm_instance = instance
     if mrsm_instance is None:
         mrsm_instance = get_config('meerschaum', 'instance', patch=True)
     if isinstance(mrsm_instance, str):
         from meerschaum.connectors.parse import parse_instance_keys
-        connector = parse_instance_keys(keys=mrsm_instance, wait=wait, debug=debug)
-    else: ### NOTE: mrsm_instance MUST be a SQL or API connector for this to work
+        connector = parse_instance_keys(keys=mrsm_instance, debug=debug)
+    else:
         from meerschaum.connectors import instance_types
         valid_connector = False
         if hasattr(mrsm_instance, 'type'):