dmart 1.4.17__py3-none-any.whl → 1.4.33__py3-none-any.whl

{dmart_migrations → alembic}/env.py

@@ -1,9 +1,3 @@
-import sys
-import os
-# Add the parent directory (backend) to sys.path to allow importing modules from it
-# This is done here to avoid adding it to PYTHONPATH globally which causes shadowing of 'alembic' library
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
 from logging.config import fileConfig
 
 from sqlalchemy import engine_from_config
@@ -25,12 +19,9 @@ config = context.config
 if config.config_file_name is not None:
     fileConfig(config.config_file_name)
 
-if "sqlite" in settings.database_driver:
-    connection_string = f"sqlite:///{settings.database_name}"
-else:
-    driver = settings.database_driver.replace('+asyncpg', '+psycopg')
-    database_connection_string = f"{driver}://{settings.database_username}:{settings.database_password}@{settings.database_host}:{settings.database_port}"
-    connection_string = f"{database_connection_string}/{settings.database_name}"
+driver = settings.database_driver.replace('+asyncpg', '+psycopg')
+database_connection_string = f"{driver}://{settings.database_username}:{settings.database_password}@{settings.database_host}:{settings.database_port}"
+connection_string = f"{database_connection_string}/{settings.database_name}"
 config.set_main_option('sqlalchemy.url', connection_string)
 
 # add your model's MetaData object here

bundler.py

@@ -36,12 +36,9 @@ args = [
     '--runtime-tmpdir=.',
     '--distpath=.',
     '--add-data=./info.json:.',
-    '--add-data=dmart_migrations:dmart_migrations',
-    '--add-data=alembic.ini:.',
     '--noconfirm',
     '--collect-submodules=concurrent_log_handler',
     '--collect-submodules=pythonjsonlogger',
-    '--collect-all=alembic',
     '--clean',
 ]
 

