meerschaum 2.2.6__py3-none-any.whl → 2.3.0__py3-none-any.whl

meerschaum/connectors/api/_request.py

@@ -11,7 +11,7 @@ import urllib.parse
 import pathlib
 from meerschaum.utils.typing import Any, Optional, Dict, Union
 from meerschaum.utils.debug import dprint
-from meerschaum.utils.formatting import pprint
+from meerschaum.config.static import STATIC_CONFIG
 
 METHODS = {
     'GET',
@@ -23,15 +23,16 @@ METHODS = {
     'DELETE',
 }
 
+
 def make_request(
-        self,
-        method: str,
-        r_url: str,
-        headers: Optional[Dict[str, Any]] = None,
-        use_token: bool = True,
-        debug: bool = False,
-        **kwargs: Any
-    ) -> 'requests.Response':
+    self,
+    method: str,
+    r_url: str,
+    headers: Optional[Dict[str, Any]] = None,
+    use_token: bool = True,
+    debug: bool = False,
+    **kwargs: Any
+) -> 'requests.Response':
     """
     Make a request to this APIConnector's endpoint using the in-memory session.
 
@@ -84,6 +85,9 @@ def make_request(
     if use_token:
         headers.update({'Authorization': f'Bearer {self.token}'})
 
+    if 'timeout' not in kwargs:
+        kwargs['timeout'] = STATIC_CONFIG['api']['default_timeout']
+
     request_url = urllib.parse.urljoin(self.url, r_url)
     if debug:
         dprint(f"[{self}] Sending a '{method.upper()}' request to {request_url}")

meerschaum/connectors/parse.py

@@ -10,11 +10,11 @@ from __future__ import annotations
 from meerschaum.utils.typing import Mapping, Any, SuccessTuple, Union, Optional, Dict, Tuple
 
 def parse_connector_keys(
-        keys: str,
-        construct: bool = True,
-        as_tuple: bool = False,
-        **kw:  Any
-    ) -> (
+    keys: str,
+    construct: bool = True,
+    as_tuple: bool = False,
+    **kw:  Any
+) -> (
         Union[
             meerschaum.connectors.Connector,
             Dict[str, Any],
@@ -87,19 +87,17 @@ def parse_connector_keys(
 
 
 def parse_instance_keys(
-        keys: Optional[str],
-        construct: bool = True,
-        as_tuple: bool = False,
-        **kw
-    ):
+    keys: Optional[str],
+    construct: bool = True,
+    as_tuple: bool = False,
+    **kw
+):
     """
     Parse the Meerschaum instance value into a Connector object.
     """
     from meerschaum.utils.warnings import warn
     from meerschaum.config import get_config
 
-    ### TODO Check for valid types? Not sure how to do that if construct = False.
-
     if keys is None:
         keys = get_config('meerschaum', 'instance')
     keys = str(keys)
@@ -119,10 +117,24 @@ def parse_repo_keys(keys: Optional[str] = None, **kw):
     return parse_connector_keys(keys, **kw)
 
 
+def parse_executor_keys(keys: Optional[str] = None, **kw):
+    """Parse the executor keys into an APIConnector or string."""
+    from meerschaum.jobs import get_executor_keys_from_context
+    if keys is None:
+        keys = get_executor_keys_from_context()
+
+    if keys is None or keys == 'local':
+        return 'local'
+
+    keys = str(keys)
+    return parse_connector_keys(keys, **kw)
+
+
 def is_valid_connector_keys(
-        keys: str
-    ) -> bool:
-    """Verify a connector_keys string references a valid connector.
+    keys: str
+) -> bool:
+    """
+    Verify a connector_keys string references a valid connector.
     """
     try:
         success = parse_connector_keys(keys, construct=False) is not None

meerschaum/core/Pipe/_bootstrap.py

@@ -88,21 +88,29 @@ def bootstrap(
 
     try:
         if yes_no(
-            f"Would you like to edit the definition for {self}?", yes=yes, noask=noask
+            f"Would you like to edit the definition for {self}?",
+            yes=yes,
+            noask=noask,
+            default='n',
         ):
             edit_tuple = self.edit_definition(debug=debug)
             if not edit_tuple[0]:
                 return edit_tuple
 
-        if yes_no(f"Would you like to try syncing {self} now?", yes=yes, noask=noask):
+        if yes_no(
+            f"Would you like to try syncing {self} now?",
+            yes=yes,
+            noask=noask,
+            default='n',
+        ):
             sync_tuple = actions['sync'](
                 ['pipes'],
-                connector_keys = [self.connector_keys],
-                metric_keys = [self.metric_key],
-                location_keys = [self.location_key],
-                mrsm_instance = str(self.instance_connector),
-                debug = debug,
-                shell = shell,
+                connector_keys=[self.connector_keys],
+                metric_keys=[self.metric_key],
+                location_keys=[self.location_key],
+                mrsm_instance=str(self.instance_connector),
+                debug=debug,
+                shell=shell,
             )
             if not sync_tuple[0]:
                 return sync_tuple

meerschaum/core/Pipe/_sync.py

@@ -194,6 +194,9 @@ def sync(
         if hasattr(df, 'MRSM_INFER_FETCH'):
             try:
                 if p.connector is None:
+                    if ':' not in p.connector_keys:
+                        return True, f"{p} does not support fetching; nothing to do."
+
                     msg = f"{p} does not have a valid connector."
                     if p.connector_keys.startswith('plugin:'):
                         msg += f"\n    Perhaps {p.connector_keys} has a syntax error?"

meerschaum/jobs/_Executor.py

@@ -0,0 +1,69 @@
+#! /usr/bin/env python3
+# vim:fenc=utf-8
+
+"""
+Define the base class for a Job executor.
+"""
+
+from __future__ import annotations
+
+from abc import abstractmethod
+
+from meerschaum.connectors import Connector
+from meerschaum.utils.typing import List, Dict, SuccessTuple, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from meerschaum.jobs import Job
+
+class Executor(Connector):
+    """
+    Define the methods for managing jobs.
+    """
+
+    @abstractmethod
+    def get_job_exists(self, name: str, debug: bool = False) -> bool:
+        """
+        Return whether a job exists.
+        """
+    
+    @abstractmethod
+    def get_jobs(self) -> Dict[str, Job]:
+        """
+        Return a dictionary of names -> Jobs.
+        """
+
+    @abstractmethod
+    def create_job(self, name: str, sysargs: List[str], debug: bool = False) -> SuccessTuple:
+        """
+        Create a new job.
+        """
+
+    @abstractmethod
+    def start_job(self, name: str, debug: bool = False) -> SuccessTuple:
+        """
+        Start a job.
+        """
+
+    @abstractmethod
+    def stop_job(self, name: str, debug: bool = False) -> SuccessTuple:
+        """
+        Stop a job.
+        """
+
+    @abstractmethod
+    def pause_job(self, name: str, debug: bool = False) -> SuccessTuple:
+        """
+        Pause a job.
+        """
+
+    @abstractmethod
+    def delete_job(self, name: str, debug: bool = False) -> SuccessTuple:
+        """
+        Delete a job.
+        """
+
+    @abstractmethod
+    def get_logs(self, name: str, debug: bool = False) -> str:
+        """
+        Return a job's log output.
+        """