From 6f5c1886c4c47037db2f7ed9d4afc092cf59858f Mon Sep 17 00:00:00 2001
From: Mark Waddle <markwaddle@users.noreply.github.com>
Date: Wed, 20 Nov 2024 11:34:14 -0800
Subject: [PATCH] Fix circular imports in form_filler_skill (#257)

---
 .../form_filler_skill/guided_conversation/__init__.py |  4 ----
 .../chat_drivers/fix_artifact_error.py                | 11 +++++++++--
 .../chat_drivers/generate_artifact_updates.py         |  7 +------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/__init__.py b/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/__init__.py
index 55ab367e..7a004fcc 100644
--- a/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/__init__.py
+++ b/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/__init__.py
@@ -1,9 +1,5 @@
-import logging
-
 from .guided_conversation_skill import GuidedConversationSkill
 
-logger = logging.getLogger(__name__)
-
 __all__ = [
     "GuidedConversationSkill",
 ]
diff --git a/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/chat_drivers/fix_artifact_error.py b/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/chat_drivers/fix_artifact_error.py
index 7fef2c38..b9cfcd20 100644
--- a/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/chat_drivers/fix_artifact_error.py
+++ b/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/chat_drivers/fix_artifact_error.py
@@ -1,3 +1,4 @@
+import logging
 from typing import Any
 
 from form_filler_skill.guided_conversation.message import Conversation, ConversationMessageType
@@ -10,11 +11,12 @@
     message_from_completion,
     validate_completion,
 )
+from pydantic import BaseModel
 from skill_library.types import LanguageModel
 
-from .. import logger
 from ..artifact import Artifact
-from .generate_artifact_updates import UpdateAttempt
+
+logger = logging.getLogger(__name__)
 
 ARTIFACT_ERROR_CORRECTION_SYSTEM_TEMPLATE = """You are a helpful, thoughtful, and meticulous assistant.
 
@@ -36,6 +38,11 @@
 """
 
 
+class UpdateAttempt(BaseModel):
+    field_value: str
+    error: str
+
+
 async def generate_artifact_field_update_error_fix(
     language_model: LanguageModel,
     artifact: Artifact,
diff --git a/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/chat_drivers/generate_artifact_updates.py b/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/chat_drivers/generate_artifact_updates.py
index a9e08a5d..18657355 100644
--- a/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/chat_drivers/generate_artifact_updates.py
+++ b/libraries/python/skills/skills/form-filler-skill/form_filler_skill/guided_conversation/chat_drivers/generate_artifact_updates.py
@@ -14,7 +14,7 @@
 
 from ..artifact import Artifact
 from ..message import Conversation
-from .fix_artifact_error import generate_artifact_field_update_error_fix
+from .fix_artifact_error import UpdateAttempt, generate_artifact_field_update_error_fix
 
 logger = logging.getLogger(__name__)
 
@@ -61,11 +61,6 @@ class ArtifactUpdates(BaseModel):
     updates: list[ArtifactUpdate]
 
 
-class UpdateAttempt(BaseModel):
-    field_value: str
-    error: str
-
-
 async def generate_artifact_updates(
     language_model: LanguageModel,
     definition: GCDefinition,