Feature/cog 4469 graph aware embeddings integrate joint postgres graph db and

.github/workflows/approve_dco.yaml

@@ -11,40 +11,27 @@ jobs:
       - name: Validate Developer Certificate of Origin statement
         uses: actions/github-script@v8
         with:
-          # If using the built-in GITHUB_TOKEN, ensure it has 'read:org' permission.
-          # In GitHub Enterprise or private orgs, you might need a PAT (personal access token) with read:org scope.
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const orgName = 'YOUR_ORGANIZATION_NAME'; // Replace with your org
             const prUser = context.payload.pull_request.user.login;
             const prBody = context.payload.pull_request.body || '';
+            const authorAssociation = context.payload.pull_request.author_association;
 
             // Exact text you require in the PR body
             const requiredStatement = "I affirm that all code in every commit of this pull request conforms to the terms of the Topoteretes Developer Certificate of Origin";
 
-            // 1. Check if user is in the org
-            let isOrgMember = false;
-            try {
-              // Attempt to get membership info
-              const membership = await github.rest.orgs.getMembershipForUser({
-                org: orgName,
-                username: prUser,
-              });
-              // If we get here without an error, user is in the org
-              isOrgMember = true;
-              console.log(`${prUser} is a member of ${orgName}. Skipping DCO check.`);
-            } catch (error) {
-              // If we get a 404, user is NOT an org member
-              if (error.status === 404) {
-                console.log(`${prUser} is NOT a member of ${orgName}. Enforcing DCO check.`);
-              } else {
-                // Some other error—fail the workflow or handle accordingly
-                core.setFailed(`Error checking organization membership: ${error.message}`);
-              }
-            }
+            // 1. Check if user is an org member via author_association
+            //    (available on the PR payload without extra API calls or permissions)
+            //    OWNER, MEMBER, and COLLABORATOR are trusted roles.
+            const trustedRoles = ['OWNER', 'MEMBER', 'COLLABORATOR', 'CONTRIBUTOR'];
+            const isTrusted = trustedRoles.includes(authorAssociation);
+
+            if (isTrusted) {
+              console.log(`${prUser} has association '${authorAssociation}'. Skipping DCO check.`);
+            } else {
+              console.log(`${prUser} has association '${authorAssociation}'. Enforcing DCO check.`);
 
-            // 2. If user is not in the org, enforce the DCO statement
-            if (!isOrgMember) {
+              // 2. If user is not trusted, enforce the DCO statement
               if (!prBody.includes(requiredStatement)) {
                 core.setFailed(
                   `DCO check failed. The PR body must include the following statement:\n\n${requiredStatement}`

.github/workflows/graph_db_tests.yml

@@ -77,7 +77,7 @@ jobs:
     if: ${{ inputs.databases == 'all' || contains(inputs.databases, 'postgres') }}
     services:
       postgres:
-        image: postgres:16
+        image: pgvector/pgvector:pg17
         env:
           POSTGRES_USER: cognee
           POSTGRES_PASSWORD: cognee
@@ -133,6 +133,44 @@ jobs:
           EMBEDDING_API_VERSION: ${{ secrets.EMBEDDING_API_VERSION }}
         run: uv run python ./cognee/tests/e2e/postgres/test_graphdb_postgres.py
 
+      - name: Run Postgres Hybrid Adapter Tests
+        env:
+          ENV: 'dev'
+          DB_PROVIDER: postgres
+          DB_HOST: localhost
+          DB_PORT: 5432
+          DB_USERNAME: cognee
+          DB_PASSWORD: cognee
+          DB_NAME: cognee_db
+          EMBEDDING_DIMENSIONS: 300
+          EMBEDDING_MODEL: ${{ secrets.EMBEDDING_MODEL }}
+          EMBEDDING_ENDPOINT: ${{ secrets.EMBEDDING_ENDPOINT }}
+          EMBEDDING_API_KEY: ${{ secrets.EMBEDDING_API_KEY }}
+          EMBEDDING_API_VERSION: ${{ secrets.EMBEDDING_API_VERSION }}
+        run: uv run pytest cognee/tests/e2e/postgres/test_postgres_hybrid_adapter.py -v
+
+      - name: Run Postgres Hybrid E2E Test
+        env:
+          ENV: 'dev'
+          USE_UNIFIED_PROVIDER: "pghybrid"
+          DB_PROVIDER: postgres
+          DB_HOST: localhost
+          DB_PORT: 5432
+          DB_USERNAME: cognee
+          DB_PASSWORD: cognee
+          DB_NAME: cognee_db
+          ENABLE_BACKEND_ACCESS_CONTROL: 'false'
+          LLM_MODEL: ${{ secrets.LLM_MODEL }}
+          LLM_ENDPOINT: ${{ secrets.LLM_ENDPOINT }}
+          LLM_API_KEY: ${{ secrets.LLM_API_KEY }}
+          LLM_API_VERSION: ${{ secrets.LLM_API_VERSION }}
+          EMBEDDING_DIMENSIONS: 300
+          EMBEDDING_MODEL: ${{ secrets.EMBEDDING_MODEL }}
+          EMBEDDING_ENDPOINT: ${{ secrets.EMBEDDING_ENDPOINT }}
+          EMBEDDING_API_KEY: ${{ secrets.EMBEDDING_API_KEY }}
+          EMBEDDING_API_VERSION: ${{ secrets.EMBEDDING_API_VERSION }}
+        run: uv run python ./cognee/tests/e2e/postgres/test_pghybrid.py
+
   run-neo4j-tests:
     name: Neo4j Tests
     runs-on: ubuntu-22.04

cognee/infrastructure/databases/graph/get_graph_engine.py

@@ -40,6 +40,18 @@ def create_graph_engine(
     Wrapper function to call create graph engine with caching.
     For a detailed description, see _create_graph_engine.
     """
+    # Check USE_UNIFIED_PROVIDER outside the cache so it's always re-read
+    import os
+
+    unified_provider = os.environ.get("USE_UNIFIED_PROVIDER", "")
+    if unified_provider == "pghybrid":
+        from .postgres.adapter import PostgresAdapter
+        from cognee.infrastructure.databases.relational.get_relational_engine import (
+            get_relational_engine,
+        )
+
+        return PostgresAdapter(connection_string=get_relational_engine().db_uri)
+
     return _create_graph_engine(
         graph_database_provider,
         graph_file_path,
@@ -205,7 +217,15 @@ def _create_graph_engine(
             graph_id=graph_identifier,
         )
 
+    all_providers = list(supported_databases.keys()) + [
+        "neo4j",
+        "kuzu",
+        "kuzu-remote",
+        "postgres",
+        "neptune",
+        "neptune_analytics",
+    ]
     raise EnvironmentError(
         f"Unsupported graph database provider: {graph_database_provider}. "
-        f"Supported providers are: {', '.join(list(supported_databases.keys()) + ['neo4j', 'kuzu', 'kuzu-remote', 'postgres', 'neptune', 'neptune_analytics'])}"
+        f"Supported providers are: {', '.join(all_providers)}"
     )

cognee/infrastructure/databases/graph/graph_db_interface.py

@@ -347,3 +347,17 @@ async def set_edge_feedback_weights(
         Returns per-id update success.
         """
         raise NotImplementedError("set_edge_feedback_weights is not implemented for this adapter")
+
+    async def get_triplets_batch(self, offset: int, limit: int) -> List[Dict[str, Any]]:
+        """Retrieve a batch of triplets (source, edge, target).
+
+        Optional extension — implemented by PostgresAdapter, Neo4jAdapter,
+        and KuzuAdapter but not NeptuneGraphDB.
+
+        Parameters:
+        -----------
+
+            - offset: Number of triplets to skip.
+            - limit: Maximum number of triplets to return.
+        """
+        raise NotImplementedError("get_triplets_batch is not implemented for this adapter")