data-syncmaster 0.1.1__tar.gz → 0.1.2__tar.gz

{data_syncmaster-0.1.1 → data_syncmaster-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: data-syncmaster
-Version: 0.1.1
+Version: 0.1.2
 Summary: Syncmaster REST API + Worker
 License: Apache-2.0
 Keywords: Syncmaster,REST,API,Worker,Replication
@@ -66,9 +66,9 @@ SyncMaster
     :target: https://badge.fury.io/py/data-syncmaster
 .. |Docker image| image:: https://img.shields.io/docker/v/mtsrus/syncmaster-backend?sort=semver&label=docker
     :target: https://hub.docker.com/r/mtsrus/syncmaster-backend
-.. |Documentation| image:: https://readthedocs.org/projects/data-syncmaster/badge/?version=stable
+.. |Documentation| image:: https://readthedocs.org/projects/syncmaster/badge/?version=stable
     :target: https://syncmaster.readthedocs.io
-.. |Build Status| image:: https://github.com/MobileTeleSystems/syncmaster/workflows/Tests/badge.svg
+.. |Build Status| image:: https://github.com/MobileTeleSystems/syncmaster/workflows/Run%20All%20Tests/badge.svg
     :target: https://github.com/MobileTeleSystems/syncmaster/actions
 .. |Coverage| image:: https://codecov.io/gh/MobileTeleSystems/syncmaster/graph/badge.svg?token=ky7UyUxolB
     :target: https://codecov.io/gh/MobileTeleSystems/syncmaster

{data_syncmaster-0.1.1 → data_syncmaster-0.1.2}/README.rst

@@ -17,9 +17,9 @@ SyncMaster
     :target: https://badge.fury.io/py/data-syncmaster
 .. |Docker image| image:: https://img.shields.io/docker/v/mtsrus/syncmaster-backend?sort=semver&label=docker
     :target: https://hub.docker.com/r/mtsrus/syncmaster-backend
-.. |Documentation| image:: https://readthedocs.org/projects/data-syncmaster/badge/?version=stable
+.. |Documentation| image:: https://readthedocs.org/projects/syncmaster/badge/?version=stable
     :target: https://syncmaster.readthedocs.io
-.. |Build Status| image:: https://github.com/MobileTeleSystems/syncmaster/workflows/Tests/badge.svg
+.. |Build Status| image:: https://github.com/MobileTeleSystems/syncmaster/workflows/Run%20All%20Tests/badge.svg
     :target: https://github.com/MobileTeleSystems/syncmaster/actions
 .. |Coverage| image:: https://codecov.io/gh/MobileTeleSystems/syncmaster/graph/badge.svg?token=ky7UyUxolB
     :target: https://codecov.io/gh/MobileTeleSystems/syncmaster

{data_syncmaster-0.1.1 → data_syncmaster-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "data-syncmaster"
-version = "0.1.1"
+version = "0.1.2"
 license = "Apache-2.0"
 description = "Syncmaster REST API + Worker"
 authors = ["DataOps.ETL <onetools@mts.ru>"]
@@ -197,6 +197,8 @@ exclude_lines = [
   "def downgrade\\(\\)",
 ]
 
+
+
 [tool.poetry.group.docs.dependencies]
 autodoc-pydantic = {version = "^2.0.1", python = ">=3.8"}
 numpydoc = {version = "^1.6.0", python = ">=3.8"}

{data_syncmaster-0.1.1 → data_syncmaster-0.1.2}/syncmaster/__init__.py

@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems)
 # SPDX-License-Identifier: Apache-2.0
 
-_raw_version = "0.1.1"
+_raw_version = "0.1.2"
 # version always contain only release number like 0.0.1
 __version__ = ".".join(_raw_version.split(".")[:3])  # noqa: WPS410

data_syncmaster-0.1.1/syncmaster/backend/main.py → data_syncmaster-0.1.2/syncmaster/backend/__init__.py

@@ -1,6 +1,5 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems)
 # SPDX-License-Identifier: Apache-2.0
