Deploy complete BrainAPI source 21be203f41a4

All tracked files from Git commit 21be203f41a4d233b854ca225130560505a514dd; required Docker inputs checked before upload.

entrypoint.sh

@@ -74,6 +74,20 @@ export REDIS_PASSWORD
 export CELERY_BROKER_URL="redis://:${REDIS_PASSWORD}@127.0.0.1:6379/0"
 export CELERY_RESULT_BACKEND="redis://:${REDIS_PASSWORD}@127.0.0.1:6379/0"
 
+echo "========== Effective embedding configuration =========="
+printf 'EMBEDDINGS_PROVIDER=%q\n' "${EMBEDDINGS_PROVIDER:-}"
+printf 'OLLAMA_EMBEDDING_MODEL=%q\n' "${OLLAMA_EMBEDDING_MODEL:-}"
+printf 'EMBEDDINGS_LOCAL_MODEL=%q\n' "${EMBEDDINGS_LOCAL_MODEL:-}"
+printf 'EMBEDDING_PROFILE=%q\n' "${EMBEDDING_PROFILE:-}"
+printf 'EMBEDDING_NATIVE_DIMENSION=%q\n' "${EMBEDDING_NATIVE_DIMENSION:-}"
+printf 'EMBEDDING_MRL_DIMENSION=%q\n' "${EMBEDDING_MRL_DIMENSION:-}"
+printf 'EMBEDDING_NODES_DIMENSION=%q\n' "${EMBEDDING_NODES_DIMENSION:-}"
+printf 'EMBEDDING_TRIPLETS_DIMENSION=%q\n' "${EMBEDDING_TRIPLETS_DIMENSION:-}"
+printf 'EMBEDDING_OBSERVATIONS_DIMENSION=%q\n' "${EMBEDDING_OBSERVATIONS_DIMENSION:-}"
+printf 'EMBEDDING_DATA_DIMENSION=%q\n' "${EMBEDDING_DATA_DIMENSION:-}"
+printf 'EMBEDDING_RELATIONSHIPS_DIMENSION=%q\n' "${EMBEDDING_RELATIONSHIPS_DIMENSION:-}"
+echo "========================================================"
+
 # docker exec starts with the image environment, not this script's exports.
 # Load the same runtime defaults/credentials for qualification without restarting
 # or reinitializing the already-running application services.

patch.diff

@@ -0,0 +1,40 @@
+<<<<<<< SEARCH
+        gemma = provider == "ollama" and model == "embeddinggemma-2:270m"
+        self.profile = os.getenv("EMBEDDING_PROFILE", "embeddinggemma2-text-v1" if gemma else "")
+        default_dimension = 512 if gemma else 384
+=======
+        provider = (provider or "").strip().lower()
+        model = (model or "").strip()
+        gemma = provider == "ollama" and model == "embeddinggemma-2:270m"
+        self.profile = (
+            os.getenv(
+                "EMBEDDING_PROFILE",
+                "embeddinggemma2-text-v1" if gemma else "",
+            )
+            or ""
+        ).strip()
+        default_dimension = 512 if gemma else 384
+>>>>>>> REPLACE
+<<<<<<< SEARCH
+        if gemma or self.profile == "embeddinggemma2-text-v1":
+            if not (gemma and self.profile == "embeddinggemma2-text-v1" and self.native_dimension == 768
+                    and self.mrl_dimension == 512 and dimensions == {512}):
+                raise ValueError("embeddinggemma2-text-v1 requires ollama embeddinggemma-2:270m, native 768, MRL 512 and all stored dimensions 512; use a new index when changing profiles")
+        elif self.mrl_dimension:
+=======
+        if gemma or self.profile == "embeddinggemma2-text-v1":
+            if not (gemma and self.profile == "embeddinggemma2-text-v1" and self.native_dimension == 768
+                    and self.mrl_dimension == 512 and dimensions == {512}):
+                raise ValueError(
+                    "embeddinggemma2-text-v1 configuration mismatch: "
+                    f"provider={provider!r}, model={model!r}, "
+                    f"profile={self.profile!r}, "
+                    f"native_dimension={self.native_dimension!r}, "
+                    f"mrl_dimension={self.mrl_dimension!r}, "
+                    f"stored_dimensions={sorted(dimensions)!r}; "
+                    "expected provider='ollama', model='embeddinggemma-2:270m', "
+                    "profile='embeddinggemma2-text-v1', native=768, MRL=512, "
+                    "all stored dimensions=512"
+                )
+        elif self.mrl_dimension:
+>>>>>>> REPLACE