{dmart-1.4.17.dist-info → dmart-1.4.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dmart
-Version: 1.4.17
+Version: 1.4.33
 Requires-Python: >=3.11
 Requires-Dist: fastapi
 Requires-Dist: pydantic
@@ -18,9 +18,9 @@ Requires-Dist: asgi-correlation-id
 Requires-Dist: pydantic-settings
 Requires-Dist: fastapi-sso
 Requires-Dist: sqlmodel
-Requires-Dist: alembic
 Requires-Dist: psycopg[binary]
 Requires-Dist: greenlet
+Requires-Dist: alembic
 Requires-Dist: jinja2
 Requires-Dist: pytest-cov
 Requires-Dist: argon2-cffi
@@ -34,7 +34,6 @@ Requires-Dist: jinja2; extra == "extra"
 Requires-Dist: duckdb; extra == "extra"
 Requires-Dist: segno; extra == "extra"
 Requires-Dist: jq; extra == "extra"
-Requires-Dist: alembic; extra == "extra"
 Provides-Extra: plugins
 Requires-Dist: weasyprint; extra == "plugins"
 Requires-Dist: pypdf; extra == "plugins"
@@ -52,7 +51,6 @@ Requires-Dist: jinja2; extra == "all"
 Requires-Dist: duckdb; extra == "all"
 Requires-Dist: segno; extra == "all"
 Requires-Dist: jq; extra == "all"
-Requires-Dist: alembic; extra == "all"
 Requires-Dist: weasyprint; extra == "all"
 Requires-Dist: pypdf; extra == "all"
 Requires-Dist: dicttoxml; extra == "all"

{dmart-1.4.17.dist-info → dmart-1.4.33.dist-info}/RECORD

@@ -1,9 +1,7 @@
-alembic.ini,sha256=zs8d8VhH9TRwZrPK697EZPBCfaKvI4SqTuGuG0FAm2Y,3747
-bundler.py,sha256=MDTUTVS0WL7gb-i1rDcS4i37KTqaW88TluL4L3rwjRw,1817
+bundler.py,sha256=so8ZJResb1PcOH5vboa_mpFAdYr_T8u8DbbFXd570Lg,1704
 data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart.py,sha256=M6ALx41TSjzpcEczkx39aA9qdmWZk_CS2jRpU61-aEY,23288
+dmart.py,sha256=AkhHkJt-q-rhWfXPd4aHdxc-QHm0MfaVGdJAVHjFDWg,21886
 get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
-info.json,sha256=hXQWl19lfMkEj_zXdehGeKjiKGNJ7emY4S7d4pIqJ1E,123
 main.py,sha256=KZGhIL6AnEm5ZAPy4IvhBDpzSTjuodilV7NafNOyhzM,19676
 migrate.py,sha256=hn1MZoVby_Jjqhc7y3CrLcGD619QmVZv3PONNvO7VKQ,665
 password_gen.py,sha256=xjx8wi105ZYvhLBBQj7_rugACpxifGXHse6f7YlGXWQ,196
@@ -14,6 +12,29 @@ schema_modulate.py,sha256=vB7NxvqghqNpFe__p0ll03WsvNftzxBbQ6UXB2UfxNU,6454
 set_admin_passwd.py,sha256=Ei8wnoJ_UDHIXmMb-E_dd_NqyM6Gt5AgJPJ4fAxARXI,1950
 sync.py,sha256=FlmubtlnFaxtZkbRV1-eyS_Sx5KBRvWyIZjvd0Tiar4,7339
 websocket.py,sha256=Q8WUTvOTBHKP5xy5wim8yn0t-BfjrPwx7J_6vbzAm1A,7576
+alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+alembic/env.py,sha256=z12UKhorKSOKEovOCQOwRjfR_tup4VeRlhcB1UPk3Xw,2700
+alembic/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+alembic/scripts/calculate_checksums.py,sha256=v2NLEvReA9V3noJE-BWANgKDdhc8Mqg1ZmJJ8nc8sGI,3443
+alembic/scripts/migration_f7a4949eed19.py,sha256=oUXuxjU4MbVafm4S-xu5J_4apHqW6hQZ8ftpJtCtM28,1462
+alembic/versions/0f3d2b1a7c21_add_authz_materialized_views.py,sha256=70vrPfhMHVHhw1l7KNQpvCUU76XZfvGcPlrXOeU4FHU,2599
+alembic/versions/10d2041b94d4_last_checksum_history.py,sha256=FYjyzE5Xi6bn9LUtxLKFnQOKhg4GZOrTkpqtmlCnY6Y,2860
+alembic/versions/1cf4e1ee3cb8_ext_permission_with_filter_fields_values.py,sha256=taaFTkTaFfLfj7QUUfIdcojvbOdjut_dWtrIvQUN7-4,921
+alembic/versions/26bfe19b49d4_rm_failedloginattempts.py,sha256=-Roftn8OSUz7kfR3yMI02rulyvnH46W0WpJfDQ5xAdk,1471
+alembic/versions/3c8bca2219cc_add_otp_table.py,sha256=f-YSxx1iLA0iHWukq1VnngFmiiYQyEzowicox0-wtbY,1125
+alembic/versions/6675fd9dfe42_remove_unique_from_sessions_table.py,sha256=yP40IHwtzFAAUid_VeeCkt_9F2RszMYBjNKx2mDTKNw,1037
+alembic/versions/71bc1df82e6a_adding_user_last_login_at.py,sha256=LINO2hWUEFmsTspupd8AxgUS6tNJFNgGC5do1QPMQ1E,1486
+alembic/versions/74288ccbd3b5_initial.py,sha256=hZ1w5mqVKSO13J1O4zcTccDJBk2c-cmIB0AUx1KLlLI,13988
+alembic/versions/7520a89a8467_rm_activesession_table.py,sha256=4VYv9tCXkTQNaXPVvjdsKTiw093KkBBUHNSiWdZtqtA,1305
+alembic/versions/848b623755a4_make_created_nd_updated_at_required.py,sha256=o106xd-apT8ZAXdVCjX76o7VuqRQNkIl0V4f41m5j2E,5375
+alembic/versions/8640dcbebf85_add_notes_to_users.py,sha256=XjfW2Lc0-xoRGB2qfdzDstw7Caaev6JhqRNYV_sIqgc,813
+alembic/versions/91c94250232a_adding_fk_on_owner_shortname.py,sha256=F9FDF2qyeqvOx1gkYq5HQMkVCH1QrXciYSHVxijsSSU,4024
+alembic/versions/98ecd6f56f9a_ext_meta_with_owner_group_shortname.py,sha256=S466VE3jsxXDEpTKyhIN06uutM0jI7zYHTWIYvU_pJw,2579
+alembic/versions/9aae9138c4ef_indexing_created_at_updated_at.py,sha256=xrqfJB5cER0PYi1torwkgsbBBjDeeM6dyj4pu-quphk,3662
+alembic/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+alembic/versions/b53f916b3f6d_json_to_jsonb.py,sha256=LPnevQjbjs0KrwqxYHtGUC6mSBBsUpiCBnwD-FN2x50,24840
+alembic/versions/eb5f1ec65156_adding_user_locked_to_device.py,sha256=Z9skCus52jg_xV5a7JVYK3IenNlvsdMKIFf1H5POst0,1030
+alembic/versions/f7a4949eed19_adding_query_policies_to_meta.py,sha256=LA4rx3u0Ei5m4OcSsVYHBsGMeKOJdx8G88yK1kBLFys,2307
 api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api/info/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api/info/router.py,sha256=sQZZor7A-uDzsJX39aqEA7bMZOJ-WTitYeFvVNWfaHw,3938
@@ -35,7 +56,6 @@ config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 config/channels.json,sha256=GepystGi0h_1fuakC_gdIc-YYxyy-a4TI619ygIpyyM,156
 config/notification.json,sha256=esrOaMUIqfcCHB0Tawp3t4cu7DQAA15X12OS-Gyenb0,361
 cxb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cxb/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cxb/client/config.json,sha256=WvhCcnJ9-uQ2raPuRBRSGO3iD7Hcaf8Cy49EXUu3KQw,358
 cxb/client/config.sample.json,sha256=fTYLbnTiUdbT_F7rcwI7CLSZ_KoX8EflfuyswRGW2x0,355
 cxb/client/favicon.ico,sha256=CD2FYyYYFNAbH7lGPnM5-2asMmhf-kwitAp99Kh0Wmc,4286
@@ -173,51 +193,6 @@ data_adapters/sql/db_to_json_migration.py,sha256=GTPO6-HblgD60qruhhVpWbKOke5xz9w
 data_adapters/sql/health_check_sql.py,sha256=2Z0mN5IMrjF72ZAiafBLkHklbXXWJzLp1K2TzjzPI1s,8569
 data_adapters/sql/json_to_db_migration.py,sha256=KaubDrRZ3MfPLc-CNGPpsEccPELKr1V4GoBEBt1BNZo,21131
 data_adapters/sql/update_query_policies.py,sha256=LUpkyzDAkiwwVWnXxPdVAU6atehW72ECAazj3mEYHK0,3857
-dmart_migrations/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
-dmart_migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dmart_migrations/env.py,sha256=P1gnJRIUrP2jLHZ7HDbfkzkpuZJ_LMWqw05HIqOUJHo,3110
-dmart_migrations/notes.txt,sha256=X7LYSNmulLRiAUXvw07Z85bSGRTnx4NUpoNC9D2DfO8,395
-dmart_migrations/script.py.mako,sha256=u-ABdYW1tcIILgJFJdQZYLxoAI8Awd6wZbx30rY6fxU,680
-dmart_migrations/__pycache__/__init__.cpython-314.pyc,sha256=BB6R74YhUmoPWg2dYz2gTIM0CE7sMcOt0dsgqEEPza4,174
-dmart_migrations/__pycache__/env.cpython-314.pyc,sha256=27dvi9nRTOIogSJ7ytGX2i1CbTEw4rwPaZV_OGS175g,4278
-dmart_migrations/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dmart_migrations/scripts/calculate_checksums.py,sha256=v2NLEvReA9V3noJE-BWANgKDdhc8Mqg1ZmJJ8nc8sGI,3443
-dmart_migrations/scripts/migration_f7a4949eed19.py,sha256=oUXuxjU4MbVafm4S-xu5J_4apHqW6hQZ8ftpJtCtM28,1462
-dmart_migrations/versions/0f3d2b1a7c21_add_authz_materialized_views.py,sha256=70vrPfhMHVHhw1l7KNQpvCUU76XZfvGcPlrXOeU4FHU,2599
-dmart_migrations/versions/10d2041b94d4_last_checksum_history.py,sha256=FYjyzE5Xi6bn9LUtxLKFnQOKhg4GZOrTkpqtmlCnY6Y,2860
-dmart_migrations/versions/1cf4e1ee3cb8_ext_permission_with_filter_fields_values.py,sha256=taaFTkTaFfLfj7QUUfIdcojvbOdjut_dWtrIvQUN7-4,921
-dmart_migrations/versions/26bfe19b49d4_rm_failedloginattempts.py,sha256=-Roftn8OSUz7kfR3yMI02rulyvnH46W0WpJfDQ5xAdk,1471
-dmart_migrations/versions/3c8bca2219cc_add_otp_table.py,sha256=f-YSxx1iLA0iHWukq1VnngFmiiYQyEzowicox0-wtbY,1125
-dmart_migrations/versions/6675fd9dfe42_remove_unique_from_sessions_table.py,sha256=yP40IHwtzFAAUid_VeeCkt_9F2RszMYBjNKx2mDTKNw,1037
-dmart_migrations/versions/71bc1df82e6a_adding_user_last_login_at.py,sha256=LINO2hWUEFmsTspupd8AxgUS6tNJFNgGC5do1QPMQ1E,1486
-dmart_migrations/versions/74288ccbd3b5_initial.py,sha256=hZ1w5mqVKSO13J1O4zcTccDJBk2c-cmIB0AUx1KLlLI,13988
-dmart_migrations/versions/7520a89a8467_rm_activesession_table.py,sha256=4VYv9tCXkTQNaXPVvjdsKTiw093KkBBUHNSiWdZtqtA,1305
-dmart_migrations/versions/848b623755a4_make_created_nd_updated_at_required.py,sha256=o106xd-apT8ZAXdVCjX76o7VuqRQNkIl0V4f41m5j2E,5375
-dmart_migrations/versions/8640dcbebf85_add_notes_to_users.py,sha256=XjfW2Lc0-xoRGB2qfdzDstw7Caaev6JhqRNYV_sIqgc,813
-dmart_migrations/versions/91c94250232a_adding_fk_on_owner_shortname.py,sha256=F9FDF2qyeqvOx1gkYq5HQMkVCH1QrXciYSHVxijsSSU,4024
-dmart_migrations/versions/98ecd6f56f9a_ext_meta_with_owner_group_shortname.py,sha256=S466VE3jsxXDEpTKyhIN06uutM0jI7zYHTWIYvU_pJw,2579
-dmart_migrations/versions/9aae9138c4ef_indexing_created_at_updated_at.py,sha256=xrqfJB5cER0PYi1torwkgsbBBjDeeM6dyj4pu-quphk,3662
-dmart_migrations/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dmart_migrations/versions/b53f916b3f6d_json_to_jsonb.py,sha256=LPnevQjbjs0KrwqxYHtGUC6mSBBsUpiCBnwD-FN2x50,24840
-dmart_migrations/versions/eb5f1ec65156_adding_user_locked_to_device.py,sha256=Z9skCus52jg_xV5a7JVYK3IenNlvsdMKIFf1H5POst0,1030
-dmart_migrations/versions/f7a4949eed19_adding_query_policies_to_meta.py,sha256=LA4rx3u0Ei5m4OcSsVYHBsGMeKOJdx8G88yK1kBLFys,2307
-dmart_migrations/versions/__pycache__/0f3d2b1a7c21_add_authz_materialized_views.cpython-314.pyc,sha256=mevU12_Y6RzGxc8Xg1bkFIVaNu7uvx7zCQ2j6bn_Pqo,3955
-dmart_migrations/versions/__pycache__/10d2041b94d4_last_checksum_history.cpython-314.pyc,sha256=n3eMeDeLN8WXXzoKA-8b4t9k-WQF4FPVYIRReNm-uN4,6199
-dmart_migrations/versions/__pycache__/1cf4e1ee3cb8_ext_permission_with_filter_fields_values.cpython-314.pyc,sha256=_8yowo72FtcMsYQOp2vpy_hWJ5QlDOPsDsEt6NOr9cY,2649
-dmart_migrations/versions/__pycache__/26bfe19b49d4_rm_failedloginattempts.cpython-314.pyc,sha256=1PYF87QiiSXEmHUM6wnq9Ck_ktq981W3TgS-_7QqG4M,3309
-dmart_migrations/versions/__pycache__/3c8bca2219cc_add_otp_table.cpython-314.pyc,sha256=HD6h3iYtGyhDcOjRK4xWa9Hl6YzdIszmyO95wPZvFOM,2710
-dmart_migrations/versions/__pycache__/6675fd9dfe42_remove_unique_from_sessions_table.cpython-314.pyc,sha256=k71q5tLr6x2cDoHw4pDNeBem136qz2XFjUg11a6DDpM,2422
-dmart_migrations/versions/__pycache__/71bc1df82e6a_adding_user_last_login_at.cpython-314.pyc,sha256=35cwhVRGhtvREO4j3pBDtGoSD8sZd0MdZ0SRZKLsK5s,3399
-dmart_migrations/versions/__pycache__/74288ccbd3b5_initial.cpython-314.pyc,sha256=BDS6zx-enw-oWeAIju5plp4lB10q8BeFwBnaUDEgtKY,28589
-dmart_migrations/versions/__pycache__/7520a89a8467_rm_activesession_table.cpython-314.pyc,sha256=x5m_sxYMDP6myKKlVTivP-VM-2EH6d0D21pv9URFyXU,2791
-dmart_migrations/versions/__pycache__/848b623755a4_make_created_nd_updated_at_required.cpython-314.pyc,sha256=A4E0A4eJliMs-uNeVZfGo2j8UrXhdRrtBB1Ky-OA_O0,7917
-dmart_migrations/versions/__pycache__/8640dcbebf85_add_notes_to_users.cpython-314.pyc,sha256=94zNRuU2L3ra43Z3eDa4duVMXMsKTLiNUUj7lUxeZzY,2526
-dmart_migrations/versions/__pycache__/91c94250232a_adding_fk_on_owner_shortname.cpython-314.pyc,sha256=IIEupLleN5nEUUpTCXWGV-LXsdzGJrcnrolJmpi8WMo,6383
-dmart_migrations/versions/__pycache__/98ecd6f56f9a_ext_meta_with_owner_group_shortname.cpython-314.pyc,sha256=tPXDQ_TCEK9sv3ZinAk9vUJcwuqE75ymoT_0O_0qLss,5657
-dmart_migrations/versions/__pycache__/9aae9138c4ef_indexing_created_at_updated_at.cpython-314.pyc,sha256=D3m2fuhNbUUNZi21p45UDy8uUmAOio1RZzqoPnKD6G4,6990
-dmart_migrations/versions/__pycache__/b53f916b3f6d_json_to_jsonb.cpython-314.pyc,sha256=eBvU5VFctw1AqklCtprJJhvGXZVYpvxBcuZiI6bOBGY,34035
-dmart_migrations/versions/__pycache__/eb5f1ec65156_adding_user_locked_to_device.cpython-314.pyc,sha256=v47hBAxgbjkSAsEn8O2EUTUOPR0D9bVD8fJl9erlpzM,2514
-dmart_migrations/versions/__pycache__/f7a4949eed19_adding_query_policies_to_meta.cpython-314.pyc,sha256=jCW56_bq_qQM6H9CjPu2qOm8gywSO7TEHHywlyv1qcI,5099
 languages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 languages/arabic.json,sha256=UL61rP9_M42CGfU94G5-1bXVUVnsJWXzoqhaXTXTJuM,910
 languages/english.json,sha256=Y7eZ2X8c427_97qYrHOeGb2d725T-YlNNFVSi8FB7Kw,649
@@ -282,8 +257,8 @@ utils/ticket_sys_utils.py,sha256=9QAlW2iiy8KyxQRBDj_WmzS5kKb0aYJmGwd4qzmGVqo,700
 utils/web_notifier.py,sha256=QM87VVid2grC5lK3NdS1yzz0z1wXljr4GChJOeK86W4,843
 utils/templates/activation.html.j2,sha256=XAMKCdoqONoc4ZQucD0yV-Pg5DlHHASZrTVItNS-iBE,640
 utils/templates/reminder.html.j2,sha256=aoS8bTs56q4hjAZKsb0jV9c-PIURBELuBOpT_qPZNVU,639
-dmart-1.4.17.dist-info/METADATA,sha256=R7ts20I20WAd4vrVMBtjl3GztMJKwmUrQCDWSrbqJ7s,2149
-dmart-1.4.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-1.4.17.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
-dmart-1.4.17.dist-info/top_level.txt,sha256=XELQhaIfj-qupnyBrir39qFRh8ncu1RXkCHeitzqLLg,275
-dmart-1.4.17.dist-info/RECORD,,
+dmart-1.4.33.dist-info/METADATA,sha256=SuyC2Wb2GdoDWEWznnL6exUz6xlXN7vc9jUYXLe0ndo,2069
+dmart-1.4.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.33.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.33.dist-info/top_level.txt,sha256=iPbBisVNr4KDWyZhxMl2x3oJSgf71knWXMh21_xutrE,266
+dmart-1.4.33.dist-info/RECORD,,

{dmart-1.4.17.dist-info → dmart-1.4.33.dist-info}/top_level.txt

@@ -1,3 +1,4 @@
+alembic
 api
 bundler
 config
@@ -5,7 +6,6 @@ cxb
 data_adapters
 data_generator
 dmart
-dmart_migrations
 get_settings
 languages
 main

dmart.py

@@ -18,13 +18,6 @@ from pathlib import Path
 from hypercorn.config import Config
 from hypercorn.run import run
 
-try:
-    from alembic import command as alembic_command
-    from alembic.config import Config as AlembicConfig
-    HAS_ALEMBIC = True
-except ImportError:
-    HAS_ALEMBIC = False
-
 from data_adapters.file.archive import archive
 from data_adapters.file.create_index import main as create_index
 from data_adapters.file.health_check import main as health_check
@@ -263,13 +256,11 @@ def hypercorn_main() -> int:
         type=int,
     )
     args = parser.parse_args(sys.argv[1:])