-import uvicorn
 from fastapi import FastAPI, HTTPException
 from starlette.middleware.cors import CORSMiddleware
 
@@ -22,7 +21,7 @@ from syncmaster.db.factory import create_engine, create_session_factory, get_uow
 from syncmaster.exceptions import SyncmasterError
 
 
-def get_application(settings: Settings) -> FastAPI:
+def application_factory(settings: Settings) -> FastAPI:
     application = FastAPI(
         title=settings.PROJECT_NAME,
         debug=settings.DEBUG,
@@ -55,9 +54,3 @@ def get_application(settings: Settings) -> FastAPI:
     )
 
     return application
-
-
-if __name__ == "__main__":
-    settings = Settings()
-    app = get_application(settings=settings)
-    uvicorn.run(app, host="0.0.0.0", port=8000)

data_syncmaster-0.1.2/syncmaster/backend/__main__.py

@@ -0,0 +1,35 @@
+#!/bin/env python3
+# SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems)
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+import os
+import sys
+from pathlib import Path
+
+import uvicorn
+
+here = Path(__file__).resolve()
+
+
+def main(prog_name: str | None = None, args: list[str] | None = None):
+    """Run uvicorn and pass the command line arguments to it."""
+    if args is None:
+        args = sys.argv.copy()
+        prog_name = args.pop(0)
+
+    if not prog_name:
+        prog_name = os.fspath(here)
+
+    args = args.copy()
+    # prepend config path before command line arguments
+    args.insert(0, "--factory")
+    args.insert(1, "syncmaster.backend:get_application")
+
+    # call uvicorn
+    uvicorn.main.main(args=args, prog_name=prog_name)
+
+
+if __name__ == "__main__":
+    main()

{data_syncmaster-0.1.1 → data_syncmaster-0.1.2}/syncmaster/backend/export_openapi_schema.py

@@ -7,7 +7,7 @@ import sys
 
 from fastapi import FastAPI
 
-from syncmaster.backend.main import get_application
+from syncmaster.backend import application_factory
 from syncmaster.config import Settings
 
 
@@ -17,7 +17,7 @@ def get_openapi_schema(app: FastAPI) -> dict:
 
 if __name__ == "__main__":
     settings = Settings()
-    app = get_application(settings)
+    app = application_factory(settings)
     schema = get_openapi_schema(app)
     file_path = sys.argv[1]
     if not file_path:

data_syncmaster-0.1.2/syncmaster/db/migrations/__main__.py

@@ -0,0 +1,38 @@
+#!/bin/env python3
+
+# SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems)
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+import os
+import sys
+from pathlib import Path
+
+from alembic.config import CommandLine
+
+here = Path(__file__).resolve()
+config_path = here.parent / "alembic.ini"
+
+
+def main(prog_name: str | None = None, args: list[str] | None = None):
+    """Run alembic and pass the command line arguments to it."""
+    if args is None:
+        args = sys.argv.copy()
+        prog_name = args.pop(0)
+
+    if not prog_name:
+        prog_name = os.fspath(here)
+
+    # prepend config path before command line arguments
+    args = args.copy()
+    args.insert(0, "-c")
+    args.insert(1, os.fspath(config_path))
+
+    # call alembic
+    cmd = CommandLine(prog=prog_name)
+    cmd.main(argv=args)
+
+
+if __name__ == "__main__":
+    main()

{data_syncmaster-0.1.1/syncmaster/db → data_syncmaster-0.1.2/syncmaster/db/migrations}/alembic.ini

@@ -1,7 +1,7 @@
 [alembic]
-script_location = %(here)s/migrations
+script_location = %(here)s
 file_template = %%(year)d-%%(month).2d-%%(day).2d_%%(rev)s_%%(slug)s
-prepend_sys_path = .
+prepend_sys_path = %(here)s/../../../
 version_path_separator = os
 
 [post_write_hooks]

{data_syncmaster-0.1.1 → data_syncmaster-0.1.2}/syncmaster/db/migrations/env.py