print_condition.py

@@ -0,0 +1,15 @@
+import os
+gemma = True
+profile = "embeddinggemma2-text-v1"
+native_dimension = 768
+mrl_dimension = 512
+dimensions = {512}
+
+if gemma or profile == "embeddinggemma2-text-v1":
+    print("gemma is:", gemma)
+    print("profile is:", profile)
+    print("native_dimension is:", native_dimension)
+    print("mrl_dimension is:", mrl_dimension)
+    print("dimensions is:", dimensions)
+    print("condition:", (gemma and profile == "embeddinggemma2-text-v1" and native_dimension == 768
+            and mrl_dimension == 512 and dimensions == {512}))

print_dimensions.py

@@ -0,0 +1,15 @@
+import os
+
+from src.config import Config
+config = Config()
+dimensions = {
+    config.embeddings.embedding_nodes_dimension, config.embeddings.embedding_triplets_dimension,
+    config.embeddings.embedding_observations_dimension, config.embeddings.embedding_data_dimension,
+    config.embeddings.embedding_relationships_dimension,
+}
+print("Dimensions:", dimensions)
+print("Type:", type(list(dimensions)[0]))
+print("Native:", config.embeddings.native_dimension, type(config.embeddings.native_dimension))
+print("MRL:", config.embeddings.mrl_dimension, type(config.embeddings.mrl_dimension))
+print("Profile:", config.embeddings.profile)
+print("Gemma:", config.ollama.embedding_model == "embeddinggemma-2:270m" if config.ollama else False)

src/config.py

@@ -389,8 +389,16 @@ class EmbeddingsConfig:
         self.local_model = os.getenv("EMBEDDINGS_LOCAL_MODEL", "BAAI/bge-small-en-v1.5")
         self.small_model = os.getenv("EMBEDDINGS_SMALL_MODEL", "BAAI/bge-small-en-v1.5")
 
+        provider = (provider or "").strip().lower()
+        model = (model or "").strip()
         gemma = provider == "ollama" and model == "embeddinggemma-2:270m"