-    
-    # Set defaults if config file is not found
+
     config = Config()
     if args.config and os.path.exists(args.config):
         config = Config.from_toml(args.config)
     else:
-        # Default Hypercorn configuration
         config.backlog = 2000
         config.workers = 1
         config.bind = ["localhost:8282"]
@@ -377,7 +368,7 @@ def hypercorn_main() -> int:
                 print(e)
                 pass
         
-        url = f"http://{host}:{port}/cxb/"
+        url = f"http://{host}:{port}{settings.cxb_url}/"
         
         def open_browser():
             time.sleep(2)
@@ -390,27 +381,27 @@ def hypercorn_main() -> int:
 
 
 def main():
-    sys.argv = sys.argv[1:]
-    if len(sys.argv) == 0:
+    args = sys.argv[1:]
+    if len(args) == 0:
         print("You must provide a command to run:")
         print(commands)
         sys.exit(1)
 
-    match sys.argv[0]:
+    match args[0]:
         case "hyper":
             hypercorn_main()
         case "server" | "serve":
             open_cxb = False
-            if "--open-cxb" in sys.argv:
+            if "--open-cxb" in args:
                 open_cxb = True
-                sys.argv.remove("--open-cxb")
+                args.remove("--open-cxb")
             
-            if "--cxb-config" in sys.argv:
-                idx = sys.argv.index("--cxb-config")
-                if idx + 1 < len(sys.argv):
-                    os.environ["DMART_CXB_CONFIG"] = sys.argv[idx + 1]
-                    sys.argv.pop(idx + 1)
-                sys.argv.pop(idx)
+            if "--cxb-config" in args:
+                idx = args.index("--cxb-config")
+                if idx + 1 < len(args):
+                    os.environ["DMART_CXB_CONFIG"] = args[idx + 1]
+                    args.pop(idx + 1)
+                args.pop(idx)
                 
             if open_cxb:
                 url = f"http://{settings.listening_host}:{settings.listening_port}/cxb/"
