Issue 156/make component content invisible in posthog

.all-contributorsrc

@@ -309,6 +309,15 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "Dhoni77",
+      "name": "Aldrin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53973174?v=4",
+      "profile": "https://github.com/Dhoni77",
+      "contributions": [
+        "test"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/backend_test.yml

@@ -22,10 +22,9 @@ jobs:
             fi
             sleep 5
           done
-
 
       - name: Run tests
         run: docker exec agenta-backend-test pytest
 
       - name: Stop Docker Compose
-        run: docker-compose down
+        run: docker-compose down

.github/workflows/docker.yml

@@ -45,6 +45,6 @@ jobs:
         id: build-web-image
         run: |
           cd agenta-web
-          docker build --no-cache -t ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.WEB_IMAGE_NAME }} -f prod.Dockerfile .
+          docker build --no-cache -t ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.WEB_IMAGE_NAME }} -f prod.gh.Dockerfile .
           docker push ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.WEB_IMAGE_NAME }}
 

.github/workflows/frontend-tests.yml

@@ -0,0 +1,58 @@
+name: Execute Frontend tests
+
+on: [pull_request]
+env:
+  OPENAI_API_KEY: ${{ secrets.NEXT_PUBLIC_OPENAI_API_KEY }}
+
+jobs:
+  cypress:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set Environment Variables
+        run: |
+          echo "NEXT_PUBLIC_OPENAI_API_KEY=${{ secrets.NEXT_PUBLIC_OPENAI_API_KEY }}" >> $GITHUB_ENV
+
+      - name: Install Curl & Start Docker Compose
+        env:
+          NEXT_PUBLIC_OPENAI_API_KEY: ${{ secrets.NEXT_PUBLIC_OPENAI_API_KEY }}
+        run: |
+          sudo apt install curl -y
+          docker-compose -f "docker-compose.yml" up -d --build
+
+      - name: Restart Backend Service To Fetch Template(s)
+        run: docker container restart agenta_backend_1
+
+      - name: Wait for Backend Service
+        run: curl http://localhost/api/health/
+
+      - name: Know the Response of Organization & Container Templates
+        run: |
+          curl http://localhost/api/organizations/own/
+          curl http://localhost/api/containers/templates/
+
+      - name: Set Node.js 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install Frontend Depedencies
+        env:
+          NEXT_PUBLIC_OPENAI_API_KEY: ${{ secrets.NEXT_PUBLIC_OPENAI_API_KEY }}
+        run: |
+          cd agenta-web/ && npm install
+
+      - name: Run Cypress
+        env:
+          NEXT_PUBLIC_OPENAI_API_KEY: ${{ secrets.NEXT_PUBLIC_OPENAI_API_KEY }}
+        run: cd agenta-web/ && npm run cypress:run
+
+      - name: Docker logs
+        if: always()  #
+        run: docker ps -q | xargs -I {} docker logs {}
+
+      - name: Stop Docker Compose
+        run: docker-compose down

.gitignore

