meerschaum 2.6.10__py3-none-any.whl → 2.6.12__py3-none-any.whl

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/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/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.6.10"
+__version__ = "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/connectors/sql/_pipes.py

@@ -1664,7 +1664,7 @@ def sync_pipe(
 
     if update_df is not None and len(update_df) > 0:
         transact_id = generate_password(3)
-        temp_prefix = '##' if self.flavor != 'oracle' else ''
+        temp_prefix = '##' if self.flavor != 'oracle' else '_'
         temp_target = temp_prefix + transact_id + '_' + pipe.target
         self._log_temporary_tables_creation(temp_target, create=(not pipe.temporary), debug=debug)
         temp_pipe = Pipe(

meerschaum/core/User/__init__.py

@@ -6,4 +6,34 @@
 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/utils/formatting/__init__.py

@@ -501,11 +501,12 @@ def fill_ansi(string: str, style: str = '') -> str:
     """
     from meerschaum.utils.packages import import_rich, attempt_import
     from meerschaum.utils.misc import iterate_chunks
-    rich = import_rich()
-    Text = attempt_import('rich.text').Text
+    _ = import_rich()
+    rich_ansi, rich_text = attempt_import('rich.ansi', 'rich.text')
+    Text = rich_text.Text
     try:
         msg = Text.from_ansi(string)
-    except AttributeError as e:
+    except AttributeError:
         import traceback
         traceback.print_stack()
         msg = ''

{meerschaum-2.6.10.dist-info → meerschaum-2.6.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.6.10
+Version: 2.6.12
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.6.10.dist-info → meerschaum-2.6.12.dist-info}/RECORD

@@ -118,10 +118,10 @@ meerschaum/api/resources/templates/old_index.html,sha256=BDeOlcXhSsBH3-NaRtuX4Z1
 meerschaum/api/resources/templates/secret.html,sha256=0QWkm4ZoN81Aw1pd2-62rGCvx3nXPHfFUoegj3Iy8Ls,141
 meerschaum/api/resources/templates/termpage.html,sha256=qspXRuOkzqOn2mXw9mmUldzsvOHq_LyaywQ29CUevp0,4527
 meerschaum/api/routes/__init__.py,sha256=jbkeFNl51Tg8aT5gWe560ZLZLojFJsLMe5IENRjRkb0,606
-meerschaum/api/routes/_actions.py,sha256=KGUlPyWiO0e7t7Fj8-nIowWokDVP22Gr9z1XxLx5tpw,3063
+meerschaum/api/routes/_actions.py,sha256=-8ESo73_Fio94H5J5B7UfTlOFSoaoYqSkvPdzZO6amw,2243
 meerschaum/api/routes/_connectors.py,sha256=NNbcn5xWhKqw2PqueSEaqRaZ95hFGDKazG5lE7gsssc,1849
 meerschaum/api/routes/_index.py,sha256=QI6CBo6pI2Zi0a6fJHDjZfiLa9f4okb0BGe3A_JD0kM,578
-meerschaum/api/routes/_jobs.py,sha256=deKv9Y9XtCAB6u3ZyI2_zeMbrzkA8Q8-o6PWmTf9sxc,11702
+meerschaum/api/routes/_jobs.py,sha256=iPyxH7lckqCO1jSZxPKCIRealLkCNznZSv8NMquCHUY,12492
 meerschaum/api/routes/_login.py,sha256=ti2onNOemOGLHLoPubAQOYtD7eq7FA1jOlbOSVSjXVo,2466
 meerschaum/api/routes/_misc.py,sha256=05--9ZVFeaCgZrHER2kA3SYdK4TyfkEXOCjLvPbum-w,2469
 meerschaum/api/routes/_pipes.py,sha256=li52WQUwZN8JEPyIuWN7s4wASWNV2BTVAUpQ_E1CKLg,21579
@@ -143,7 +143,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=RLC3HHi_1ndj7ITVDKLD9_uULY3caGRwSz3ATYE-ixA,15014
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=jHcWRkxd82_BgX8Xo8agsWvf7BSbv3qHLWmYl6ehp_0,4242
-meerschaum/config/_version.py,sha256=QOPk_Pjr2KnGrSNrSaTJLqzoKYSFI0Wk__-Tb-BOgSQ,72
+meerschaum/config/_version.py,sha256=BZpL24-Hi0dYhLK6fctdzClZ2M2zhgZqTRSSVlRW8r0,72
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=2UukC0Lmk-aVL1o1qXzumqmuIrw3vu9fD7iCuz4XD4I,10544
@@ -163,7 +163,7 @@ meerschaum/connectors/api/_fetch.py,sha256=Khq9AFr1nk8Dsmcedb77aWhAuHw0JGgVeahDG
 meerschaum/connectors/api/_jobs.py,sha256=N5lpHFGG10jlVgaJeWAOTuLBQw3AdgjXsEPpp1YwZQE,11270
 meerschaum/connectors/api/_login.py,sha256=5GsD-B214vr5EYfM3XrTUs1sTFApxZA-9dNxq8oNSyg,2050
 meerschaum/connectors/api/_misc.py,sha256=OZRZBYOokKIEjmQaR8jUYgu6ZRn9VzXBChzR8CfDv_w,1092
-meerschaum/connectors/api/_pipes.py,sha256=wHPfIqiJyU3iEQvEW61cFlriQVBvgx6hTL7VjLRgv2Q,21308
+meerschaum/connectors/api/_pipes.py,sha256=ceY-6wlmq73iPvYbvWz59xTUMkSoiiXCiz_BWjTZVMk,21443
 meerschaum/connectors/api/_plugins.py,sha256=z04tPjfZZWwa7T60mogZH3X3wDmeLdnoN5Oh8m_YsU8,5217
 meerschaum/connectors/api/_request.py,sha256=Wc4Y70t0VxEj3_ch5fAeeoSAeFMuRnyNLOV-aUFInjY,6996
 meerschaum/connectors/api/_uri.py,sha256=HWxqGx4R1cHZ3ywy9Ro9ePbFxxusw4RLaC3hpGt9Z6I,1469
@@ -176,7 +176,7 @@ meerschaum/connectors/sql/_cli.py,sha256=1SgnWeMIAihoxp4FzbNrcq1npXf0dSOQnCntpU9
 meerschaum/connectors/sql/_create_engine.py,sha256=zqeu1xHOw3n3Zgfjx-diy2aoynfdOlfOjwFuRrzB028,10452
 meerschaum/connectors/sql/_fetch.py,sha256=A2R1aLgdEkiIet8P2BZ13OXy31I5e8BzWee74Bj_v4k,13141
 meerschaum/connectors/sql/_instance.py,sha256=3KJI3ImwWAJkUfdZIrSL24pcW6Nic8wo5IUeGth9HP4,6459
-meerschaum/connectors/sql/_pipes.py,sha256=PZlcCb-dIsL2cfCCYpRarTAAdYcom-nSsM_tHphzCjc,117386
+meerschaum/connectors/sql/_pipes.py,sha256=qfAgBT513vZUdBMbsS2O7XTQz-2S_pD02SsfTcfy9pw,117387
 meerschaum/connectors/sql/_plugins.py,sha256=wbxcNxqTtjfDsxPvdVGTllasYf6NHHzODaQ72hEUSBQ,8135
 meerschaum/connectors/sql/_sql.py,sha256=vdSslLKm8ftzIzfCs-0mL3q9zY2pmhZPTpzXSbKROag,37598
 meerschaum/connectors/sql/_uri.py,sha256=0BrhQtqQdzg9mR04gWBZINs_BbPFtSlTECXT_TCUwik,3460
@@ -209,7 +209,7 @@ meerschaum/core/Pipe/_sync.py,sha256=E2egt63tqhVpB0ZteMO36HTF4EYEMtdevKOtN1aLd9o
 meerschaum/core/Pipe/_verify.py,sha256=c3HvsZd4QPydqozaV6cDDRtwYiNz4V91b0IcnKvcimA,14158
 meerschaum/core/Plugin/__init__.py,sha256=UXg64EvJPgI1PCxkY_KM02-ZmBm4FZpLPIQR_uSJJDc,137
 meerschaum/core/User/_User.py,sha256=JZ9Y1tsjZe-cgD24m9YfZ6ZwSOKn_sHc4rbQ7KblBz8,6592
-meerschaum/core/User/__init__.py,sha256=lJ7beIZTG9sO4dAi3367fFBl17dXYEWHKi7HoaPlDyk,193
+meerschaum/core/User/__init__.py,sha256=JgfTpJc0BGBRPAxCq2679bIveszxy4LfLI-EgYve_E8,1204
 meerschaum/jobs/_Executor.py,sha256=qM62BhFTM4tyJ7p90KOM0y3qyeRY9k3ZV_aTDJMHnO8,1682
 meerschaum/jobs/_Job.py,sha256=hkjHqG5YPej5rC4nwdU7Ay_mjep9Fy4HO5B-eqdBdfo,31984
 meerschaum/jobs/__init__.py,sha256=q0f_2zWw91sAyafP50IgMM06abe-BIYSR_SCWmI4W3E,12177
@@ -241,7 +241,7 @@ meerschaum/utils/daemon/__init__.py,sha256=o9jWb4lRTIyny4EPt7fPXFgV_vIf1mUofsTwo
 meerschaum/utils/daemon/_names.py,sha256=d2ZwTxBoTAqXZkCfZ5LuX2XrkQmLNUq1OTlUqfoH5dA,4515
 meerschaum/utils/dtypes/__init__.py,sha256=ZG1Ccy8QmTNuR0IP5NSMtgWj7Cseh_VU4wxSQDw2m94,8352
 meerschaum/utils/dtypes/sql.py,sha256=IQihwQy4OKSbRjvJy6ky6SszFKR7W1iMs-ruZDsf2js,18701
-meerschaum/utils/formatting/__init__.py,sha256=GpJQWeqkdWw5IuDmW4Rgmapjzv-KkI4jhBZllJi4QIg,15999
+meerschaum/utils/formatting/__init__.py,sha256=gN9UYYT68CQ-sQiqYaQyB64JUJkaaZ7pALDnTcaLUsY,16041
 meerschaum/utils/formatting/_jobs.py,sha256=izsqPJhTtUkXUUtWnbXtReYsUYwulXtci3pBj72Ne64,6637
 meerschaum/utils/formatting/_pipes.py,sha256=840O5rg2aHhQoraCDOh2ZtBo43_W2W6R60yYufEoXp8,19494
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
@@ -251,11 +251,11 @@ meerschaum/utils/packages/_packages.py,sha256=IFcQ4MzmTqjdWkqOsUa25xUNmG246TFqe2
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=sBnlmxHdAh2bx8btfVoD79-H9-cYsv5lP02IIXkyECs,3553
 meerschaum/utils/venv/__init__.py,sha256=f3oi67lXYPLKJrnRW9lae7M3A8SFiC7DzaMoBdCVUFs,24609
-meerschaum-2.6.10.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.6.10.dist-info/METADATA,sha256=pJcfXtifDFIe38Cu39zlZOlgp0wZ1-IDGQPe7HE0cPU,24758
-meerschaum-2.6.10.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.6.10.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-meerschaum-2.6.10.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.6.10.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.6.10.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.6.10.dist-info/RECORD,,
+meerschaum-2.6.12.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.6.12.dist-info/METADATA,sha256=CHRO03ly42edn4c72djpC7gAWOG0yKfgnMl3j__f-BM,24758
+meerschaum-2.6.12.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.6.12.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+meerschaum-2.6.12.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.6.12.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.6.12.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.6.12.dist-info/RECORD,,

{meerschaum-2.6.10.dist-info → meerschaum-2.6.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.4.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any