@@ -421,6 +412,7 @@ def main():
                 import threading
                 threading.Thread(target=open_browser, daemon=True).start()
 
+            sys.argv = [sys.argv[0]] + args
             asyncio.run(server())
         case "health-check":
             parser = argparse.ArgumentParser(
@@ -431,9 +423,9 @@ def main():
             parser.add_argument("-s", "--space", help="hit the target space or pass (all) to make the full health check")
             parser.add_argument("-m", "--schemas", nargs="*", help="hit the target schema inside the space")
 
-            args = parser.parse_args()
+            args_parsed = parser.parse_args(args[1:])
             before_time = time.time()
-            asyncio.run(health_check(args.type, args.space, args.schemas))
+            asyncio.run(health_check(args_parsed.type, args_parsed.space, args_parsed.schemas))
             print(f'total time: {"{:.2f}".format(time.time() - before_time)} sec')
         case "create-index":
             parser = argparse.ArgumentParser(
@@ -451,9 +443,9 @@ def main():
                 "--flushall", action='store_true', help="FLUSHALL data on Redis"
             )
 
-            args = parser.parse_args()
+            args_parsed = parser.parse_args(args[1:])
 
-            asyncio.run(create_index(args.space, args.schemas, args.subpaths, args.flushall))
+            asyncio.run(create_index(args_parsed.space, args_parsed.schemas, args_parsed.subpaths, args_parsed.flushall))
         case "export":
             parser = argparse.ArgumentParser()
             parser.add_argument(
@@ -470,24 +462,24 @@ def main():
                 "--since",
                 help="Export entries created/updated since the provided timestamp",
             )
-            args = parser.parse_args()
+            args_parsed = parser.parse_args(args[1:])
             since = None
             output_path = ""
-            if args.output:
-                output_path = args.output
+            if args_parsed.output:
+                output_path = args_parsed.output
 
-            if args.since:
-                since = int(round(float(args.since) * 1000))
+            if args_parsed.since:
+                since = int(round(float(args_parsed.since) * 1000))
 
-            if not os.path.isdir(args.spaces):
-                exit_with_error(f"The spaces folder {args.spaces} is not found.")
+            if not os.path.isdir(args_parsed.spaces):
+                exit_with_error(f"The spaces folder {args_parsed.spaces} is not found.")
 
             out_path = os.path.join(output_path, OUTPUT_FOLDER_NAME)
             if os.path.isdir(out_path):
                 shutil.rmtree(out_path)
 
             tasks = []
-            with open(args.config, "r") as f:
+            with open(args_parsed.config, "r") as f:
                 config_objs = json.load(f)
 
             for config_obj in config_objs:
@@ -499,7 +491,7 @@ def main():
                                      config_obj.get("schema_shortname", ""),
                                      config_obj.get("included_meta_fields", {}),
                                      config_obj.get("excluded_payload_fields", {}),
-                                     args.spaces, output_path, since))
+                                     args_parsed.spaces, output_path, since))
 
             asyncio.run(exporter(tasks))
 
