meerschaum 3.0.6__py3-none-any.whl → 3.0.8__py3-none-any.whl

meerschaum/api/_chain.py

@@ -11,7 +11,7 @@ from __future__ import annotations
 DISALLOW_CHAINING_MESSAGE = """API chaining is not enabled on this Meerschaum instance!
 
 If you manage this server and want to allow this API instance be a parent instance for other API instances,
-run `edit config system` and search for `permissions`.
+run `edit config api` and search for `permissions`.
 Under 'api:permissions:chaining', change the value of `child_apis` to `true`, and restart the API.
 
 It is highly encouraged that you serve this API over HTTPS! Sensitive data like pipe data and salted
@@ -20,5 +20,5 @@ password hashes will be shared between APIs."""
 def check_allow_chaining() -> bool:
     """Consult the configuration to see if"""
     from meerschaum.config import get_config
-    return get_config('system', 'api', 'permissions', 'chaining', 'child_apis')
+    return get_config('api', 'permissions', 'chaining', 'child_apis')
 

meerschaum/api/_chunks.py

@@ -14,7 +14,7 @@ from meerschaum.api import get_cache_connector
 from meerschaum.utils.misc import generate_password
 
 CHUNKS_TOKENS_GENERATORS: Dict[str, Dict[str, Union[Generator[Any, None, None], datetime, int]]]