@@ -41,7 +41,7 @@ self-host/*/*.tfstate.backup
 
 todo.md
 agenta-web/cypress/videos/
-agenta-backend/agenta_backend/ee/**
+agenta-backend/agenta_backend/cloud/**
 agenta-web/src/ee/**
 agenta-web/src/config/frontendConfig.ts
 agenta-web/src/config/appInfo.ts

README.md

@@ -231,7 +231,7 @@ Check out our [Contributing Guide](https://docs.agenta.ai/contributing/getting-s
 ## Contributors ✨
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-32-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-33-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -282,6 +282,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://venkataravitejagullapudi.github.io/"><img src="https://avatars.githubusercontent.com/u/70102577?v=4?s=100" width="100px;" alt="Raviteja"/><br /><sub><b>Raviteja</b></sub></a><br /><a href="https://github.com/Agenta-AI/agenta/commits?author=VenkataRavitejaGullapudi" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ArijitCloud"><img src="https://avatars.githubusercontent.com/u/81144422?v=4?s=100" width="100px;" alt="Arijit"/><br /><sub><b>Arijit</b></sub></a><br /><a href="https://github.com/Agenta-AI/agenta/commits?author=ArijitCloud" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Yachika9925"><img src="https://avatars.githubusercontent.com/u/147185379?v=4?s=100" width="100px;" alt="Yachika9925"/><br /><sub><b>Yachika9925</b></sub></a><br /><a href="https://github.com/Agenta-AI/agenta/commits?author=Yachika9925" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Dhoni77"><img src="https://avatars.githubusercontent.com/u/53973174?v=4?s=100" width="100px;" alt="Aldrin"/><br /><sub><b>Aldrin</b></sub></a><br /><a href="https://github.com/Agenta-AI/agenta/commits?author=Dhoni77" title="Tests">⚠️</a></td>
     </tr>
   </tbody>
 </table>

agenta-backend/agenta_backend/__init__.py

@@ -1,4 +1,4 @@
 import os
 
-if os.environ["FEATURE_FLAG"] in ["cloud", "ee", "demo"]:
-    import agenta_backend.ee.__init__
+if os.environ["FEATURE_FLAG"] in ["cloud", "ee"]:
+    import agenta_backend.cloud.__init__

agenta-backend/agenta_backend/config.py

@@ -14,14 +14,12 @@
 os.environ["DOCKER_HUB_URL"] = toml_config["docker_hub_url"]
 os.environ["DOCKER_HUB_REPO_OWNER"] = toml_config["docker_hub_repo_owner"]
 os.environ["DOCKER_HUB_REPO_NAME"] = toml_config["docker_hub_repo_name"]
-os.environ["REDIS_URL"] = toml_config["redis_url"]
 os.environ["DATABASE_MODE"] = os.environ.get("DATABASE_MODE", "v2")
 
 
 class Settings(BaseSettings):
     docker_registry_url: str
     registry: str
-    redis_url: str
     database_url: str
     docker_hub_url: str
     docker_hub_repo_owner: str

agenta-backend/agenta_backend/config.toml

@@ -1,7 +1,6 @@
 docker_registry_url="registry:5001"
 registry="agentaai"
 database_url="sqlite:////db/deploy.db"
-redis_url="redis://redis:6379/0"
 docker_hub_url="https://hub.docker.com/v2/repositories/{}/{}"
 docker_hub_repo_owner="agentaai"
 docker_hub_repo_name="templates_v2"

agenta-backend/agenta_backend/main.py

@@ -14,10 +14,11 @@
     variants_router,
     bases_router,
     configs_router,
+    health_router,
 )
 
 if os.environ["FEATURE_FLAG"] in ["cloud", "ee"]:
-    from agenta_backend.ee.services import templates_manager
+    from agenta_backend.cloud.services import templates_manager
 else:
     from agenta_backend.services import templates_manager
 
@@ -56,16 +57,17 @@ async def lifespan(application: FastAPI, cache=True):
     allow_headers=allow_headers,
 )
 
-if os.environ["FEATURE_FLAG"] not in ["cloud", "ee", "demo"]:
+if os.environ["FEATURE_FLAG"] not in ["cloud", "ee"]:
     from agenta_backend.services.auth_helper import authentication_middleware
 
     app.middleware("http")(authentication_middleware)
 
-if os.environ["FEATURE_FLAG"] in ["cloud", "ee", "demo"]:
-    import agenta_backend.ee.main as ee
+if os.environ["FEATURE_FLAG"] in ["cloud", "ee"]:
+    import agenta_backend.cloud.main as cloud
 
-    app, allow_headers = ee.extend_main(app)
+    app, allow_headers = cloud.extend_main(app)
 
+app.include_router(health_router.router, prefix="/health")
 app.include_router(user_profile.router, prefix="/profile")
 app.include_router(app_router.router, prefix="/apps")
 app.include_router(variants_router.router, prefix="/variants")

agenta-backend/agenta_backend/models/api/api_models.py

@@ -109,6 +109,7 @@ class RestartAppContainer(BaseModel):
 
 
 class Image(BaseModel):
+    type: Optional[str]
     docker_id: str
     tags: str
     organization_id: Optional[str] = None
@@ -129,12 +130,13 @@ class ImageExtended(Image):
 
 class TemplateImageInfo(BaseModel):
     name: str
-    size: int
-    digest: str
+    size: Optional[int] = None
+    digest: Optional[str] = None
     title: str
     description: str
-    last_pushed: datetime
-    repo_name: str
+    last_pushed: Optional[datetime] = None
+    repo_name: Optional[str] = None
+    template_uri: Optional[str] = None
 
 
 class Template(BaseModel):

agenta-backend/agenta_backend/models/converters.py

@@ -187,12 +187,13 @@ def templates_db_to_pydantic(templates_db: List[TemplateDB]) -> List[Template]:
             id=str(template.id),
             image=TemplateImageInfo(
                 name=template.name,
-                size=template.size,
-                digest=template.digest,
+                size=template.size if template.size else None,
+                digest=template.digest if template.digest else None,
                 title=template.title,
                 description=template.description,
-                last_pushed=template.last_pushed,
-                repo_name=template.repo_name,
+                last_pushed=template.last_pushed if template.last_pushed else None,
+                repo_name=template.repo_name if template.repo_name else None,
+                template_uri=template.template_uri if template.template_uri else None,
             ),
         )
         for template in templates_db

agenta-backend/agenta_backend/models/db_models.py

@@ -56,8 +56,10 @@ class Config:
 class ImageDB(Model):
     """Defines the info needed to get an image and connect it to the app variant"""
 
-    docker_id: str = Field(index=True)
-    tags: str
+    type: Optional[str] = Field(default="image")
+    template_uri: Optional[str]
+    docker_id: Optional[str] = Field(index=True)
+    tags: Optional[str]
     deletable: bool = Field(default=True)
     user: UserDB = Reference(key_name="user")
     organization: OrganizationDB = Reference(key_name="organization")
@@ -163,14 +165,16 @@ class Config:
 
 
 class TemplateDB(Model):
-    tag_id: int
-    name: str  # tag name of image
-    repo_name: str
+    type: Optional[str] = Field(default="image")
+    template_uri: Optional[str]
+    tag_id: Optional[int]
+    name: str = Field(unique=True)  # tag name of image
+    repo_name: Optional[str]
     title: str
     description: str
-    size: int
-    digest: str  # sha256 hash of image digest
-    last_pushed: datetime
+    size: Optional[int]
+    digest: Optional[str]  # sha256 hash of image digest
+    last_pushed: Optional[datetime]
 
     class Config:
         collection = "templates"