Adds uv.lock files to repo (#81)

And updates production installs (in Dockerfiles and in workflows) to use lock files and not update them
microsoft · Oct 2, 2024 · 2b8b44f · 2b8b44f
1 parent c9f6c8d
commit 2b8b44f
Show file tree

Hide file tree

Showing 30 changed files with 18,632 additions and 113 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -24,10 +24,7 @@
       "nvmVersion": "latest"
     },
     "ghcr.io/devcontainers/features/azure-cli:1": {},
-    "ghcr.io/devcontainers/features/docker-in-docker:2": {},
-    "ghcr.io/robbert229/devcontainer-features/postgresql-client:1": {
-      "version": 15
-    }
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
   },
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   "forwardPorts": [

diff --git a/.github/workflows/workbench-app.yml b/.github/workflows/workbench-app.yml
@@ -41,7 +41,7 @@ jobs:
 
       - name: pnpm install
         working-directory: ./workbench-app
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: pnpm build
         env:
@@ -76,7 +76,7 @@ jobs:
 
       - name: pnpm install
         working-directory: ./workbench-app
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: pnpm build
         env:

diff --git a/.gitignore b/.gitignore
@@ -11,8 +11,6 @@ appsettings.*.json
 
 # Dependencies and build cache
 node_modules
-poetry.lock
-uv.lock
 .venv
 __pycache__
 .pytest_cache

diff --git a/assistants/prospector-assistant/uv.lock b/assistants/prospector-assistant/uv.lock
diff --git a/assistants/skill-assistant/uv.lock b/assistants/skill-assistant/uv.lock
diff --git a/examples/python/python-01-echo-bot/uv.lock b/examples/python/python-01-echo-bot/uv.lock
diff --git a/examples/python/python-02-simple-chatbot/uv.lock b/examples/python/python-02-simple-chatbot/uv.lock
diff --git a/examples/python/python-03-multimodel-chatbot/assistant/config.py b/examples/python/python-03-multimodel-chatbot/assistant/config.py
@@ -6,8 +6,7 @@
 import google.generativeai as genai
 import openai
 from anthropic import AsyncAnthropic
-from azure.identity.aio import (DefaultAzureCredential,
-                                get_bearer_token_provider)
+from azure.identity.aio import DefaultAzureCredential, get_bearer_token_provider
 from content_safety.evaluators import CombinedContentSafetyEvaluatorConfig
 from pydantic import BaseModel, ConfigDict, Field
 from semantic_workbench_assistant import config
@@ -359,10 +358,7 @@ class OllamaServiceConfig(ServiceConfig):
     ] = "ollama"
 
     def new_client(self, **kwargs) -> openai.AsyncOpenAI:
-        return openai.AsyncOpenAI(
-            base_url=f"{self.ollama_endpoint}",
-            api_key=self.openai_api_key
-        )
+        return openai.AsyncOpenAI(base_url=f"{self.ollama_endpoint}", api_key=self.openai_api_key)
 
 
 # endregion

diff --git a/examples/python/python-03-multimodel-chatbot/uv.lock b/examples/python/python-03-multimodel-chatbot/uv.lock
diff --git a/libraries/python/chat-driver/uv.lock b/libraries/python/chat-driver/uv.lock
diff --git a/libraries/python/content-safety/uv.lock b/libraries/python/content-safety/uv.lock
diff --git a/libraries/python/context/uv.lock b/libraries/python/context/uv.lock
diff --git a/libraries/python/events/uv.lock b/libraries/python/events/uv.lock
diff --git a/libraries/python/function-registry/uv.lock b/libraries/python/function-registry/uv.lock
diff --git a/libraries/python/semantic-workbench-api-model/uv.lock b/libraries/python/semantic-workbench-api-model/uv.lock
diff --git a/libraries/python/semantic-workbench-assistant/tests/test_assistant_app.py b/libraries/python/semantic-workbench-assistant/tests/test_assistant_app.py
@@ -207,8 +207,8 @@ async def get(self, context: ConversationContext) -> AssistantConversationInspec
 
     service = app.fastapi_app()
 
-    monkeypatch.setattr(assistant_service_client, "httpx_transport_factory", lambda:httpx.ASGITransport(app=service))
-    monkeypatch.setattr(workbench_service_client, "httpx_transport_factory", lambda:AllOKTransport())
+    monkeypatch.setattr(assistant_service_client, "httpx_transport_factory", lambda: httpx.ASGITransport(app=service))
+    monkeypatch.setattr(workbench_service_client, "httpx_transport_factory", lambda: AllOKTransport())
 
     async with LifespanManager(service):
         assistant_id = uuid.uuid4()
@@ -280,8 +280,8 @@ async def import_(self, conversation_context: ConversationContext, stream: IO[by
 
     service = app.fastapi_app()
 
-    monkeypatch.setattr(assistant_service_client, "httpx_transport_factory", lambda:httpx.ASGITransport(app=service))
-    monkeypatch.setattr(workbench_service_client, "httpx_transport_factory", lambda:AllOKTransport())
+    monkeypatch.setattr(assistant_service_client, "httpx_transport_factory", lambda: httpx.ASGITransport(app=service))
+    monkeypatch.setattr(workbench_service_client, "httpx_transport_factory", lambda: AllOKTransport())
 
     async with LifespanManager(service):
         assistant_id = uuid.uuid4()
@@ -355,8 +355,8 @@ class TestConfigModel(BaseModel):
 
     service = app.fastapi_app()
 
-    monkeypatch.setattr(assistant_service_client, "httpx_transport_factory", lambda:httpx.ASGITransport(app=service))
-    monkeypatch.setattr(workbench_service_client, "httpx_transport_factory", lambda:AllOKTransport())
+    monkeypatch.setattr(assistant_service_client, "httpx_transport_factory", lambda: httpx.ASGITransport(app=service))
+    monkeypatch.setattr(workbench_service_client, "httpx_transport_factory", lambda: AllOKTransport())
 
     async with LifespanManager(service):
         assistant_id = uuid.uuid4()

diff --git a/libraries/python/semantic-workbench-assistant/uv.lock b/libraries/python/semantic-workbench-assistant/uv.lock
diff --git a/libraries/python/skills/notebooks/uv.lock b/libraries/python/skills/notebooks/uv.lock
diff --git a/libraries/python/skills/skill-library/uv.lock b/libraries/python/skills/skill-library/uv.lock
diff --git a/libraries/python/skills/skills/document-skill/document_skill/__init__.py b/libraries/python/skills/skills/document-skill/document_skill/__init__.py
@@ -1,9 +1,9 @@
-from document_skill.document_skill import Attachment, DocumentContext # temp for dev testing purposes
+from document_skill.document_skill import Attachment, DocumentContext  # temp for dev testing purposes
 from document_skill.document_skill import DocumentSkill
 
 
 __all__ = [
     "Attachment",
     "DocumentContext",
     "DocumentSkill",
-    ]
+]