Fix to documentskill (#112)

microsoft · Oct 9, 2024 · 15ed701 · 15ed701
1 parent d9c5bc4
commit 15ed701
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/assistants/prospector-assistant/assistant/agents/skills/controller.py b/assistants/prospector-assistant/assistant/agents/skills/controller.py
@@ -4,7 +4,7 @@
 
 import openai_client
 from chat_driver import ChatDriverConfig
-from document_skill import DocumentContext, DocumentSkill
+from document_skill import DocumentSkillContext, DocumentSkill
 from events import events as skill_events
 from posix_skill import PosixSkill
 from prospector_skill import ProspectorSkill
@@ -150,7 +150,7 @@ async def create_assistant(
         document_skill = DocumentSkill(
             # FIXME: This is a temporary solution to get the file to be saved - we need to implement a proper solution
             # context=assistant.context,
-            context=DocumentContext(),
+            context=DocumentSkillContext(),
             chat_driver_config=ChatDriverConfig(
                 openai_client=async_client,
                 model=chat_driver_config.openai_model,

diff --git a/assistants/skill-assistant/assistant/skill_controller.py b/assistants/skill-assistant/assistant/skill_controller.py
@@ -4,9 +4,8 @@
 
 import openai_client
 from chat_driver import ChatDriverConfig
-from events import events as skill_events
 from document_skill import DocumentSkill
-
+from events import events as skill_events
 from posix_skill import PosixSkill
 from semantic_workbench_api_model.workbench_model import (
     MessageType,
@@ -164,6 +163,11 @@ async def create_assistant(
 
         document_skill = DocumentSkill(
             context=assistant.context,
+            chat_driver_config=ChatDriverConfig(
+                openai_client=async_client,
+                data_dir=data_dir / "document-skill-chat-driver",
+                model=chat_driver_config.openai_model,
+            ),
         )
 
         # Register the skills with the assistant.

diff --git a/libraries/python/skills/skills/document-skill/document_skill/document_skill.py b/libraries/python/skills/skills/document-skill/document_skill/document_skill.py
@@ -23,7 +23,6 @@ class Content(BaseModel):
     # data associated with it... not sure what more at this point.
 
 
-
 class Paper(BaseModel):
     version: int = 0
     contents: list[Content] = []
@@ -43,6 +42,7 @@ class DocumentSkill(Skill):
     def __init__(
         self,
         context: Context,
+        chat_driver_config: ChatDriverConfig,
     ) -> None:
         self.document_skill_context: DocumentSkillContext = DocumentSkillContext()
 
@@ -73,7 +73,6 @@ def __init__(
         # the skill's chat driver is used to forward available skill commands and functions to
         # any higher level assistant that has those skills registered.
         #####
-        chat_driver_config = ChatDriverConfig()
         chat_driver_config.commands = actions
         chat_driver_config.functions = actions