@@ -18,7 +18,9 @@ config = context.config
 if config.config_file_name is not None:
     fileConfig(config.config_file_name)
 
-config.set_main_option("sqlalchemy.url", Settings().build_db_connection_uri())
+if not config.get_main_option("sqlalchemy.url"):
+    # read application settings only if sqlalchemy.url is not being passed via cli arguments
+    config.set_main_option("sqlalchemy.url", Settings().build_db_connection_uri())
 
 target_metadata = (
     Base.metadata,

data_syncmaster-0.1.1/syncmaster/backend/logger.py

@@ -1,2 +0,0 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems)
-# SPDX-License-Identifier: Apache-2.0

data_syncmaster-0.1.1/syncmaster/backend/pre_start.py

@@ -1,94 +0,0 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems)
-# SPDX-License-Identifier: Apache-2.0
-import logging
-from time import sleep
-
-from syncmaster.config import Settings, TestSettings
-from tests.test_integration.test_run_transfer.conftest import get_spark_session
-
-TIMEOUT = 5
-COUNT = 12
-
-logger = logging.getLogger(__name__)
-
-
-def check_test_postgres(settings: Settings, test_settings: TestSettings) -> None:
-    from onetl.connection import Postgres
-
-    spark_session = get_spark_session(settings)
-
-    count = COUNT
-    connection = Postgres(
-        host=test_settings.TEST_POSTGRES_HOST,
-        port=test_settings.TEST_POSTGRES_PORT,
-        user=test_settings.TEST_POSTGRES_USER,
-        password=test_settings.TEST_POSTGRES_PASSWORD,
-        database=test_settings.TEST_POSTGRES_DB,
-        spark=spark_session,
-    )
-    exception = None
-    while count > 0:
-        try:
-            connection.check()
-            return
-        except Exception:
-            count -= 1
-            logger.info("Got exception on postgres. Will try after %d sec", TIMEOUT)
-            sleep(TIMEOUT)
-    if exception:
-        raise exception
-
-
-def check_test_oracle(settings: Settings, test_settings: TestSettings) -> None:
-    from onetl.connection import Oracle
-
-    spark_session = get_spark_session(settings)
-
-    count = COUNT
-    connection = Oracle(
-        host=test_settings.TEST_ORACLE_HOST,
-        port=test_settings.TEST_ORACLE_PORT,
-        user=test_settings.TEST_ORACLE_USER,
-        password=test_settings.TEST_ORACLE_PASSWORD,
-        service_name=test_settings.TEST_ORACLE_SERVICE_NAME,
-        sid=test_settings.TEST_ORACLE_SID,
-        spark=spark_session,
-    )
-    exception = None
-    while count > 0:
-        try:
-            connection.check()
-            return
-        except Exception:
-            count -= 1
-            logger.info("Got exception on oracle. Will try after %d sec", TIMEOUT)
-            sleep(TIMEOUT)
-    if exception:
-        raise exception
-
-
-def check_test_hive(settings: Settings, test_settings: TestSettings) -> None:
-    from onetl.connection import Hive
-
-    spark_session = get_spark_session(settings)
-
-    count = COUNT
-    connection = Hive(
-        cluster=test_settings.TEST_HIVE_CLUSTER,
-        spark=spark_session,
-    )
-    exception = None
-    while count > 0:
-        try:
-            connection.check()
-            connection.execute("SHOW DATABASES")
-            return
-        except Exception:
-            count -= 1
-            logger.info("Got exception on hive. will try after %d sec", TIMEOUT)
-            sleep(TIMEOUT)
-    if exception:
-        raise exception
-
-
-settings = Settings()

data_syncmaster-0.1.1/syncmaster/worker/handlers/__init__.py

@@ -1,2 +0,0 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems)
-# SPDX-License-Identifier: Apache-2.0

data_syncmaster-0.1.1/syncmaster/worker/handlers/file/__init__.py

@@ -1,2 +0,0 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems)
-# SPDX-License-Identifier: Apache-2.0