Merge branch 'daxa-ai:main' into main

Raj725 · Sep 16, 2024 · 6119125 · 6119125
2 parents d9646ee + 15857e8
commit 6119125
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml
@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - "v[0-9].[0-9]+.[0-9]+*"
+  workflow_dispatch:    
 jobs:
   build-and-push:
     name: Build base image
@@ -21,8 +22,8 @@ jobs:
 
       - name: Get Release Tag
         run: |
-          TAG=$(echo $GITHUB_REF | sed 's/refs\/tags\///')
-          echo "VERSION=$(echo $TAG | sed 's/v//')" >> $GITHUB_ENV
+             TAG=$(echo $GITHUB_REF | sed 's/refs\/tags\///')
+             echo "VERSION=$(echo $TAG | sed 's/v//')" >> $GITHUB_ENV     
           
       - name: Build base images
         uses: docker/bake-action@v4
@@ -33,4 +34,5 @@ jobs:
           workdir: deploy/docker
           targets: base
           push: true
+          no-cache: true
 
diff --git a/deploy/docker/docker-bake.hcl b/deploy/docker/docker-bake.hcl
@@ -30,5 +30,5 @@ target "base" {
     base_image = "python:3.11"
     pebblo_version = "${PEBBLO_VERSION}"
   }
-  platforms = ["linux/amd64", "linux/arm64"]
+  platforms = ["linux/amd64"]
 }
diff --git a/pebblo/app/api/req_models.py b/pebblo/app/api/req_models.py
@@ -52,7 +52,7 @@ class ReqDiscover(BaseModel):
     framework: Framework
     chains: Optional[List[ChainInfo]] = None
     plugin_version: str
-    client_version: Framework
+    client_version: Optional[Framework] = None
 
 
 class ReqLoaderDoc(BaseModel):

diff --git a/pebblo/app/models/db_models.py b/pebblo/app/models/db_models.py
@@ -46,6 +46,7 @@ class AiBaseApp(BaseModel):
     ] = []  # list of policy id, title and other details
     pebbloServerVersion: Optional[str] = None
     pebbloClientVersion: Optional[str] = None
+    clientVersion: Optional[FrameworkInfo] = None
     model_config = ConfigDict(arbitrary_types_allowed=True, use_enum_values=True)
 
 

diff --git a/pebblo/app/service/discovery/discovery_service.py b/pebblo/app/service/discovery/discovery_service.py
@@ -72,10 +72,12 @@ def create_app_obj(
         current_time = get_current_time()
 
         metadata = Metadata(createdAt=current_time, modifiedAt=current_time)
-        client_version = FrameworkInfo(
-            name=self.data.get("client_version", {}).get("name"),
-            version=self.data.get("client_version", {}).get("version"),
-        )
+        client_version = None
+        if self.data.get("client_version"):
+            client_version = FrameworkInfo(
+                name=self.data.get("client_version", {}).get("name"),
+                version=self.data.get("client_version", {}).get("version"),
+            )
         ai_app_obj = {
             "metadata": metadata,
             "description": self.data.get("description", "-"),

diff --git a/pebblo/app/service/discovery_service.py b/pebblo/app/service/discovery_service.py
@@ -64,10 +64,12 @@ def _create_ai_apps_model(
             createdAt=self._get_current_datetime(),
             modifiedAt=self._get_current_datetime(),
         )
-        client_version = FrameworkInfo(
-            name=self.data.get("client_version", {}).get("name"),
-            version=self.data.get("client_version", {}).get("version"),
-        )
+        client_version = None
+        if self.data.get("client_version"):
+            client_version = FrameworkInfo(
+                name=self.data.get("client_version", {}).get("name"),
+                version=self.data.get("client_version", {}).get("version"),
+            )
         ai_apps_model = AiApp(
             metadata=metadata,
             name=self.data.get("name"),