Test (#707)

* Revert "Bump psycopg to 3.2.1 (#696)"

This reverts commit a561690

* Revert "Update helper for psycopg3 (#706)"

This reverts commit d4474f7.

* Revert "Change test url"

This reverts commit db59063.

* Revert "Fix Psycopg3 errors (#698)"

This reverts commit 72ad36e

Author: pboers1988

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.2
+current_version = 2.6.0
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(rc(?P<build>\d+))?

.github/workflows/run-unit-tests.yml

@@ -51,7 +51,7 @@ jobs:
         env:
           FLIT_ROOT_INSTALL: 1
       - name: Run Unit tests
-        run: CACHE_URI=redis://redis DATABASE_URI=postgresql+psycopg://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB  pytest --cov-branch --cov=orchestrator --cov-report=xml --ignore=test --ignore=orchestrator/devtools --ignore=examples --ignore=docs --ignore=orchestrator/vendor
+        run: CACHE_URI=redis://redis DATABASE_URI=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB  pytest --cov-branch --cov=orchestrator --cov-report=xml --ignore=test --ignore=orchestrator/devtools --ignore=examples --ignore=docs --ignore=orchestrator/vendor
         env:
           POSTGRES_DB: orchestrator-core-test
           POSTGRES_USER: nwa

orchestrator/__init__.py

@@ -13,7 +13,7 @@
 
 """This is the orchestrator workflow engine."""
 
-__version__ = "2.5.2"
+__version__ = "2.6.0"
 
 from orchestrator.app import OrchestratorCore
 from orchestrator.settings import app_settings

orchestrator/cli/generator/generator/migration.py

@@ -31,16 +31,13 @@
     sort_product_blocks_by_dependencies,
 )
 from orchestrator.cli.generator.generator.settings import product_generator_settings as settings
-from orchestrator.settings import convert_database_uri
 
 logger = structlog.getLogger(__name__)
 
 
 def create_migration_file(message: str, head: str) -> Path | None:
-    if environ.get("DATABASE_URI"):
-        environ.update({"DATABASE_URI": convert_database_uri(environ["DATABASE_URI"])})
-    else:
-        environ.update({"DATABASE_URI": "postgresql+psycopg://nwa:nwa@localhost/orchestrator-core"})
+    if not environ.get("DATABASE_URI"):
+        environ.update({"DATABASE_URI": "postgresql://nwa:nwa@localhost/orchestrator-core"})
     if not environ.get("PYTHONPATH"):
         environ.update({"PYTHONPATH": "."})
     logger.info(

orchestrator/migrations/helpers.py

@@ -450,7 +450,7 @@ def create_resource_types_for_product_blocks(conn: sa.engine.Connection, new: di
                 WITH resource_type_ids AS (
                     SELECT resource_types.resource_type_id
                     FROM   resource_types
-                    WHERE  resource_types.resource_type = ANY(:new_resource_types)
+                    WHERE  resource_types.resource_type IN :new_resource_types
                 ), service_attach_point AS (
                     SELECT product_blocks.product_block_id
                     FROM   product_blocks
@@ -470,7 +470,7 @@ def create_resource_types_for_product_blocks(conn: sa.engine.Connection, new: di
             ),
             {
                 "product_block_name": product_block,
-                "new_resource_types": list(resource_types.keys()),
+                "new_resource_types": tuple(resource_types.keys()),
             },
         )
     return resource_type_ids
@@ -795,11 +795,11 @@ def delete_resource_types_from_product_blocks(conn: sa.engine.Connection, delete
                    USING resource_types
                    WHERE product_block_id = (SELECT product_block_id FROM product_blocks WHERE name=:product_block_name) AND
                      resource_types.resource_type_id = product_block_resource_types.resource_type_id AND
-                     resource_types.resource_type = ANY(:obsolete_resource_types)"""
+                     resource_types.resource_type IN :obsolete_resource_types"""
             ),
             {
                 "product_block_name": product_block_name,
-                "obsolete_resource_types": list(resource_types.keys()),
+                "obsolete_resource_types": tuple(resource_types.keys()),
             },
         )
 
@@ -820,11 +820,11 @@ def delete_resource_types(conn: sa.engine.Connection, delete: Iterable) -> None:
             """DELETE FROM product_block_resource_types
                USING resource_types
                WHERE resource_types.resource_type_id = product_block_resource_types.resource_type_id
-                 AND resource_types.resource_type = ANY(:obsolete)"""
+                 AND resource_types.resource_type IN :obsolete"""
         ),
-        {"obsolete": list(delete)},
+        {"obsolete": tuple(delete)},
     )
-    conn.execute(sa.text("DELETE FROM resource_types WHERE resource_type = ANY(:obsolete)"), {"obsolete": list(delete)})
+    conn.execute(sa.text("DELETE FROM resource_types WHERE resource_type in :obsolete;"), {"obsolete": tuple(delete)})
 
 
 def delete_products_by_tag(conn: sa.engine.Connection, name: str) -> None:
@@ -1028,11 +1028,11 @@ def convert_resource_type_relations_to_instance_relations(
             )
             SELECT
                 in_use_by_instance_id AS in_use_by_id,
-                sii.subscription_instance_id AS depends_on_id,
-                (row_number() OVER (PARTITION BY in_use_by_instance_id) - 1) AS order_id,
+                si.subscription_instance_id AS depends_on_id,
+                (row_number() OVER (PARTITION BY in_use_by_id) - 1) AS order_id,
                 :domain_model_attr AS domain_model_attr
-            FROM subscription_instances AS sii
-            INNER JOIN dependencies AS dep ON sii.subscription_id=uuid(dep.subscription_id) ON CONFLICT DO NOTHING
+            FROM subscription_instances AS si
+            INNER JOIN dependencies AS dep ON si.subscription_id=uuid(dep.subscription_id) ON CONFLICT DO NOTHING
             """
         ),
         {

orchestrator/settings.py

@@ -13,7 +13,6 @@
 
 import secrets
 import string
-import warnings
 from pathlib import Path
 
 from pydantic import PostgresDsn, RedisDsn
@@ -23,10 +22,6 @@
 from orchestrator.types import strEnum
 
 
-class OrchestratorDeprecationWarning(DeprecationWarning):
-    pass
-
-
 class ExecutorType(strEnum):
     WORKER = "celery"
     THREADPOOL = "threadpool"
@@ -53,7 +48,7 @@ class AppSettings(BaseSettings):
     EXECUTOR: str = ExecutorType.THREADPOOL
     WORKFLOWS_SWAGGER_HOST: str = "localhost"
     WORKFLOWS_GUI_URI: str = "http://localhost:3000"
-    DATABASE_URI: PostgresDsn = "postgresql+psycopg://nwa:nwa@localhost/orchestrator-core"  # type: ignore
+    DATABASE_URI: PostgresDsn = "postgresql://nwa:nwa@localhost/orchestrator-core"  # type: ignore
     MAX_WORKERS: int = 5
     MAIL_SERVER: str = "localhost"
     MAIL_PORT: int = 25
@@ -84,21 +79,6 @@ class AppSettings(BaseSettings):
     DEFAULT_CUSTOMER_IDENTIFIER: str = "59289a57-70fb-4ff5-9c93-10fe67b12434"
     TASK_LOG_RETENTION_DAYS: int = 3
 
-    def __init__(self) -> None:
-        super(AppSettings, self).__init__()
-        self.DATABASE_URI = PostgresDsn(convert_database_uri(str(self.DATABASE_URI)))
-
-
-def convert_database_uri(db_uri: str) -> str:
-    if db_uri.startswith(("postgresql://", "postgresql+psycopg2://")):
-        db_uri = "postgresql+psycopg" + db_uri[db_uri.find("://") :]
-        warnings.filterwarnings("always", category=OrchestratorDeprecationWarning)
-        warnings.warn(  # noqa: B028
-            "DATABASE_URI converted to postgresql+psycopg:// format, please update your enviroment variable",
-            OrchestratorDeprecationWarning,
-        )
-    return db_uri
-
 
 app_settings = AppSettings()
 

pyproject.toml

@@ -46,7 +46,7 @@ dependencies = [
     "itsdangerous",
     "Jinja2==3.1.4",
     "orjson==3.10.6",
-    "psycopg[binary]==3.2.1",
+    "psycopg2-binary==2.9.9",
     "pydantic[email]~=2.7.4",
     "pydantic-settings~=2.3.1",
     "python-dateutil==2.8.2",

test/unit_tests/conftest.py

@@ -167,7 +167,7 @@ def db_uri(worker_id):
         Database uri to be used in the test thread
 
     """
-    database_uri = os.environ.get("DATABASE_URI", "postgresql+psycopg://nwa:nwa@localhost/orchestrator-core-test")
+    database_uri = os.environ.get("DATABASE_URI", "postgresql://nwa:nwa@localhost/orchestrator-core-test")
     if worker_id == "master":
         # pytest is being run without any workers
         return database_uri
@@ -198,9 +198,9 @@ def database(db_uri):
         url.database = "postgres"
     engine = create_engine(url)
     with closing(engine.connect()) as conn:
-        conn.commit()
-        conn.execution_options(isolation_level="AUTOCOMMIT").execute(text(f'DROP DATABASE IF EXISTS "{db_to_create}";'))
-        conn.commit()
+        conn.execute(text("COMMIT;"))
+        conn.execute(text(f'DROP DATABASE IF EXISTS "{db_to_create}";'))
+        conn.execute(text("COMMIT;"))
         conn.execute(text(f'CREATE DATABASE "{db_to_create}";'))
 
     run_migrations(db_uri)
@@ -211,10 +211,8 @@ def database(db_uri):
     finally:
         db.wrapped_database.engine.dispose()
         with closing(engine.connect()) as conn:
-            conn.commit()
-            conn.execution_options(isolation_level="AUTOCOMMIT").execute(
-                text(f'DROP DATABASE IF EXISTS "{db_to_create}";')
-            )
+            conn.execute(text("COMMIT;"))
+            conn.execute(text(f'DROP DATABASE IF EXISTS "{db_to_create}";'))
 
 
 @pytest.fixture(autouse=True)