chore: get rid of nested parametrization (#394)

timescale · Jan 27, 2025 · 0a399e2 · 0a399e2
1 parent 41cb52c
commit 0a399e2
Show file tree

Hide file tree

Showing 10 changed files with 212 additions and 442 deletions.
diff --git a/projects/pgai/tests/vectorizer/extensions/test_inheritance.py b/projects/pgai/tests/vectorizer/extensions/test_inheritance.py
@@ -8,7 +8,7 @@
 from testcontainers.postgres import PostgresContainer  # type: ignore
 
 from pgai.sqlalchemy import vectorizer_relationship
-from tests.vectorizer.extensions.utils import run_vectorizer_worker
+from tests.vectorizer.utils import run_vectorizer_worker
 
 
 class BaseModel(DeclarativeBase):

diff --git a/projects/pgai/tests/vectorizer/extensions/test_sqlalchemy.py b/projects/pgai/tests/vectorizer/extensions/test_sqlalchemy.py
@@ -6,7 +6,7 @@
 from testcontainers.postgres import PostgresContainer  # type: ignore
 
 from pgai.sqlalchemy import vectorizer_relationship
-from tests.vectorizer.extensions.utils import run_vectorizer_worker
+from tests.vectorizer.utils import run_vectorizer_worker
 
 
 def test_sqlalchemy(

diff --git a/projects/pgai/tests/vectorizer/extensions/test_sqlalchemy_composite_primary.py b/projects/pgai/tests/vectorizer/extensions/test_sqlalchemy_composite_primary.py
@@ -7,7 +7,7 @@
 from testcontainers.postgres import PostgresContainer  # type: ignore
 
 from pgai.sqlalchemy import vectorizer_relationship
-from tests.vectorizer.extensions.utils import run_vectorizer_worker
+from tests.vectorizer.utils import run_vectorizer_worker
 
 
 class Base(DeclarativeBase):

diff --git a/projects/pgai/tests/vectorizer/extensions/test_sqlalchemy_large_embeddings.py b/projects/pgai/tests/vectorizer/extensions/test_sqlalchemy_large_embeddings.py
@@ -7,7 +7,7 @@
 from testcontainers.postgres import PostgresContainer  # type: ignore
 
 from pgai.sqlalchemy import vectorizer_relationship
-from tests.vectorizer.extensions.utils import run_vectorizer_worker
+from tests.vectorizer.utils import run_vectorizer_worker
 
 
 class Base(DeclarativeBase):

diff --git a/projects/pgai/tests/vectorizer/extensions/test_sqlalchemy_lazy_strategies.py b/projects/pgai/tests/vectorizer/extensions/test_sqlalchemy_lazy_strategies.py
@@ -7,7 +7,7 @@
 from testcontainers.postgres import PostgresContainer  # type: ignore
 
 from pgai.sqlalchemy import vectorizer_relationship
-from tests.vectorizer.extensions.utils import run_vectorizer_worker
+from tests.vectorizer.utils import run_vectorizer_worker
 
 
 class Base(DeclarativeBase):

diff --git a/projects/pgai/tests/vectorizer/extensions/test_sqlalchemy_relationship.py b/projects/pgai/tests/vectorizer/extensions/test_sqlalchemy_relationship.py
@@ -7,9 +7,7 @@
 from testcontainers.postgres import PostgresContainer  # type: ignore
 
 from pgai.sqlalchemy import vectorizer_relationship
-from tests.vectorizer.extensions.utils import (
-    run_vectorizer_worker,
-)
+from tests.vectorizer.utils import run_vectorizer_worker
 
 
 class Base(DeclarativeBase):

diff --git a/projects/pgai/tests/vectorizer/extensions/utils.py b/projects/pgai/tests/vectorizer/extensions/utils.py
@@ -1,29 +1,11 @@
 from pathlib import Path
 from typing import Any
 
-from click.testing import CliRunner
 from sqlalchemy import Column
 
-from pgai.cli import vectorizer_worker
 from tests.vectorizer.extensions.conftest import load_template
 
 
-def run_vectorizer_worker(db_url: str, vectorizer_id: int) -> None:
-    CliRunner().invoke(
-        vectorizer_worker,
-        [
-            "--db-url",
-            db_url,
-            "--once",
-            "--vectorizer-id",
-            str(vectorizer_id),
-            "--concurrency",
-            "1",
-        ],
-        catch_exceptions=False,
-    )
-
-
 def create_vectorizer_migration(
     migrations_dir: Path,
     table_name: str,