Merge branch 'microsoft:main' into workflow-lite

libraries/python/semantic-workbench-assistant/semantic_workbench_assistant/assistant_service.py

@@ -74,26 +74,14 @@ def __init__(
 
         @asynccontextmanager
         async def lifespan() -> AsyncIterator[None]:
-            # connect to workbench on startup
             logger.info(
-                "connecting to semantic-workbench-service on startup; workbench_service_url: %s, assistant_service_id: %s, callback_url: %s",
+                "connecting to semantic-workbench-service; workbench_service_url: %s, assistant_service_id: %s, callback_url: %s",
                 settings.workbench_service_url,
                 self.service_id,
                 settings.callback_url,
             )
 
             async with self.workbench_client.for_service() as service_client:
-                try:
-                    await self._ping_semantic_workbench(service_client)
-                    logger.info(
-                        "connected to semantic-workbench-service on startup; workbench_service_url: %s, assistant_service_id: %s, callback_url: %s",
-                        settings.workbench_service_url,
-                        self.service_id,
-                        settings.callback_url,
-                    )
-                except httpx.HTTPError:
-                    logger.warning("failed to connect workbench on startup", exc_info=True)
-
                 # start periodic pings to workbench
                 ping_task = asyncio.create_task(
                     self._periodically_ping_semantic_workbench(service_client), name="ping-workbench"
@@ -116,16 +104,16 @@ async def _periodically_ping_semantic_workbench(
     ) -> NoReturn:
         while True:
             try:
-                jitter = random.uniform(0, settings.workbench_service_ping_interval_seconds / 2.0)
-                await asyncio.sleep(settings.workbench_service_ping_interval_seconds + jitter)
-
                 try:
                     await self._ping_semantic_workbench(client)
                 except httpx.HTTPError:
-                    logger.error("ping to workbench failed", exc_info=True)
+                    logger.exception("ping to workbench failed")
+
+                jitter = random.uniform(0, settings.workbench_service_ping_interval_seconds / 2.0)
+                await asyncio.sleep(settings.workbench_service_ping_interval_seconds + jitter)
 
             except Exception:
-                logger.exception("unexpected error in ping loop", exc_info=True)
+                logger.exception("unexpected error in ping loop")
 
     @backoff.on_exception(
         backoff.expo,

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",
 ]

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,

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,