change keyspaces to run ids?

datastax · Jan 16, 2025 · ff06b59 · ff06b59
1 parent b79a47d
commit ff06b59
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 29 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -66,29 +66,20 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Compute run-specific settings
-        env:
-            ASTRA_DB_KEYSPACE: ${{ github.ref }}_${{ matrix.python-version }}
-        id: settings
-        run: |
-            ASTRA_DB_KEYSPACE=${{ env.ASTRA_DB_KEYSPACE }}
-            ASTRA_DB_KEYSPACE=${ASTRA_DB_KEYSPACE//[-\/.]/_}
-            echo ASTRA_DB_KEYSPACE=${ASTRA_DB_KEYSPACE} >> $GITHUB_OUTPUT
-
       - name: Run `make test`
         run: make test
         env:
             ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }}
             ASTRA_DB_API_ENDPOINT: ${{ secrets.ASTRA_DB_API_ENDPOINT }}
-            ASTRA_DB_KEYSPACE: ${{ steps.settings.outputs.ASTRA_DB_KEYSPACE }}
+            ASTRA_DB_KEYSPACE: ${{ github.run_id }}_${{ github.run_attempt }}
 
       - name: Run delete Astra DB
         run: uv run scripts/cleanup-astra.py
         if: ${{ !cancelled() && steps.setup.conclusion == 'success' }}
         env:
             ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }}
             ASTRA_DB_API_ENDPOINT: ${{ secrets.ASTRA_DB_API_ENDPOINT }}
-            ASTRA_DB_KEYSPACE: ${{ steps.settings.outputs.ASTRA_DB_KEYSPACE }}
+            ASTRA_DB_KEYSPACE: ${{ github.run_id }}_${{ github.run_attempt }}
 
       - name: Run `make mypy`
         run: make mypy

diff --git a/tests/integration_tests/stores.py b/tests/integration_tests/stores.py
@@ -211,30 +211,29 @@ def _astra_store_factory(_request: pytest.FixtureRequest) -> StoreFactory:
         AstraStoreAdapter,
     )
 
+    import os
+
+    from astrapy.authentication import StaticTokenProvider
+    from dotenv import load_dotenv
+    load_dotenv()
+
+    token = StaticTokenProvider(os.environ["ASTRA_DB_APPLICATION_TOKEN"])
+    keyspace = os.environ.get("ASTRA_DB_KEYSPACE", "default_keyspace")
+    api_endpoint = os.environ["ASTRA_DB_API_ENDPOINT"]
+
+    from astrapy import AstraDBDatabaseAdmin
+    admin = AstraDBDatabaseAdmin(
+        api_endpoint=api_endpoint,
+        token=token,
+    )
+    admin.create_keyspace(keyspace)
+
     def create_astra(
         name: str, docs: list[Document], embedding: Embeddings
     ) -> AstraDBVectorStore:
         try:
-            import os
-
-            from astrapy.authentication import StaticTokenProvider
-            from dotenv import load_dotenv
             from langchain_astradb import AstraDBVectorStore
 
-            load_dotenv()
-
-            token = StaticTokenProvider(os.environ["ASTRA_DB_APPLICATION_TOKEN"])
-            keyspace = os.environ.get("ASTRA_DB_KEYSPACE", "default_keyspace")
-            api_endpoint = os.environ["ASTRA_DB_API_ENDPOINT"]
-
-            from astrapy import AstraDBDatabaseAdmin
-            admin = AstraDBDatabaseAdmin(
-                api_endpoint=api_endpoint,
-                token=token,
-            )
-            if keyspace not in admin.list_keyspaces():
-                admin.create_keyspace(keyspace)
-
             store = AstraDBVectorStore(
                 embedding=embedding,
                 collection_name=name,