@@ -528,11 +520,11 @@ def main():
                 help="The number of day, older than which, the entries will be archived (based on updated_at)",
             )
 
-            args = parser.parse_args()
-            space = args.space
-            subpath = args.subpath
-            olderthan = args.olderthan
-            schema = args.schema or "meta"
+            args_parsed = parser.parse_args(args[1:])
+            space = args_parsed.space
+            subpath = args_parsed.subpath
+            olderthan = args_parsed.olderthan
+            schema = args_parsed.schema or "meta"
 
             asyncio.run(archive(space, subpath, schema, olderthan))
             print("Done.")
@@ -540,38 +532,6 @@ def main():
             asyncio.run(json_to_db_migration())
         case "db_to_json":
             db_to_json_migration()
-        case "migrate":
-            pkg_dir = Path(__file__).resolve().parent
-            
-            # Try to find migrations directory
-            alembic_dir = pkg_dir / "dmart_migrations"
-            if not alembic_dir.exists():
-                # Fallback to alembic for backward compatibility
-                alembic_dir = pkg_dir / "alembic"
-            
-            original_ini_path = pkg_dir / "alembic.ini"
-            if not original_ini_path.exists():
-                original_ini_path = alembic_dir / "alembic.ini"
-            
-            if not original_ini_path.exists():
-                print(f"Error: 'alembic.ini' not found in {pkg_dir} or {alembic_dir}")
-                sys.exit(1)
-
-            try:
-                # Check if alembic library is installed
-                if not HAS_ALEMBIC:
-                    print("Error: 'alembic' library not found. Please install it with 'pip install alembic'.")
-                    sys.exit(1)
-
-                alembic_cfg = AlembicConfig(str(original_ini_path))
-                alembic_cfg.set_main_option("script_location", alembic_dir.as_posix())
-
-                # Run alembic upgrade head
-                alembic_command.upgrade(alembic_cfg, "head")
-
-            except Exception as e:
-                print(f"Error running migration: {e}")
-                sys.exit(1)
         case "help":
             print("Available commands:")
             print(commands)