-DEFAULT_TTL_SECONDS = mrsm.get_config('system', 'api', 'data', 'chunks', 'ttl_seconds')
+DEFAULT_TTL_SECONDS = mrsm.get_config('api', 'data', 'chunks', 'ttl_seconds')
 
 
 def generate_chunks_cursor_token(

meerschaum/api/dash/sessions.py

@@ -15,7 +15,7 @@ from meerschaum.config import get_config
 from meerschaum.utils.warnings import dprint
 
 SESSION_KEY_TEMPLATE: str = 'mrsm_session_id:{session_id}'
-EXPIRES_SECONDS: int = get_config('system', 'api', 'cache', 'session_expires_minutes') * 60
+EXPIRES_SECONDS: int = get_config('api', 'cache', 'session_expires_minutes') * 60
 _active_sessions: Dict[str, Dict[str, Any]] = {}
 
 
@@ -155,7 +155,7 @@ def is_session_authenticated(session_id: Optional[str]) -> bool:
     if cached_auth is not None:
         return cached_auth
 
-    permissions = get_config('system', 'api', 'permissions')
+    permissions = get_config('api', 'permissions')
     allow_non_admin = permissions.get('actions', {}).get('non_admin', False)
 
     is_auth = True if allow_non_admin else session_is_admin(session_id)

meerschaum/api/dash/tokens.py

@@ -417,7 +417,7 @@ def build_tokens_register_input_modal() -> dbc.Modal:
     """
     now = datetime.now(timezone.utc)
     default_expiration_days = mrsm.get_config(
-        'system', 'api', 'tokens', 'default_expiration_days',
+        'api', 'tokens', 'default_expiration_days',
     ) or 366
     default_expiration = round_time(
         now + timedelta(days=default_expiration_days),

meerschaum/api/routes/_login.py

@@ -35,7 +35,7 @@ from meerschaum.utils.warnings import warn
 from meerschaum.api._oauth2 import CustomOAuth2PasswordRequestForm
 
 
-USER_ID_CACHE_EXPIRES_SECONDS: int = mrsm.get_config('system', 'api', 'cache', 'session_expires_minutes') * 60
+USER_ID_CACHE_EXPIRES_SECONDS: int = mrsm.get_config('api', 'cache', 'session_expires_minutes') * 60
 _active_user_ids = {}
 
 

meerschaum/api/routes/_pipes.py

@@ -58,7 +58,7 @@ StreamingResponse = fastapi_responses.StreamingResponse
 pipes_endpoint = endpoints['pipes']
 pd = attempt_import('pandas', lazy=False)
 
-MAX_RESPONSE_ROW_LIMIT: int = mrsm.get_config('system', 'api', 'data', 'max_response_row_limit')
+MAX_RESPONSE_ROW_LIMIT: int = mrsm.get_config('api', 'data', 'max_response_row_limit')
 
 
 @app.post(
@@ -77,12 +77,12 @@ def register_pipe(
     """
     Register a new pipe.
     """
-    allow_pipes = mrsm.get_config('system', 'api', 'permissions', 'registration', 'pipes')
+    allow_pipes = mrsm.get_config('api', 'permissions', 'registration', 'pipes')
     if not allow_pipes:
         return False, (
             "The administrator for this server has not allowed pipe registration.\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'."
+            "open the configuration file with `edit config api` and search for 'permissions'."
             " Under the keys `api:permissions:registration`, " + 
             "you can toggle various registration types."
         )
@@ -116,12 +116,12 @@ def edit_pipe(
     """
     Edit an existing pipe's parameters.
     """
-    allow_actions = mrsm.get_config('system', 'api', 'permissions', 'actions', 'non_admin')
+    allow_actions = mrsm.get_config('api', 'permissions', 'actions', 'non_admin')
     if not allow_actions:
         return False, (
             "The administrator for this server has not allowed 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'."
+            "open the configuration file with `edit config api` and search for 'permissions'."
             " Under the keys `api:permissions:actions`, "
             "you can toggle non-admin actions."
         )

meerschaum/api/routes/_plugins.py

@@ -81,12 +81,12 @@ def register_plugin(
 
     """
     from meerschaum.config import get_config
-    allow_plugins = get_config('system', 'api', 'permissions', 'registration', 'plugins')
+    allow_plugins = get_config('api', 'permissions', 'registration', 'plugins')
     if not allow_plugins:
         return False, (
             "The administrator for this server has not allowed plugin registration.\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'. " +
+            "open the configuration file with `edit config api` and search for 'permissions'. " +
             " Under the keys `api:permissions:registration`, " +
             "you can toggle various registration types."
         )

meerschaum/api/routes/_users.py

@@ -109,12 +109,12 @@ def register_user(
         except Exception:
             return False, "Invalid dictionary string received for attributes."
 
-    allow_users = get_config('system', 'api', 'permissions', 'registration', 'users')
+    allow_users = get_config('api', 'permissions', 'registration', 'users')
     if not allow_users:
         return False, (
             "The administrator for this server has not allowed user registration.\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'. "
+            "open the configuration file with `edit config api` and search for 'permissions'. "
             " Under the keys api:permissions:registration, "
             "you can toggle various registration types."
         )

meerschaum/config/_default.py

@@ -119,8 +119,6 @@ default_system_config = {
         'api': {
         },
     },
-    'api': 'MRSM{api}',
-    'webterm': 'MRSM{api:webterm}',
     'cli': {
         'max_daemons': (multiprocessing.cpu_count() * 3),
         'refresh_seconds': 0.1,
@@ -153,6 +151,7 @@ default_system_config = {
             'daemon',
             'sql',
             'register plugin',
+            'copy ',
         ],
     },
     'experimental': {

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "3.0.6"
+__version__ = "3.0.8"

meerschaum/connectors/sql/_sql.py

@@ -1134,7 +1134,7 @@ def psql_insert_copy(
 
     from meerschaum.utils.sql import sql_item_name
     from meerschaum.utils.warnings import dprint
-    from meerschaum.utils.dtypes import json_serialize_value
+    from meerschaum.utils.dtypes import json_serialize_value, value_is_null
 
     ### NOTE: PostgreSQL doesn't support NUL chars in text, so they're removed from strings.
     data_iter = (
@@ -1152,7 +1152,7 @@ def psql_insert_copy(
                         else item.replace('\0', '').replace('\\u0000', '')
                     )
                 )
-            ) if item is not None
+            ) if not value_is_null(item)
             else r'\N'
             for item in row
         ) for row in data_iter

{meerschaum-3.0.6.dist-info → meerschaum-3.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 3.0.6
+Version: 3.0.8
 Summary: Sync Time-Series Pipes with Meerschaum
 Author-email: Bennett Meares <bennett.meares@gmail.com>
 Maintainer-email: Bennett Meares <bennett.meares@gmail.com>

{meerschaum-3.0.6.dist-info → meerschaum-3.0.8.dist-info}/RECORD

@@ -53,8 +53,8 @@ meerschaum/actions/uninstall.py,sha256=tBXhdXggSieGEQe4EPGxpgMK0MZTJCweNvAJ9-59E
 meerschaum/actions/upgrade.py,sha256=-N7S0ewA__azTg4Q-Woj0Ehv2SN-Siarr4_HGPlJREk,6711
 meerschaum/actions/verify.py,sha256=yKNqh2T38t3yxqErr2o8i-nNG4ZZuyQUkaImATRdl5M,4676
 meerschaum/api/__init__.py,sha256=r9h44c-l8Qx7QNoNWdvDe6ovJPbZC34PzqWnT-Odi3E,11214
-meerschaum/api/_chain.py,sha256=h8-WXUGXX6AqzdALfsBC5uv0FkAcLdHJXCGzqzuq89k,875
-meerschaum/api/_chunks.py,sha256=rmhz8h4MZDnjkE02fDqDEwbYwwZbnU4gVwy3-QqB5y0,1898
+meerschaum/api/_chain.py,sha256=LB8hFXMoMjvWySmI5FJy0BdwK4hR0WqkmEgD44EHq40,862
+meerschaum/api/_chunks.py,sha256=fa2FVj0MzjMiURAq1KvfAA6a72sxZdhxDx1uKroauCE,1888
 meerschaum/api/_events.py,sha256=6VcZ8SkIYfMC72RWVUuqG0Yjels1bFm66Sma5v2w2sg,3835
 meerschaum/api/_exceptions.py,sha256=xfbWp8F8JYrMUdtDXesn8C8e39_jAXHz51IosIGjkVM,463
 meerschaum/api/_oauth2.py,sha256=agWeuG5LzxLHZTjt3psdemhF_yoVJtdnfDdxSBVQMnY,7048
@@ -68,9 +68,9 @@ meerschaum/api/dash/jobs.py,sha256=p0mC30jO7aYS0vUbfn540d66-s19_c-GgjyfNmVXgrs,7
 meerschaum/api/dash/keys.py,sha256=pGIbKxp5RsIelzAU4WZMcYGDN835tF4mGhoktydc42M,8561
 meerschaum/api/dash/pipes.py,sha256=PUWvuoVGKKwqWb2yIc5l_CLClzcmBk5di4OTWYwlPkg,37992
 meerschaum/api/dash/plugins.py,sha256=KdfG04f6SsUpBg-nm7MUJegFGuElOj-GAkxDX98hi60,3768
-meerschaum/api/dash/sessions.py,sha256=jUM0a9CXNZC3j7SF3QkZim-8ZAbDom-V1iXklvMyBZE,5382
+meerschaum/api/dash/sessions.py,sha256=zFh9knCddq9WOor-qxXdEbmzZuavCEXOc2VIWCnYNJI,5362
 meerschaum/api/dash/sync.py,sha256=9lt7IRdG-fe9gf_ZO_viPiGlerX7ic6r_VFocv3I51A,504
-meerschaum/api/dash/tokens.py,sha256=7_4k45drB6uoL1izDFo6TezzSQ6v1DP_aHw7orYk4ZU,20832
+meerschaum/api/dash/tokens.py,sha256=Y880PVE6AkPy5pD7iZrCJnAGMwm24pFCoMSP98cO_D0,20822
 meerschaum/api/dash/users.py,sha256=3wq3ZG51DxOjNeF-X5HdlXD1MYQ1nQ9oowYSvFEY7hs,1050
 meerschaum/api/dash/websockets.py,sha256=L6e7Ved7Osh9JRJitS4wMbVGPrrXPD4uB61Yj1Y5aug,927
 meerschaum/api/dash/webterm.py,sha256=IgEaAW8Dx3am8Mk6lJ9ydMhk9GurHHa-AoodWzxQbHo,4768
@@ -133,18 +133,18 @@ meerschaum/api/routes/_actions.py,sha256=LUU_F87_CyjZMj5sCJ9P4XbmjgnpM865lzii26X
 meerschaum/api/routes/_connectors.py,sha256=T8ssmO15qB5jFn-DORRXq6xhdNWkqB1seUj2NDbaBK0,1731
 meerschaum/api/routes/_index.py,sha256=Z8kuyqm3vmJadw8iIYyswYI4-3IOJ7KXdkhDTv1oUsY,697
 meerschaum/api/routes/_jobs.py,sha256=USOafck07Rtk11HG0NHtFnan0LjjPruiXy8SIPHRe7c,12740
-meerschaum/api/routes/_login.py,sha256=TIOy0GKSKDqMXaMgTIxNNk3EdyiWtbfOJQSt3wMMgGE,5533
+meerschaum/api/routes/_login.py,sha256=fSfREsYIuzsJFQtiq9kyRLNJgXVjvuZy5Y0VteMg6sQ,5523
 meerschaum/api/routes/_misc.py,sha256=fX2ZC5TeudpKn4iSfJcO6OPq8sMAI9gRQJVSEnZtAJo,2618
-meerschaum/api/routes/_pipes.py,sha256=aRbU1QIvINReHGR80VuRhzGhmPwCnMgfo60RX0Ordag,30757
-meerschaum/api/routes/_plugins.py,sha256=mdFetewPea2cxjBzeuJDCQFOQFZTGwDFWCvnaNQGQis,6844
+meerschaum/api/routes/_pipes.py,sha256=YWQdlL6IiT2uESSe7c8Od5_sZmdbpKFvU7L8woPRcic,30721
+meerschaum/api/routes/_plugins.py,sha256=H--IrwOeUWO9khR95FlkvW5hbmGrYsHtUQ7e-4a_xMY,6831
 meerschaum/api/routes/_tokens.py,sha256=XuG410HixRjpQ-d7X5FAr4fDUNGfDY0M_AqOkrEzxw4,6348
-meerschaum/api/routes/_users.py,sha256=O6CkvSIvA47opglXgH9RLppHshPMCxBktTLe1I-TiM0,7696
+meerschaum/api/routes/_users.py,sha256=lE7CLA-NNIDzuUf-lbXCEKF1gile4993QouZYiof63s,7683
 meerschaum/api/routes/_version.py,sha256=B9DY3_x6OlqU8CoEkoXUZ1x534svY58Z00GERnZGm3s,797
 meerschaum/api/routes/_webterm.py,sha256=TviHMz0_pLnby7dZW76y3mt-40Cq3VGFItSVcBipOeI,4163
 meerschaum/api/tables/__init__.py,sha256=e2aNC0CdlWICTUMx1i9RauF8Pm426J0RZJbsJWv4SWo,482
 meerschaum/config/__init__.py,sha256=IZLzkI7jBycfmHSR6R_WG3eBe0Uv53c-CI_QqNf4lnw,12966
 meerschaum/config/_dash.py,sha256=BJHl4xMrQB-YHUEU7ldEW8q_nOPoIRSOqLrfGElc6Dw,187
-meerschaum/config/_default.py,sha256=kon77hqv6Iw0i_FovooR62iZOD589EqAMSeG5Z-gOkI,8172
+meerschaum/config/_default.py,sha256=346f8PGiH-k4DGnT9sKAMPuPmVmD4TXxQJn4UTLrIOk,8133
 meerschaum/config/_edit.py,sha256=WCdt7BSspPytH-NiPS1kpCZxXDDG7VbOu0H1AnMtwlw,9177
 meerschaum/config/_formatting.py,sha256=SXUU0QFAlO_eIZjyodXQGSrjg-mVkL2qXuQwxqqdJps,6746
 meerschaum/config/_jobs.py,sha256=gS_4mMGdmVP7WB4V5Sz8kYP0HmhWcMY2jSWGR7jX6cw,1279
@@ -154,7 +154,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=Y4O-eozH94FsucqLWXb5hS57RLPMHsLUQe7a24doi0o,16231
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=nN5bLCHU8sFDdlPi7pQXuRVFcX457rZjOiALTvqRS_E,4332
-meerschaum/config/_version.py,sha256=n_QQMtQ9-WXprfhW3j-OxjwbwRq-50WX3f9QvOq_8Gc,71
+meerschaum/config/_version.py,sha256=kaVgri-QnTrGSoyLsWzBKmdjtXMxD8rirdkYVB7E_2Y,71
 meerschaum/config/environment.py,sha256=hTyjPLrGp3R4sytg_Jqv4TnCVI1WdmbX2YoRBCWSNt8,8277
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/static.py,sha256=92fSGxoHFDOK9GEsN8NVbAEh9W7-eZ1BS6thyEqcjeI,359
@@ -197,7 +197,7 @@ meerschaum/connectors/sql/_fetch.py,sha256=ZqtYd1LSGmz-UVXLcEppRAhY2mAUNAkE2SU-u
 meerschaum/connectors/sql/_instance.py,sha256=xCc8M0xWMzF5Tu_1uWIFivAoHey5N1ccFhN_Z7u04zk,6304
 meerschaum/connectors/sql/_pipes.py,sha256=tlIAgzGY2vEeO9a891QpuE9UBCiAj7MiCo5r0xrQd5M,130705
 meerschaum/connectors/sql/_plugins.py,sha256=SubR5HUJaetoUCv83YNEMwhv4wTTBCMcxSOEUgyMML4,8747
-meerschaum/connectors/sql/_sql.py,sha256=T94jbuiZ1IRqkt_s_LQNTXyRc8OmzWLZSYnWIityFkU,45313
+meerschaum/connectors/sql/_sql.py,sha256=L8iX5slICvLYf5m-txblNoBl6PzVC2gk4GE272QCuNQ,45335
 meerschaum/connectors/sql/_uri.py,sha256=pSqGo6DfSvCUl2rjk833W3Foi20goZ0301pyqZR4R2I,3454
 meerschaum/connectors/sql/_users.py,sha256=n3bW01GHWNT5QpI_uGyQV6aZA_FEwgV61QrhFmgNit8,10837
 meerschaum/connectors/sql/tools.py,sha256=jz8huOaRCwGlYdtGfAqAh7SoK8uydYBrasKQba9FT38,187
@@ -279,11 +279,11 @@ meerschaum/utils/packages/_packages.py,sha256=KWVfxsm-6ZdffpskIjHPki6wSQvf0LK9MW
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=lYiuyCloG1OmKh_8xMMXHkAq1VIMUWLhYGtCVm6nvdA,4044
 meerschaum/utils/venv/__init__.py,sha256=P40aC-RMz3iGrMnED6D4tha6Tj0Mz-pDgUqJVibgjwo,27767
-meerschaum-3.0.6.dist-info/licenses/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-3.0.6.dist-info/licenses/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-3.0.6.dist-info/METADATA,sha256=g0QWm96vMEp03QxtpG03iUoN096UGYkLe6noa3uny4Y,25325
-meerschaum-3.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meerschaum-3.0.6.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-3.0.6.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-3.0.6.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-3.0.6.dist-info/RECORD,,
+meerschaum-3.0.8.dist-info/licenses/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-3.0.8.dist-info/licenses/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-3.0.8.dist-info/METADATA,sha256=knbevm746wUv5LdQRIPJ7ZJ9wP4qDA2IWutQ91y8bqQ,25325
+meerschaum-3.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meerschaum-3.0.8.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-3.0.8.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-3.0.8.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-3.0.8.dist-info/RECORD,,