meerschaum 2.6.11__tar.gz → 2.6.12__tar.gz

{meerschaum-2.6.11/meerschaum.egg-info → meerschaum-2.6.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.6.11
+Version: 2.6.12
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -25,7 +25,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Database
 Classifier: Natural Language :: English
 Requires-Python: >=3.8

{meerschaum-2.6.11 → meerschaum-2.6.12}/meerschaum/api/routes/_actions.py

@@ -17,28 +17,6 @@ from meerschaum.config import get_config
 
 actions_endpoint = endpoints['actions']
 
-def is_user_allowed_to_execute(user) -> SuccessTuple:
-    if user is None:
-        return False, "Could not load user."
-
-    if user.type == 'admin':
-        return True, "Success"
-
-    allow_non_admin = get_config(
-        'system', 'api', 'permissions', 'actions', 'non_admin', patch=True
-    )
-    if not allow_non_admin:
-        return False, (
-            "The administrator for this server has not allowed users to perform actions.\n\n"
-            + "Please contact the system administrator, or if you are running this server, "
-            + "open the configuration file with `edit config system` "
-            + "and search for 'permissions'. "
-            + "\nUnder the keys 'api:permissions:actions', "
-            + "you can allow non-admin users to perform actions."
-        )
-
-    return True, "Success"
-
 
 @app.get(actions_endpoint, tags=['Actions'])
 def get_actions(

{meerschaum-2.6.11 → meerschaum-2.6.12}/meerschaum/api/routes/_jobs.py

@@ -32,6 +32,8 @@ from meerschaum.api import (
     no_auth,
 )
 from meerschaum.config.static import STATIC_CONFIG
+from meerschaum.core.User import is_user_allowed_to_execute
+
 
 JOBS_STDIN_MESSAGE: str = STATIC_CONFIG['api']['jobs']['stdin_message']
 JOBS_STOP_MESSAGE: str = STATIC_CONFIG['api']['jobs']['stop_message']
@@ -141,6 +143,10 @@ def create_job(
     """
     Create and start a new job.
     """
+    allowed_success, allowed_msg = is_user_allowed_to_execute(curr_user)
+    if not allowed_success:
+        return allowed_success, allowed_msg
+
     sysargs = metadata if isinstance(metadata, list) else metadata['sysargs']
     properties = metadata['properties'] if isinstance(metadata, dict) else None
     job = Job(
@@ -172,6 +178,9 @@ def delete_job(
     """
     Delete a job.
     """
+    allowed_success, allowed_msg = is_user_allowed_to_execute(curr_user)
+    if not allowed_success:
+        return allowed_success, allowed_msg
     job = _get_job(name)
     return job.delete()
 
@@ -221,6 +230,10 @@ def start_job(
     """
     Start a job if stopped.
     """
+    allowed_success, allowed_msg = is_user_allowed_to_execute(curr_user)
+    if not allowed_success:
+        return allowed_success, allowed_msg
+
     job = _get_job(name)
     if not job.exists():
         raise fastapi.HTTPException(
@@ -240,6 +253,10 @@ def stop_job(
     """
     Stop a job if running.
     """
+    allowed_success, allowed_msg = is_user_allowed_to_execute(curr_user)
+    if not allowed_success:
+        return allowed_success, allowed_msg
+
     job = _get_job(name)
     if not job.exists():
         raise fastapi.HTTPException(
@@ -259,6 +276,10 @@ def pause_job(
     """
     Pause a job if running.
     """
+    allowed_success, allowed_msg = is_user_allowed_to_execute(curr_user)
+    if not allowed_success:
+        return allowed_success, allowed_msg
+
     job = _get_job(name)
     if not job.exists():
         raise fastapi.HTTPException(

{meerschaum-2.6.11 → meerschaum-2.6.12}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.6.11"
+__version__ = "2.6.12"

{meerschaum-2.6.11 → meerschaum-2.6.12}/meerschaum/connectors/api/_pipes.py

@@ -50,10 +50,15 @@ def register_pipe(
     )
     if debug:
         dprint(response.text)
-    if isinstance(response.json(), list):
-        response_tuple = response.__bool__(), response.json()[1]
+
+    if not response:
+        return False, response.text
+
+    response_data = response.json()
+    if isinstance(response_data, list):
+        response_tuple = response_data[0], response_data[1]
     elif 'detail' in response.json():
-        response_tuple = response.__bool__(), response.json()['detail']
+        response_tuple = response.__bool__(), response_data['detail']
     else:
         response_tuple = response.__bool__(), response.text
     return response_tuple
@@ -80,10 +85,13 @@ def edit_pipe(
     )
     if debug:
         dprint(response.text)
+
+    response_data = response.json()
+
     if isinstance(response.json(), list):
-        response_tuple = response.__bool__(), response.json()[1]
+        response_tuple = response_data[0], response_data[1]
     elif 'detail' in response.json():
-        response_tuple = response.__bool__(), response.json()['detail']
+        response_tuple = response.__bool__(), response_data['detail']
     else:
         response_tuple = response.__bool__(), response.text
     return response_tuple
@@ -318,10 +326,12 @@ def delete_pipe(
     )
     if debug:
         dprint(response.text)
+
+    response_data = response.json()
     if isinstance(response.json(), list):
-        response_tuple = response.__bool__(), response.json()[1]
+        response_tuple = response_data[0], response_data[1]
     elif 'detail' in response.json():
-        response_tuple = response.__bool__(), response.json()['detail']
+        response_tuple = response.__bool__(), response_data['detail']
     else:
         response_tuple = response.__bool__(), response.text
     return response_tuple
@@ -637,7 +647,7 @@ def drop_pipe(
         return False, f"Failed to drop {pipe}."
 
     if isinstance(data, list):
-        response_tuple = response.__bool__(), data[1]
+        response_tuple = data[0], data[1]
     elif 'detail' in response.json():
         response_tuple = response.__bool__(), data['detail']
     else:

meerschaum-2.6.12/meerschaum/core/User/__init__.py

@@ -0,0 +1,39 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+# vim:fenc=utf-8
+
+"""
+Manager users' metadata via the User class
+"""
+
+from typing import Optional
+
+import meerschaum as mrsm
+from meerschaum.core.User._User import User, hash_password, verify_password
+
+
+def is_user_allowed_to_execute(user: Optional[User]) -> mrsm.SuccessTuple:
+    """
+    Return a `SuccessTuple` indicating whether a given user is allowed to execute actions.
+    """
+    if user is None:
+        return True, "Success"
+
+    if user.type == 'admin':
+        return True, "Success"
+
+    from meerschaum.config import get_config
+
+    allow_non_admin = get_config('system', 'api', 'permissions', 'actions', 'non_admin')
+    if not allow_non_admin:
+        return False, (
+            "The administrator for this server has not allowed users to perform actions.\n\n"
+            + "Please contact the system administrator, or if you are running this server, "
+            + "open the configuration file with `edit config system` "
+            + "and search for 'permissions'. "
+            + "\nUnder the keys 'api:permissions:actions', "
+            + "you can allow non-admin users to perform actions."
+        )
+
+    return True, "Success"
+

{meerschaum-2.6.11 → meerschaum-2.6.12/meerschaum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.6.11
+Version: 2.6.12
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -25,7 +25,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Database
 Classifier: Natural Language :: English
 Requires-Python: >=3.8

{meerschaum-2.6.11 → meerschaum-2.6.12}/setup.py

@@ -75,7 +75,6 @@ setup_kw_args = {
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3.13",
         "Topic :: Database",
         "Natural Language :: English",
     ],

{meerschaum-2.6.11 → meerschaum-2.6.12}/tests/test_jobs.py

@@ -23,7 +23,7 @@ def test_create_job():
     success, msg = job.start()
     assert success, msg
 
-    duration = 2.0
+    duration = 4.0
     time.sleep(duration)
 
     success, msg = job.stop()

meerschaum-2.6.11/meerschaum/core/User/__init__.py

@@ -1,9 +0,0 @@
-#! /usr/bin/env python
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8
-
-"""
-Manager users' metadata via the User class
-"""
-
-from meerschaum.core.User._User import User, hash_password, verify_password