alembic.ini

@@ -1,117 +0,0 @@
-# A generic, single database configuration.
-
-[alembic]
-# path to migration scripts
-# Use forward slashes (/) also on windows to provide an os agnostic path
-script_location = dmart_migrations
-
-# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
-# Uncomment the line below if you want the files to be prepended with date and time
-# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
-# for all available tokens
-# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
-
-# sys.path path, will be prepended to sys.path if present.
-# defaults to the current working directory.
-prepend_sys_path = .
-
-# timezone to use when rendering the date within the migration file
-# as well as the filename.
-# If specified, requires the python>=3.9 or backports.zoneinfo library.
-# Any required deps can installed by adding `alembic[tz]` to the pip requirements
-# string value is passed to ZoneInfo()
-# leave blank for localtime
-# timezone =
-
-# max length of characters to apply to the "slug" field
-# truncate_slug_length = 40
-
-# set to 'true' to run the environment during
-# the 'revision' command, regardless of autogenerate
-# revision_environment = false
-
-# set to 'true' to allow .pyc and .pyo files without
-# a source .py file to be detected as revisions in the
-# versions/ directory
-# sourceless = false
-
-# version location specification; This defaults
-# to alembic/versions.  When using multiple version
-# directories, initial revisions must be specified with --version-path.
-# The path separator used here should be the separator specified by "version_path_separator" below.
-# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
-
-# version path separator; As mentioned above, this is the character used to split
-# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
-# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
-# Valid values for version_path_separator are:
-#
-# version_path_separator = :
-# version_path_separator = ;
-# version_path_separator = space
-# version_path_separator = newline
-version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
-
-# set to 'true' to search source files recursively
-# in each "version_locations" directory
-# new in Alembic version 1.10
-# recursive_version_locations = false
-
-# the output encoding used when revision files
-# are written from script.py.mako
-# output_encoding = utf-8
-
-sqlalchemy.url = postgresql+asyncpg://dmart:somepassword@localhost:5432/dmart
-
-
-[post_write_hooks]
-# post_write_hooks defines scripts or Python functions that are run
-# on newly generated revision scripts.  See the documentation for further
-# detail and examples
-
-# format using "black" - use the console_scripts runner, against the "black" entrypoint
-# hooks = black
-# black.type = console_scripts
-# black.entrypoint = black
-# black.options = -l 79 REVISION_SCRIPT_FILENAME
-
-# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
-# hooks = ruff
-# ruff.type = exec
-# ruff.executable = %(here)s/.venv/bin/ruff
-# ruff.options = --fix REVISION_SCRIPT_FILENAME
-
-# Logging configuration
-[loggers]
-keys = root,sqlalchemy,alembic
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = WARNING
-handlers = console
-qualname =
-
-[logger_sqlalchemy]
-level = WARNING
-handlers =
-qualname = sqlalchemy.engine
-
-[logger_alembic]
-level = INFO
-handlers =
-qualname = alembic
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S

