genai-function-calling: updates deps and adds podman/ramalama instructions

genai-function-calling/README.md

@@ -78,5 +78,27 @@ http://localhost:5601/app/apm/traces?rangeFrom=now-15m&rangeTo=now
 
 ![Kibana screenshot](./kibana-trace.png)
 
+## Prerequisites
+
+Docker or Podman is required. You'll also need an OpenAI API compatible
+inference platform and an OpenTelemetry collector.
+
+First of all, you need to be in a directory that contains this repository. If
+you haven't yet, you get one like this:
+```bash
+curl -L https://github.com/elastic/observability-examples/archive/refs/heads/main.tar.gz | tar -xz
+cd observability-examples-main/genai-function-calling/
+```
+
+### Podman
+
+If you are using [Podman](https://podman.io/) to run docker containers, export
+`HOST_IP`. If you don't you'll get this error running exercises:
+> unable to upgrade to tcp, received 500
+
+Here's how to export your `HOST_IP`:
+  * If macOS: `export HOST_IP=$(ipconfig getifaddr en0)`
+  * If Ubuntu: `export HOST_IP=$(hostname -I | awk '{print $1}')`
+
 ---
-[native]: https://opentelemetry.io/docs/languages/java/instrumentation/#native-instrumentation
+[native]: https://opentelemetry.io/docs/languages/java/instrumentation/#native-instrumentation

genai-function-calling/openai-agents/Dockerfile

@@ -1,12 +1,6 @@
 # Use glibc-based image with pre-compiled wheels for psutil
 FROM python:3.12-slim
 
-# TODO: temporary until openai-agents 0.0.5
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends git \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
 RUN --mount=type=cache,target=/root/.cache/pip python -m pip install --upgrade pip
 
 COPY requirements.txt /tmp
@@ -15,4 +9,4 @@ RUN --mount=type=cache,target=/root/.cache/pip edot-bootstrap --action=install
 
 COPY main.py /
 
-CMD [ "python", "main.py" ]
+CMD [ "opentelemetry-instrument", "python", "main.py" ]

genai-function-calling/openai-agents/docker-compose.yml

@@ -6,4 +6,4 @@ services:
     env_file:
       - .env
     extra_hosts:  # send localhost traffic to the docker host, e.g. your laptop
-      - "localhost:host-gateway"
+      - "localhost:${HOST_IP:-host-gateway}"

genai-function-calling/openai-agents/env.example

@@ -8,6 +8,13 @@ OPENAI_API_KEY=
 # # leave it out, you need to update this to qwen2.5:3b to proceed the tool call.
 # CHAT_MODEL=qwen2.5:0.5b
 
+# Uncomment to use RamaLama instead of OpenAI
+# OPENAI_BASE_URL=http://localhost:8080/v1
+# OPENAI_API_KEY=unused
+# # This works when you supply a major_version parameter in your prompt. If you
+# # leave it out, you need to update this to qwen2.5:3b to proceed the tool call.
+# CHAT_MODEL=qwen2.5:0.5b
+
 # Uncomment and complete if you want to use Azure OpenAI Service
 ## "Azure OpenAI Endpoint" in https://oai.azure.com/resource/overview
 # AZURE_OPENAI_ENDPOINT=https://YOUR_RESOURCE_NAME.openai.azure.com/

genai-function-calling/openai-agents/requirements.txt

@@ -1,5 +1,4 @@
-# TODO: temporary until openai-agents 0.0.5
-openai-agents @ git+https://github.com/openai/openai-agents-python.git@main
+openai-agents~=0.0.5
 httpx~=0.28.1
 
 elastic-opentelemetry~=0.8.0

genai-function-calling/semantic-kernel-dotnet/Dockerfile

@@ -1,7 +1,7 @@
 ARG DOTNET_VERSION=9.0
 
 FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-alpine AS edot
-ARG EDOT_VERSION=1.0.0-beta.1
+ARG EDOT_VERSION=1.0.0-beta.2
 ARG EDOT_INSTALL=https://github.com/elastic/elastic-otel-dotnet/releases/download/${EDOT_VERSION}/elastic-dotnet-auto-install.sh
 ENV OTEL_DOTNET_AUTO_HOME=/edot
 WORKDIR /edot

genai-function-calling/semantic-kernel-dotnet/app.csproj

@@ -11,9 +11,9 @@
  </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.40.1" />
-    <PackageReference Include="Microsoft.SemanticKernel.Agents.Core" Version="1.40.1-preview" />
-    <PackageReference Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.40.1" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.42.0" />
+    <PackageReference Include="Microsoft.SemanticKernel.Agents.Core" Version="1.42.0-preview" />
+    <PackageReference Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.42.0" />
   </ItemGroup>
 
 </Project>

genai-function-calling/semantic-kernel-dotnet/docker-compose.yml

@@ -6,4 +6,4 @@ services:
     env_file:
       - .env
     extra_hosts:  # send localhost traffic to the docker host, e.g. your laptop
-      - "localhost:host-gateway"
+      - "localhost:${HOST_IP:-host-gateway}"

genai-function-calling/semantic-kernel-dotnet/env.example

@@ -8,6 +8,13 @@ OPENAI_API_KEY=
 # # leave it out, you need to update this to qwen2.5:3b to proceed the tool call.
 # CHAT_MODEL=qwen2.5:0.5b
 
+# Uncomment to use RamaLama instead of OpenAI
+# OPENAI_BASE_URL=http://localhost:8080/v1
+# OPENAI_API_KEY=unused
+# # This works when you supply a major_version parameter in your prompt. If you
+# # leave it out, you need to update this to qwen2.5:3b to proceed the tool call.
+# CHAT_MODEL=qwen2.5:0.5b
+
 # Uncomment and complete if you want to use Azure OpenAI Service
 ## "Azure OpenAI Endpoint" in https://oai.azure.com/resource/overview
 # AZURE_OPENAI_ENDPOINT=https://YOUR_RESOURCE_NAME.openai.azure.com/

genai-function-calling/spring-ai/.mvn/wrapper/maven-wrapper.properties

@@ -6,7 +6,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#   https://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -16,4 +16,4 @@
 # under the License.
 wrapperVersion=3.3.2
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

genai-function-calling/spring-ai/docker-compose.yml

@@ -6,4 +6,4 @@ services:
     env_file:
       - .env
     extra_hosts:  # send localhost traffic to the docker host, e.g. your laptop
-      - "localhost:host-gateway"
+      - "localhost:${HOST_IP:-host-gateway}"

genai-function-calling/spring-ai/env.example

@@ -8,6 +8,13 @@ OPENAI_API_KEY=
 # # leave it out, you need to update this to qwen2.5:3b to proceed the tool call.
 # CHAT_MODEL=qwen2.5:0.5b
 
+# Uncomment to use RamaLama instead of OpenAI
+# OPENAI_BASE_URL=http://localhost:8080/v1
+# OPENAI_API_KEY=unused
+# # This works when you supply a major_version parameter in your prompt. If you
+# # leave it out, you need to update this to qwen2.5:3b to proceed the tool call.
+# CHAT_MODEL=qwen2.5:0.5b
+
 # Uncomment and complete if you want to use Azure OpenAI Service
 ## "Azure OpenAI Endpoint" in https://oai.azure.com/resource/overview
 # AZURE_OPENAI_ENDPOINT=https://YOUR_RESOURCE_NAME.openai.azure.com/

genai-function-calling/spring-ai/mvnw

@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    https://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an