chore: fix test applications (#4)

* chore: fix test applications

Signed-off-by: Luca Muscariello <lumuscar@cisco.com>
Signed-off-by: Peter Balogh <p.balogh.sa@gmail.com>
Co-authored-by: Peter Balogh <p.balogh.sa@gmail.com>
Co-authored-by: Mauro Sardara <11283032+msardara@users.noreply.github.com>

Author: 3 people

.github/actions/setup-k8s/action.yaml

@@ -18,18 +18,7 @@ inputs:
     description: 'Kind version'
     required: false
     default: "0.24.0"
-  kind-create-cluster:
-    description: 'Create kind K8s cluster'
-    required: false
-    default: "false"
-  kind-cluster-name:
-    description: 'Kind K8s cluster name to create'
-    required: false
-    default: "kind"
-  kind-cluster-gateway:
-    description: 'Gateway IP to use for kind server nodes. Useful when running actions inside containers.'
-    required: false
-    default: "127.0.0.1"
+
 runs:
   using: "composite"
   steps:
@@ -55,23 +44,3 @@ runs:
     - name: Setup kubectl
       uses: azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
 
-    #
-    # Setup cluster
-    #
-    - name: Setup Kind cluster
-      if: ${{ inputs.kind-create-cluster == 'true' }}
-      shell: bash
-      run: |
-        # Create cluster config
-        KIND_CONFIG_FILE=$(mktemp -p /tmp)
-        cat <<EOF > $KIND_CONFIG_FILE
-        kind: Cluster
-        apiVersion: kind.x-k8s.io/v1alpha4
-        networking:
-          apiServerAddress: "${{ inputs.kind-cluster-gateway }}"
-          apiServerPort: 6443
-        EOF
-
-        # Create cluster
-        kind create cluster --config $KIND_CONFIG_FILE --name ${{ inputs.kind-cluster-name }}
-        kubectl cluster-info

.github/workflows/release.yaml

@@ -35,8 +35,7 @@ jobs:
         id: resolve
         run: |
           # Export vars
-          tag=$(task version)
-          echo "image_tag=${tag}" >> "$GITHUB_OUTPUT"
+          echo "image_tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
 
       - name: List all targets
         id: all-targets

.github/workflows/test-integrations.yaml

@@ -59,13 +59,19 @@ jobs:
           task kind:create
         shell: bash
 
-      - name: Deploy Phoenix directory
+      - name: Deploy agntcy agp
         run: |
           cd integrations
           task test:env:gateway:deploy
         shell: bash
 
       - name: Run simple gateway tests
+        env:
+          AZURE_OPENAI_ENDPOINT: ${{ vars.AZURE_OPENAI_ENDPOINT }}
+          AZURE_MODEL_VERSION: ${{ vars.AZURE_MODEL_VERSION }}
+          AZURE_DEPLOYMENT_NAME: ${{ vars.AZURE_DEPLOYMENT_NAME }}
+          AZURE_OPENAI_API_VERSION: ${{ vars.AZURE_OPENAI_API_VERSION }}
+          AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
         run: |
           cd integrations
           task test:gateway

.github/workflows/test-samples.yaml

@@ -68,6 +68,12 @@ jobs:
           kind-version: "0.25.0"
 
       - name: Run tests
+        env:
+          AZURE_OPENAI_ENDPOINT: ${{ vars.AZURE_OPENAI_ENDPOINT }}
+          AZURE_MODEL_VERSION: ${{ vars.AZURE_MODEL_VERSION }}
+          AZURE_DEPLOYMENT_NAME: ${{ vars.AZURE_DEPLOYMENT_NAME }}
+          AZURE_OPENAI_API_VERSION: ${{ vars.AZURE_OPENAI_API_VERSION }}
+          AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
         run: |
           cd ${{ matrix.app }}
           task run:test

integrations/Taskfile.yaml

@@ -7,18 +7,20 @@ version: '3'
 silent: true
 
 vars:
-  KIND_CLUSTER_NAME: '{{ .KIND_CLUSTER_NAME | default "phoenix-test" }}'
+  KIND_CLUSTER_NAME: '{{ .KIND_CLUSTER_NAME | default "agntcy-test" }}'
 
   ## Image config
   IMAGE_REPO: '{{ .IMAGE_REPO | default "ghcr.io/agntcy" }}'
-  GATEWAY_IMAGE_TAG: '{{ .GATEWAY_IMAGE_TAG | default "0.1.0-rc0-2-g421c6ce" }}'
+  GATEWAY_IMAGE_TAG: '{{ .GATEWAY_IMAGE_TAG | default "0.1.0-rc0-10-g794c425" }}'
 
   IMAGE_BAKE_OPTS: '{{ .IMAGE_BAKE_OPTS | default "--set *.platform=linux/arm64" }}'
-  TEST_APP_TAG: '{{ .TEST_APP_TAG | default "v0.0.0-dev" }}'
+  TEST_APP_TAG: '{{ .TEST_APP_TAG | default "v0.0.1" }}'
 
   AZURE_OPENAI_API_KEY: '{{ .AZURE_OPENAI_API_KEY | default "" }}'
   AZURE_OPENAI_ENDPOINT: '{{ .AZURE_OPENAI_ENDPOINT | default "" }}'
 
+  HELM_NAMESPACE:  '{{ .HELM_NAMESPACE | default "default" }}'
+
 
 tasks:
   default:
@@ -30,15 +32,14 @@ tasks:
     cmds:
       - kind create cluster --name {{.KIND_CLUSTER_NAME}} --wait 60s || true
       - kubectl cluster-info --context kind-{{.KIND_CLUSTER_NAME}}
-      - task: kind:load-images
 
   kind:destroy:
     desc: Destroy kind cluster
     cmds:
       - kind delete cluster --name {{.KIND_CLUSTER_NAME}}
 
   kind:load-images:
-    internal: true
+    desc: Pull and load images to kind
     cmds:
       # pull images
       - docker pull {{.IMAGE_REPO}}/agp/gw:{{.GATEWAY_IMAGE_TAG}}
@@ -48,24 +49,24 @@ tasks:
   k8s:port-forward:setup:gateway:
     internal: true
     cmds:
-      - kubectl port-forward svc/agntcy-agp-gateway -n default 46357 &
+      - kubectl port-forward svc/agntcy-agp -n {{ .HELM_NAMESPACE }} 46357 &
       - sleep 1
 
   k8s:port-forward:teardown:gateway:
     internal: true
     cmds:
-      - kill -9 $(ps aux | grep port-forward | grep agntcy-agp-gateway | awk '{print $2}') || true
+      - kill -9 $(ps aux | grep port-forward | grep agntcy-agp | awk '{print $2}') || true
 
   test:env:gateway:deploy:
-    desc: Deploy Phoenix gateway test env
-    vars:
-      HELM_NAMESPACE:  '{{ .HELM_NAMESPACE | default "default" }}'
+    desc: Deploy agent gateway test env
+    deps:
+      - kind:load-images
     cmds:
       - |
         helm dependency build ./agntcy-agp/components/helm
         helm upgrade agntcy-agp \
           ./agntcy-agp/components/helm \
-          --set gateway.image.tag="{{ .GATEWAY_IMAGE_TAG }}" \
+          --set agp.image.tag="{{ .GATEWAY_IMAGE_TAG }}" \
           --namespace {{ .HELM_NAMESPACE }} \
           --create-namespace \
           --install \
@@ -74,17 +75,15 @@ tasks:
           --timeout "15m"
 
   test:env:gateway:cleanup:
-    desc: Remove Phoenix gateway test env
-    vars:
-      HELM_NAMESPACE: '{{ .HELM_NAMESPACE | default "default" }}'
+    desc: Remove agent gateway test env
     cmds:
       - helm delete --namespace {{ .HELM_NAMESPACE }} agntcy-agp
 
   build:gateway:agentic-apps:
     desc: Build agentic containers
     dir: ./agntcy-agp/agentic-apps
     cmds:
-      - docker buildx bake {{ .IMAGE_BAKE_OPTS }} --load
+      - IMAGE_TAG={{ .TEST_APP_TAG }} docker buildx bake {{ .IMAGE_BAKE_OPTS }} --load
 
   test:autogen-agent:run:
     internal: true
@@ -125,6 +124,7 @@ tasks:
       - defer: { task: k8s:port-forward:teardown:gateway }
       - task: test:autogen-agent:run
       - defer: { task: test:autogen-agent:remove }
+      - docker pull {{ .IMAGE_REPO }}/csit/test-langchain-agent:{{ .TEST_APP_TAG }}
       - IMAGE_REPO={{.IMAGE_REPO}} TEST_APP_TAG={{.TEST_APP_TAG}} go test ./agntcy-agp/tests -v -failfast -test.v -test.paniconexit0 -ginkgo.timeout 30m -timeout 30m -ginkgo.v
 
   version:

integrations/agntcy-agp/agentic-apps/autogen_agent/Dockerfile

@@ -9,9 +9,6 @@ ENV POETRY_HOME=/opt/poetry
 ENV POETRY_VENV=/opt/poetry-venv
 ENV POETRY_CACHE_DIR=/opt/.cache
 
-ARG POETRY_HTTP_BASIC_DEVHUBCLOUD_USERNAME
-ARG POETRY_HTTP_BASIC_DEVHUBCLOUD_PASSWORD
-
 # Install rust
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
 

integrations/agntcy-agp/agentic-apps/autogen_agent/autogen_agent.py

@@ -2,26 +2,34 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import asyncio
-# import phoenix
 from simple_agentic_app.simple_agentic_app import simple_autogen_app
 
 import argparse
-import gateway_bindings
+import agp_bindings
 
-phoenix = gateway_bindings.Phoenix()
+gateway = agp_bindings.Gateway()
 
-async def run_agent(gateway):
+async def run_agent(address):
     agent = simple_autogen_app()
 
-    # register local agent
-    await phoenix.create_agent("cisco", "default", "autogen")
+    local_organization = "cisco"
+    local_namespace = "default"
+    local_agent = "autogen"
 
-    # connect to gateway server
-    await phoenix.connect(gateway)
+    # Connect to the gateway server
+    local_agent_id = await gateway.create_agent(
+        local_organization, local_namespace, local_agent
+    )
+
+    # Connect to the service and subscribe for the local name
+    _ = await gateway.connect(address, insecure=True)
+    await gateway.subscribe(
+        local_organization, local_namespace, local_agent, local_agent_id
+    )
 
     while True:
         # receive messages
-        src, msg = await phoenix.receive()
+        src, msg = await gateway.receive()
 
         # handle received messages
         result = await agent.initate_chat(msg)
@@ -32,7 +40,7 @@ async def run_agent(gateway):
         weather_question = result.inner_messages[-1].content[-1].content.split(":")
         if weather_question[0] == "WEATHER":
             print("about to send back: ", weather_question[1])
-            await phoenix.publish_to(weather_question[1].encode(), src)
+            await gateway.publish_to(weather_question[1].encode(), src)
 
 def main():
     parser = argparse.ArgumentParser(description="Command line client for message passing.")