dmart_migrations/README

@@ -1 +0,0 @@
-Generic single-database configuration.

dmart_migrations/notes.txt

@@ -1,11 +0,0 @@
-# 1st : Make sure in alembic.ini to have proper db config for sqlalchemy.url
-
-
-# To establish the base for a previously created database run the following
-
-CREATE TABLE alembic_version (
-    version_num VARCHAR(32) NOT NULL,
-    CONSTRAINT alembic_version_pkc PRIMARY KEY (version_num)
-);
-
-INSERT INTO alembic_version (version_num) VALUES ('74288ccbd3b5') RETURNING alembic_version.version_num;

dmart_migrations/script.py.mako

@@ -1,28 +0,0 @@
-"""${message}
-
-Revision ID: ${up_revision}
-Revises: ${down_revision | comma,n}
-Create Date: ${create_date}
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-import sqlmodel
-import sqlmodel.sql.sqltypes
-${imports if imports else ""}
-
-# revision identifiers, used by Alembic.
-revision: str = ${repr(up_revision)}
-down_revision: Union[str, None] = ${repr(down_revision)}
-branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
-depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
-
-
-def upgrade() -> None:
-    ${upgrades if upgrades else "pass"}
-
-
-def downgrade() -> None:
-    ${downgrades if downgrades else "pass"}

info.json

@@ -1 +0,0 @@
-{"branch": "pypi", "version": "2e6304dd", "tag": "v1.4.0-72-g2e6304dd", "version_date": "'Mon Jan 19 08:55:04 2026 +0000'"}