Removes ChatDriver library. Adds to openai-client.

microsoft · Nov 12, 2024 · ac90828 · ac90828
1 parent 2c1160a
commit ac90828
Show file tree

Hide file tree

Showing 71 changed files with 414 additions and 2,390 deletions.
diff --git a/assistants/explorer-assistant/uv.lock b/assistants/explorer-assistant/uv.lock
diff --git a/assistants/guided-conversation-assistant/uv.lock b/assistants/guided-conversation-assistant/uv.lock
diff --git a/assistants/prospector-assistant/pyproject.toml b/assistants/prospector-assistant/pyproject.toml
@@ -6,35 +6,33 @@ authors = [{ name = "Semantic Workbench Team" }]
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
+    "assistant-extensions[attachments]>=0.1.0",
+    "content-safety>=0.1.0",
     "deepmerge>=2.0",
+    "document-skill>=0.1.0",
+    "guided-conversation>=0.1.0",
     "html2docx>=1.6.0",
     "markdown>=3.6",
+    "openai-client>=0.1.0",
     "openai>=1.3.9",
-    "content-safety>=0.1.0",
-    "chat-driver>=0.1.0",
-    "skill-library>=0.1.0",
     "posix-skill>=0.1.0",
     "prospector-skill>=0.1.0",
-    "document-skill>=0.1.0",
-    "guided-conversation>=0.1.0",
-    "openai-client>=0.1.0",
-    "assistant-extensions[attachments]>=0.1.0",
+    "skill-library>=0.1.0",
 ]
 
 [tool.uv]
 package = true
 
 [tool.uv.sources]
+assistant-drive = { path = "../../libraries/python/assistant-drive", editable = true }
+assistant-extensions = { path = "../../libraries/python/assistant-extensions", editable = true }
 content-safety = { path = "../../libraries/python/content-safety/", editable = true }
+document-skill = { path = "../../libraries/python/skills/skills/document-skill", editable = true }
 guided-conversation = { path = "../../libraries/python/guided-conversation", editable = true }
-chat-driver = { path = "../../libraries/python/chat-driver", editable = true }
-skill-library = { path = "../../libraries/python/skills/skill-library", editable = true }
+openai-client = { path = "../../libraries/python/openai-client", editable = true }
 posix-skill = { path = "../../libraries/python/skills/skills/posix-skill", editable = true }
 prospector-skill = { path = "../../libraries/python/skills/skills/prospector-skill", editable = true }
-document-skill = { path = "../../libraries/python/skills/skills/document-skill", editable = true }
-openai-client = { path = "../../libraries/python/openai-client", editable = true }
-assistant-drive = { path = "../../libraries/python/assistant-drive", editable = true }
-assistant-extensions = { path = "../../libraries/python/assistant-extensions", editable = true }
+skill-library = { path = "../../libraries/python/skills/skill-library", editable = true }
 
 [build-system]
 requires = ["hatchling"]

diff --git a/assistants/prospector-assistant/uv.lock b/assistants/prospector-assistant/uv.lock
diff --git a/assistants/skill-assistant/README.md b/assistants/skill-assistant/README.md
@@ -1,6 +1,6 @@
 # Skill Assistant
 
-The Skill Assistant serves as a demonstration of integrating the Skill Library within an Assistant in the Semantic Workbench. Specifically, this assistant showcases the Posix skill and the chat driver. The [Posix skill](../../libraries/python/skills/skills/posix-skill/README.md) demonstrates file system management by allowing the assistant to perform posix-style actions. The [chat driver](../../libraries/python/chat-driver/README.md) handles conversations and interacts with underlying AI models like OpenAI and Azure OpenAI.
+The Skill Assistant serves as a demonstration of integrating the Skill Library within an Assistant in the Semantic Workbench. Specifically, this assistant showcases the Posix skill and the chat driver. The [Posix skill](../../libraries/python/skills/skills/posix-skill/README.md) demonstrates file system management by allowing the assistant to perform posix-style actions. The [chat driver](../../libraries/python/openai-client/openai_client/chat_driver/README.md) handles conversations and interacts with underlying AI models like OpenAI and Azure OpenAI.
 
 ## Overview
 

diff --git a/assistants/skill-assistant/assistant/assistant_registry.py b/assistants/skill-assistant/assistant/assistant_registry.py
@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import List
 
-from chat_driver import ChatDriverConfig
+from openai_client.chat_driver import ChatDriverConfig
 from skill_library import Assistant, Skill
 
 from assistant.skill_event_mapper import SkillEventMapperProtocol

diff --git a/assistants/skill-assistant/assistant/config.py b/assistants/skill-assistant/assistant/config.py
@@ -86,7 +86,8 @@ class ChatDriverConfig(BaseModel):
     ] = "gpt-4o"
 
 
-# the workbench app builds dynamic forms based on the configuration model and UI schema
+# The workbench app builds dynamic forms based on the configuration model and UI
+# schema.
 class AssistantConfigModel(BaseModel):
     guardrails_prompt: Annotated[
         str,
@@ -129,6 +130,14 @@ class AssistantConfigModel(BaseModel):
         UISchema(widget="radio"),
     ] = CombinedContentSafetyEvaluatorConfig()
 
+    metadata_path: Annotated[
+        str,
+        Field(
+            title="Metadata Path",
+            description="The path for assistant metadata.",
+        ),
+    ] = ".data"
+
     # add any additional configuration fields
 
 

diff --git a/assistants/skill-assistant/assistant/skill_assistant.py b/assistants/skill-assistant/assistant/skill_assistant.py
@@ -11,8 +11,8 @@
 from pathlib import Path
 
 import openai_client
-from chat_driver import ChatDriverConfig
 from content_safety.evaluators import CombinedContentSafetyEvaluator
+from openai_client.chat_driver import ChatDriverConfig
 
 # from form_filler_skill import FormFillerSkill
 from posix_skill import PosixSkill