meerschaum 2.2.0rc4__py3-none-any.whl → 2.2.1__py3-none-any.whl

meerschaum/_internal/entry.py

@@ -47,9 +47,9 @@ def entry(sysargs: Optional[List[str]] = None) -> SuccessTuple:
                 )
             )
 
-    if args.get('schedule', None):
-        from meerschaum.utils.schedule import schedule_function
-        return schedule_function(entry_with_args, **args)
+    #  if args.get('schedule', None):
+        #  from meerschaum.utils.schedule import schedule_function
+        #  return schedule_function(entry_with_args, **args)
     return entry_with_args(**args)
 
 
@@ -61,7 +61,7 @@ def entry_with_args(
     Use `_entry()` for parsing sysargs before executing.
     """
     import sys
-    from meerschaum.plugins import Plugin
+    import functools
     from meerschaum.actions import get_action, get_main_action_name
     from meerschaum._internal.arguments import remove_leading_action
     from meerschaum.utils.venv import Venv, active_venvs, deactivate_venv
@@ -88,10 +88,41 @@ def entry_with_args(
             action_function.__module__.startswith('plugins.')
         ) else None
     )
-    plugin = Plugin(plugin_name) if plugin_name else None
+
+    skip_schedule = False
+    if (
+        kw['action']
+        and kw['action'][0] == 'start'
+        and kw['action'][1] in ('job', 'jobs')
+    ):
+        skip_schedule = True
 
     kw['action'] = remove_leading_action(kw['action'], _actions=_actions)
 
+    do_action = functools.partial(_do_action_wrapper, action_function, plugin_name, **kw)
+    if kw.get('schedule', None) and not skip_schedule:
+        from meerschaum.utils.schedule import schedule_function
+        from meerschaum.utils.misc import interval_str
+        import time
+        from datetime import timedelta
+        start_time = time.perf_counter()
+        schedule_function(do_action, **kw)
+        delta = timedelta(seconds=(time.perf_counter() - start_time))
+        result = True, f"Exited scheduler after {interval_str(delta)}."
+    else:
+        result = do_action()
+
+    ### Clean up stray virtual environments.
+    for venv in [venv for venv in active_venvs]:
+        deactivate_venv(venv, debug=kw.get('debug', False), force=True)
+
+    return result
+
+
+def _do_action_wrapper(action_function, plugin_name, **kw):
+    from meerschaum.plugins import Plugin
+    from meerschaum.utils.venv import Venv, active_venvs, deactivate_venv
+    plugin = Plugin(plugin_name) if plugin_name else None
     with Venv(plugin, debug=kw.get('debug', False)):
         action_name = ' '.join(action_function.__name__.split('_') + kw.get('action', []))
         try:
@@ -111,14 +142,8 @@ def entry_with_args(
             )
         except KeyboardInterrupt:
             result = False, f"Cancelled action `{action_name}`."
-
-    ### Clean up stray virtual environments.
-    for venv in [venv for venv in active_venvs]:
-        deactivate_venv(venv, debug=kw.get('debug', False), force=True)
-
     return result
 
-
 _shells = []
 _shell = None
 def get_shell(

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.2.0rc4"
+__version__ = "2.2.1"

meerschaum/connectors/__init__.py

@@ -23,7 +23,14 @@ from meerschaum.connectors.sql.SQLConnector import SQLConnector
 from meerschaum.connectors.api.APIConnector import APIConnector
 from meerschaum.connectors.sql._create_engine import flavor_configs as sql_flavor_configs
 
-__all__ = ("Connector", "SQLConnector", "APIConnector", "get_connector", "is_connected")
+__all__ = (
+    "Connector",
+    "SQLConnector",
+    "APIConnector",
+    "get_connector",
+    "is_connected",
+    "poll",
+)
 
 ### store connectors partitioned by
 ### type, label for reuse

meerschaum/connectors/sql/_cli.py

@@ -42,9 +42,13 @@ def cli(
     env = copy.deepcopy(dict(os.environ))
     env[f'MRSM_SQL_{self.label.upper()}'] = json.dumps(self.meta)
     cli_code = (
+        "import sys\n"
         "import meerschaum as mrsm\n"
         f"conn = mrsm.get_connector('sql:{self.label}')\n"
-        f"conn._cli_exit()"
+        "success, msg = conn._cli_exit()\n"
+        "mrsm.pprint((success, msg))\n"
+        "if not success:\n"
+        "    raise Exception(msg)"
     )
     try:
         _ = venv_exec(cli_code, venv=None, debug=debug, capture_output=False)
@@ -91,6 +95,8 @@ def _cli_exit(
     cli_arg_str = self.DATABASE_URL
     if self.flavor in ('sqlite', 'duckdb'):
         cli_arg_str = str(self.database)
+    if cli_arg_str.startswith('postgresql+psycopg://'):
+        cli_arg_str = cli_arg_str.replace('postgresql+psycopg://', 'postgresql://')
 
     ### Define the script to execute to launch the CLI.
     ### The `mssqlcli` script is manually written to avoid telemetry

meerschaum/connectors/sql/_pipes.py

@@ -385,6 +385,9 @@ def get_create_index_queries(
     -------
     A dictionary of column names mapping to lists of queries.
     """
+    ### NOTE: Due to recent breaking changes in DuckDB, indices don't behave properly.
+    if self.flavor == 'duckdb':
+        return {}
     from meerschaum.utils.sql import (
         sql_item_name,
         get_distinct_col_count,
@@ -554,6 +557,9 @@ def get_drop_index_queries(
     -------
     A dictionary of column names mapping to lists of queries.
     """
+    ### NOTE: Due to breaking changes within DuckDB, indices must be skipped.
+    if self.flavor == 'duckdb':
+        return {}
     if not pipe.exists(debug=debug):
         return {}
     from meerschaum.utils.sql import sql_item_name, table_exists, hypertable_queries

meerschaum/utils/packages/_packages.py

@@ -60,8 +60,8 @@ packages: Dict[str, Dict[str, str]] = {
         'pymysql'                    : 'PyMySQL>=0.9.0',
         'aiomysql'                   : 'aiomysql>=0.0.21',
         'sqlalchemy_cockroachdb'     : 'sqlalchemy-cockroachdb>=2.0.0',
-        'duckdb'                     : 'duckdb<0.10.3',
-        'duckdb_engine'              : 'duckdb-engine>=0.9.2',
+        'duckdb'                     : 'duckdb>=1.0.0',
+        'duckdb_engine'              : 'duckdb-engine>=0.13.0',
     },
     'drivers-extras': {
         'pyodbc'                     : 'pyodbc>=4.0.30',

meerschaum/utils/schedule.py

@@ -99,7 +99,7 @@ def schedule_function(
     apscheduler = mrsm.attempt_import('apscheduler', lazy=False)
     now = round_time(datetime.now(timezone.utc), timedelta(minutes=1))
     trigger = parse_schedule(schedule, now=now)
-    _scheduler = apscheduler.AsyncScheduler()
+    _scheduler = apscheduler.AsyncScheduler(identity='mrsm-scheduler')
     try:
         loop = asyncio.get_running_loop()
     except RuntimeError:
@@ -107,7 +107,14 @@ def schedule_function(
 
     async def run_scheduler():
         async with _scheduler:
-            job = await _scheduler.add_schedule(function, trigger, args=args, kwargs=kw)
+            job = await _scheduler.add_schedule(
+                function,
+                trigger,
+                args = args,
+                kwargs = kw,
+                max_running_jobs = 1, 
+                conflict_policy = apscheduler.ConflictPolicy.replace,
+            )
             try:
                 await _scheduler.run_until_stopped()
             except (KeyboardInterrupt, SystemExit) as e:

{meerschaum-2.2.0rc4.dist-info → meerschaum-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.0rc4
+Version: 2.2.1
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -55,8 +55,8 @@ Requires-Dist: psycopg[binary] >=3.1.18 ; extra == 'api'
 Requires-Dist: PyMySQL >=0.9.0 ; extra == 'api'
 Requires-Dist: aiomysql >=0.0.21 ; extra == 'api'
 Requires-Dist: sqlalchemy-cockroachdb >=2.0.0 ; extra == 'api'
-Requires-Dist: duckdb <0.10.3 ; extra == 'api'
-Requires-Dist: duckdb-engine >=0.9.2 ; extra == 'api'
+Requires-Dist: duckdb >=1.0.0 ; extra == 'api'
+Requires-Dist: duckdb-engine >=0.13.0 ; extra == 'api'
 Requires-Dist: wheel >=0.34.2 ; extra == 'api'
 Requires-Dist: setuptools >=63.3.0 ; extra == 'api'
 Requires-Dist: PyYAML >=5.3.1 ; extra == 'api'
@@ -161,8 +161,8 @@ Requires-Dist: psycopg[binary] >=3.1.18 ; extra == 'drivers'
 Requires-Dist: PyMySQL >=0.9.0 ; extra == 'drivers'
 Requires-Dist: aiomysql >=0.0.21 ; extra == 'drivers'
 Requires-Dist: sqlalchemy-cockroachdb >=2.0.0 ; extra == 'drivers'
-Requires-Dist: duckdb <0.10.3 ; extra == 'drivers'
-Requires-Dist: duckdb-engine >=0.9.2 ; extra == 'drivers'
+Requires-Dist: duckdb >=1.0.0 ; extra == 'drivers'
+Requires-Dist: duckdb-engine >=0.13.0 ; extra == 'drivers'
 Provides-Extra: drivers-extras
 Requires-Dist: pyodbc >=4.0.30 ; extra == 'drivers-extras'
 Requires-Dist: cx-Oracle >=8.3.0 ; extra == 'drivers-extras'
@@ -217,8 +217,8 @@ Requires-Dist: psycopg[binary] >=3.1.18 ; extra == 'full'
 Requires-Dist: PyMySQL >=0.9.0 ; extra == 'full'
 Requires-Dist: aiomysql >=0.0.21 ; extra == 'full'
 Requires-Dist: sqlalchemy-cockroachdb >=2.0.0 ; extra == 'full'
-Requires-Dist: duckdb <0.10.3 ; extra == 'full'
-Requires-Dist: duckdb-engine >=0.9.2 ; extra == 'full'
+Requires-Dist: duckdb >=1.0.0 ; extra == 'full'
+Requires-Dist: duckdb-engine >=0.13.0 ; extra == 'full'
 Requires-Dist: toga >=0.3.0-dev29 ; extra == 'full'
 Requires-Dist: pywebview >=3.6.3 ; extra == 'full'
 Requires-Dist: pycparser >=2.21.0 ; extra == 'full'
@@ -271,8 +271,8 @@ Requires-Dist: psycopg[binary] >=3.1.18 ; extra == 'sql'
 Requires-Dist: PyMySQL >=0.9.0 ; extra == 'sql'
 Requires-Dist: aiomysql >=0.0.21 ; extra == 'sql'
 Requires-Dist: sqlalchemy-cockroachdb >=2.0.0 ; extra == 'sql'
-Requires-Dist: duckdb <0.10.3 ; extra == 'sql'
-Requires-Dist: duckdb-engine >=0.9.2 ; extra == 'sql'
+Requires-Dist: duckdb >=1.0.0 ; extra == 'sql'
+Requires-Dist: duckdb-engine >=0.13.0 ; extra == 'sql'
 Requires-Dist: wheel >=0.34.2 ; extra == 'sql'
 Requires-Dist: setuptools >=63.3.0 ; extra == 'sql'
 Requires-Dist: PyYAML >=5.3.1 ; extra == 'sql'

{meerschaum-2.2.0rc4.dist-info → meerschaum-2.2.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 meerschaum/__init__.py,sha256=mw_PhxT7155SW8d_S51T4-WTibL5g205CwMa3qX8qyA,1487
 meerschaum/__main__.py,sha256=Q43yra6APe5CdhDp9ngaorUjs8ZoabeYnMa6C5kQchA,2763
 meerschaum/_internal/__init__.py,sha256=ilC7utfKtin7GAvuN34fKyUQYfPyqH0Mm3MJF5iyEf4,169
-meerschaum/_internal/entry.py,sha256=Oga0OH808UtTJGvvkQQFRKjVCjSCRYjJe3M1A9-yf1k,4806
+meerschaum/_internal/entry.py,sha256=_pfnlnXhqzP4XQ5syZ04sDG9LxS5UhNdziBlETDMUhc,5756
 meerschaum/_internal/arguments/__init__.py,sha256=HFciFQgo2ZOT19Mo6CpLhPYlpLYh2sNn1C9Lo7NMADc,519
 meerschaum/_internal/arguments/_parse_arguments.py,sha256=dNVDBvXYNgEw-TrlZJ9A6VPlG696EpQcQm6FOAhseqw,10249
 meerschaum/_internal/arguments/_parser.py,sha256=OtcrZK-_qV9a5qpdcP9NLKOGRevjmCU9fBLbB88px3c,13719
@@ -135,7 +135,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=WFZKIXZMDe_ca0ES7ivgM_mnwShvFxLdoeisT_X5-h0,14720
 meerschaum/config/_shell.py,sha256=s74cmJl8NrhM_Y1cB_P41_JDUYXV0g4WXnKFZWMtnrY,3551
 meerschaum/config/_sync.py,sha256=oK2ZujO2T1he08BXCFyiniBUevNGWSQKXLcS_jRv_7Y,4155
-meerschaum/config/_version.py,sha256=6-VmhSVm61Y2uCa9nlsUwmkBFChw3Ft25iUS-WOY4Ts,74
+meerschaum/config/_version.py,sha256=OydT3amCDUZG1dyzap3MREBRuMd53MMaduOv0qZtPL8,71
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=c_WdTSejVdj8lqSE_pK5MhIBkHoftiZWDuEuB9dmk2I,9007
 meerschaum/config/stack/grafana/__init__.py,sha256=LNXQw2FvHKrD68RDhqDmi2wJjAHaKw9IWx8rNuyWEPo,2010
@@ -144,7 +144,7 @@ meerschaum/config/stack/mosquitto/resources/__init__.py,sha256=47DEQpj8HBSa-_TIm
 meerschaum/config/stack/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/static/__init__.py,sha256=zsSq54OkLqjfG_QGyH6zXzZnoaGpDyjmV0OCvbygFr8,4474
 meerschaum/connectors/Connector.py,sha256=cJKinmk7eWZwCBvtX4H9r66macTZOY1qjxR7JUEmDmg,6381
-meerschaum/connectors/__init__.py,sha256=OCNfIEeuom6g7GOO3xj37YAuxLOesGCZ-VrcltyHsSY,12071
+meerschaum/connectors/__init__.py,sha256=zXumYuKTWOyu3U6J1zvMQS30HImYLE8ssBdJs-I134M,12106
 meerschaum/connectors/parse.py,sha256=gidA2jvOLTvEeL5hM9JjcUwkMRBadUhd4IfA5Jy1tgg,4044
 meerschaum/connectors/poll.py,sha256=gIY9TvFBqMvMNQvR0O2No7koLLz2PjfExBr_Dsosgpg,7363
 meerschaum/connectors/api/APIConnector.py,sha256=pj-RncLhDUEBK7R4tByH6nrxZWU8zxGVOS2Wyik36zs,4355
@@ -162,11 +162,11 @@ meerschaum/connectors/plugin/PluginConnector.py,sha256=aQ1QaB7MordCFimZqoGLb0R12
 meerschaum/connectors/plugin/__init__.py,sha256=pwF7TGY4WNz2_HaVdmK4rPQ9ZwTOEuPHgzOqsGcoXJw,198
 meerschaum/connectors/sql/SQLConnector.py,sha256=QvsFgAv2NAUdsJrcNYZIkQ9x_ow5JRe4Ie_UgSrDz3M,11709
 meerschaum/connectors/sql/__init__.py,sha256=xwSYhYuketTXhQLXyD9pZ0NNBPboW5Oqv9zrKfjx0Ic,175
-meerschaum/connectors/sql/_cli.py,sha256=XaWjWZzGIfhMiYoXAs2FrwHUGNyZpxIzH4g4xugLKsw,4123
+meerschaum/connectors/sql/_cli.py,sha256=1SgnWeMIAihoxp4FzbNrcq1npXf0dSOQnCntpU9hUXA,4405
 meerschaum/connectors/sql/_create_engine.py,sha256=vPVwR3cpfcQm0aW9xo_DUWA3gMdlkuB0wJ8JoTpRYD0,10396
 meerschaum/connectors/sql/_fetch.py,sha256=NYYWDoEd-aGIS337KwH-D9_3KVWVCZOHAspGLfdEuUE,13086
 meerschaum/connectors/sql/_instance.py,sha256=r_S96vzSuKnBVGROSKQAPl-DnFnOOEPUkz1KFDFPHFQ,6509
-meerschaum/connectors/sql/_pipes.py,sha256=rVNHYo7BwVe7PTNYBQVsjxH2bKT2XFqZO4Kakzv9AW8,101362
+meerschaum/connectors/sql/_pipes.py,sha256=0FeRmmZueWBfgBo6XFKcidC7l8eBTDUY12-DbdrXOsk,101627
 meerschaum/connectors/sql/_plugins.py,sha256=OsCmDlZKyJnY77QAWghmpuXR0z_CmFq5uHpZK7Cj-ZI,8321
 meerschaum/connectors/sql/_sql.py,sha256=553BTPtvnnLMERYK8IcxR4CS3R4Sq7id-5hbApOEsIU,34199
 meerschaum/connectors/sql/_uri.py,sha256=0BrhQtqQdzg9mR04gWBZINs_BbPFtSlTECXT_TCUwik,3460
@@ -205,7 +205,7 @@ meerschaum/utils/networking.py,sha256=Sr_eYUGW8_UV9-k9LqRFf7xLtbUcsDucODyLCRsFRU
 meerschaum/utils/pool.py,sha256=vkE42af4fjrTEJTxf6Ek3xGucm1MtEkpsSEiaVzNKHs,2655
 meerschaum/utils/process.py,sha256=IHnUhX79XofHwMsOs1A_irLMa7i48xXB-GCL83MtZOY,7192
 meerschaum/utils/prompt.py,sha256=0mBFbgi_l9rCou9UnC_6qKTHkqyl1Z_jSRzfmc0xRXM,16490
-meerschaum/utils/schedule.py,sha256=coJm8s91DZjezv4h9dkgUkU3R_O7gWJUBojxjItkrCQ,10654
+meerschaum/utils/schedule.py,sha256=2UpXg5E9mfjg83w3N6C2_Q7tlE2exVJehro2Bvp6PzQ,10871
 meerschaum/utils/sql.py,sha256=4sCNEpgUd6uFz6ySs4nnUMVaOT0YAvPM1ZlQYJTSF-0,46656
 meerschaum/utils/threading.py,sha256=3N8JXPAnwqJiSjuQcbbJg3Rv9-CCUMJpeQRfKFR7MaA,2489
 meerschaum/utils/typing.py,sha256=L05wOXfWdn_nJ0KnZVr-2zdMYcqjdyOW_7InT3xe6-s,2807
@@ -224,15 +224,15 @@ meerschaum/utils/formatting/_pipes.py,sha256=wy0iWJFsFl3X2VloaiA_gp9Yx9w6tD3FQZv
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
 meerschaum/utils/formatting/_shell.py,sha256=ox75O7VHDAiwzSvdMSJZhXLadvAqYJVeihU6WeZ2Ogc,3677
 meerschaum/utils/packages/__init__.py,sha256=HEJYz_rceqljpyRFlnToLR6vc_b7r-2d2K8zh_th2lg,57185
-meerschaum/utils/packages/_packages.py,sha256=eAw_5D9AHblnUnKEiBMCElVgtCosxgrhQUAAktITSNA,7864
+meerschaum/utils/packages/_packages.py,sha256=P1Y0mc0TlX5iCL08U-4WkMG9LpEt_REWo30GJUn38cM,7865
 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=sj-n8scWH2NPDJGAxfpqzsYqVUt2jMEr-7Uq9G7YUNQ,23183
-meerschaum-2.2.0rc4.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.2.0rc4.dist-info/METADATA,sha256=KBLySrydHzynnwn50qWE8vmaRC7G5UjrRDU-R65BgoY,23806
-meerschaum-2.2.0rc4.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.2.0rc4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-meerschaum-2.2.0rc4.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.2.0rc4.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.2.0rc4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.2.0rc4.dist-info/RECORD,,
+meerschaum-2.2.1.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.2.1.dist-info/METADATA,sha256=XUYdU9OV2qtydf3XiXIvkA0gE-Nikh43zj_KRqA4ruo,23807
+meerschaum-2.2.1.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.2.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+meerschaum-2.2.1.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.2.1.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.2.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.2.1.dist-info/RECORD,,