meerschaum 3.0.6__tar.gz → 3.0.7__tar.gz

{meerschaum-3.0.6/meerschaum.egg-info → meerschaum-3.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 3.0.6
+Version: 3.0.7
 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 → meerschaum-3.0.7}/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-3.0.6 → meerschaum-3.0.7}/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-3.0.6 → meerschaum-3.0.7}/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-3.0.6 → meerschaum-3.0.7}/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-3.0.6 → meerschaum-3.0.7}/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-3.0.6 → meerschaum-3.0.7}/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-3.0.6 → meerschaum-3.0.7}/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-3.0.6 → meerschaum-3.0.7}/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-3.0.6 → meerschaum-3.0.7}/meerschaum/config/_default.py

@@ -153,6 +153,7 @@ default_system_config = {
             'daemon',
             'sql',
             'register plugin',
+            'copy ',
         ],
     },
     'experimental': {

{meerschaum-3.0.6 → meerschaum-3.0.7}/meerschaum/config/_version.py

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

{meerschaum-3.0.6 → meerschaum-3.0.7}/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 → meerschaum-3.0.7/meerschaum.egg-info}/PKG-INFO

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