-        self.profile = os.getenv("EMBEDDING_PROFILE", "embeddinggemma2-text-v1" if gemma else "")
+        self.profile = (
+            os.getenv(
+                "EMBEDDING_PROFILE",
+                "embeddinggemma2-text-v1" if gemma else "",
+            )
+            or ""
+        ).strip()
         default_dimension = 512 if gemma else 384
 
         self.embedding_nodes_dimension = (
@@ -430,7 +438,17 @@ class EmbeddingsConfig:
         if gemma or self.profile == "embeddinggemma2-text-v1":
             if not (gemma and self.profile == "embeddinggemma2-text-v1" and self.native_dimension == 768
                     and self.mrl_dimension == 512 and dimensions == {512}):
-                raise ValueError("embeddinggemma2-text-v1 requires ollama embeddinggemma-2:270m, native 768, MRL 512 and all stored dimensions 512; use a new index when changing profiles")
+                raise ValueError(
+                    "embeddinggemma2-text-v1 configuration mismatch: "
+                    f"provider={provider!r}, model={model!r}, "
+                    f"profile={self.profile!r}, "
+                    f"native_dimension={self.native_dimension!r}, "
+                    f"mrl_dimension={self.mrl_dimension!r}, "
+                    f"stored_dimensions={sorted(dimensions)!r}; "
+                    "expected provider='ollama', model='embeddinggemma-2:270m', "
+                    "profile='embeddinggemma2-text-v1', native=768, MRL=512, "
+                    "all stored dimensions=512"
+                )
         elif self.mrl_dimension:
             raise ValueError("MRL is only supported by the qualified embeddinggemma2-text-v1 profile")
 

test_config.py

@@ -0,0 +1,14 @@
+import os
+os.environ["EMBEDDING_PROFILE"] = "embeddinggemma2-text-v1"
+os.environ["EMBEDDING_NATIVE_DIMENSION"] = "768"
+os.environ["EMBEDDING_MRL_DIMENSION"] = "512"
+os.environ["EMBEDDING_NODES_DIMENSION"] = "512"
+os.environ["EMBEDDING_TRIPLETS_DIMENSION"] = "512"
+os.environ["EMBEDDING_OBSERVATIONS_DIMENSION"] = "512"
+os.environ["EMBEDDING_DATA_DIMENSION"] = "512"
+os.environ["EMBEDDING_RELATIONSHIPS_DIMENSION"] = "512"
+os.environ["OLLAMA_EMBEDDING_MODEL"] = "embeddinggemma-2:270m"
+os.environ["EMBEDDINGS_PROVIDER"] = "ollama"
+
+from src.constants.embeddings import EMBEDDING_STORES_SIZES
+print("Success:", EMBEDDING_STORES_SIZES)

test_config2.py

@@ -0,0 +1,18 @@
+import os
+os.environ["EMBEDDING_PROFILE"] = "embeddinggemma2-text-v1"
+os.environ["EMBEDDING_NATIVE_DIMENSION"] = "768"
+os.environ["EMBEDDING_MRL_DIMENSION"] = "512"
+os.environ["EMBEDDING_NODES_DIMENSION"] = "512"
+os.environ["EMBEDDING_TRIPLETS_DIMENSION"] = "512"
+os.environ["EMBEDDING_OBSERVATIONS_DIMENSION"] = "512"
+os.environ["EMBEDDING_DATA_DIMENSION"] = "512"
+os.environ["EMBEDDING_RELATIONSHIPS_DIMENSION"] = "512"
+os.environ["OLLAMA_EMBEDDING_MODEL"] = "embeddinggemma-2:270m"
+os.environ["EMBEDDINGS_PROVIDER"] = "ollama"
+
+from src.config import Config
+config = Config()
+print("DATA DIM:", config.embeddings.embedding_data_dimension)
+print("PROFILE:", config.embeddings.profile)
+print("NATIVE:", config.embeddings.native_dimension)
+print("MRL:", config.embeddings.mrl_dimension)

test_config3.py

@@ -0,0 +1,22 @@
+import os
+os.environ["EMBEDDING_PROFILE"] = "embeddinggemma2-text-v1"
+os.environ["EMBEDDING_NATIVE_DIMENSION"] = "768"
+os.environ["EMBEDDING_MRL_DIMENSION"] = "512"
+os.environ["EMBEDDING_NODES_DIMENSION"] = "512"
+os.environ["EMBEDDING_TRIPLETS_DIMENSION"] = "512"
+os.environ["EMBEDDING_OBSERVATIONS_DIMENSION"] = "512"
+os.environ["EMBEDDING_DATA_DIMENSION"] = "512"
+os.environ["EMBEDDING_RELATIONSHIPS_DIMENSION"] = "512"
+os.environ["OLLAMA_EMBEDDING_MODEL"] = "embeddinggemma-2:270m"
+os.environ["EMBEDDINGS_PROVIDER"] = "ollama"
+os.environ["MODELS_MODE"] = "local"
+os.environ["LLM_SMALL_PROVIDER"] = "ollama"
+
+from src.config import Config
+config = Config()
+print("DATA DIM:", config.embeddings.embedding_data_dimension)
+print("PROFILE:", config.embeddings.profile)
+print("NATIVE:", config.embeddings.native_dimension)
+print("MRL:", config.embeddings.mrl_dimension)
+print("PROVIDER:", config.embeddings_provider)
+print("MODEL:", config.ollama.embedding_model)

test_config4.py

@@ -0,0 +1,20 @@
+import os
+os.environ["EMBEDDING_PROFILE"] = "embeddinggemma2-text-v1"
+os.environ["EMBEDDING_NATIVE_DIMENSION"] = "768"
+os.environ["EMBEDDING_MRL_DIMENSION"] = "512"
+os.environ["EMBEDDING_NODES_DIMENSION"] = "512"
+os.environ["EMBEDDING_TRIPLETS_DIMENSION"] = "512"
+os.environ["EMBEDDING_OBSERVATIONS_DIMENSION"] = "512"
+os.environ["EMBEDDING_DATA_DIMENSION"] = "512"
+os.environ["EMBEDDING_RELATIONSHIPS_DIMENSION"] = "512"
+os.environ["OLLAMA_EMBEDDING_MODEL"] = "embeddinggemma-2:270m"
+os.environ["EMBEDDINGS_PROVIDER"] = "ollama"
+os.environ["MODELS_MODE"] = "local"
+os.environ["LLM_SMALL_PROVIDER"] = "ollama"
+
+from src.config import EmbeddingsConfig
+try:
+    c = EmbeddingsConfig("local", provider="ollama", model="embeddinggemma-2:270m")
+    print("SUCCESS")
+except Exception as e:
+    print("ERROR:", type(e), e)

test_config5.py

@@ -0,0 +1,7 @@
+import os
+from src.config import Config
+try:
+    c = Config()
+    print("SUCCESS")
+except Exception as e:
+    print("ERROR:", type(e), e)

test_config6.py

@@ -0,0 +1,18 @@
+import os
+os.environ["EMBEDDING_PROFILE"] = "embeddinggemma2-text-v1"
+os.environ["EMBEDDING_NATIVE_DIMENSION"] = "768"
+os.environ["EMBEDDING_MRL_DIMENSION"] = "512"
+os.environ["EMBEDDING_NODES_DIMENSION"] = "512"
+os.environ["EMBEDDING_TRIPLETS_DIMENSION"] = "512"
+os.environ["EMBEDDING_OBSERVATIONS_DIMENSION"] = "512"
+os.environ["EMBEDDING_DATA_DIMENSION"] = "512"
+os.environ["EMBEDDING_RELATIONSHIPS_DIMENSION"] = "512"
+os.environ["OLLAMA_EMBEDDING_MODEL"] = "embeddinggemma-2:270m"
+os.environ["EMBEDDINGS_PROVIDER"] = "ollama"
+
+from src.config import Config
+try:
+    c = Config()
+    print("SUCCESS")
+except Exception as e:
+    print("ERROR:", type(e), e)

test_config7.py

@@ -0,0 +1,15 @@
+import os
+os.environ["EMBEDDING_PROFILE"] = "embeddinggemma2-text-v1"
+os.environ["EMBEDDING_NATIVE_DIMENSION"] = "768"
+os.environ["EMBEDDING_MRL_DIMENSION"] = "512"
+os.environ["EMBEDDING_NODES_DIMENSION"] = "512"
+os.environ["EMBEDDING_TRIPLETS_DIMENSION"] = "512"
+os.environ["EMBEDDING_OBSERVATIONS_DIMENSION"] = "512"
+os.environ["EMBEDDING_DATA_DIMENSION"] = "512"
+os.environ["EMBEDDING_RELATIONSHIPS_DIMENSION"] = "512"
+os.environ["OLLAMA_EMBEDDING_MODEL"] = "embeddinggemma-2:270m"
+os.environ["EMBEDDINGS_PROVIDER"] = "ollama"
+
+from src.config import Config
+config = Config()
+print("Ollama embedding model:", config.ollama.embedding_model)