Fix import

src/wcgw_cli/anthropic_client.py

@@ -22,7 +22,17 @@
 from dotenv import load_dotenv
 from typer import Typer
 
-from src.wcgw.types_ import (
+from wcgw.client.common import discard_input
+from wcgw.client.memory import load_memory
+from wcgw.client.tools import (
+    DoneFlag,
+    ImageData,
+    default_enc,
+    get_tool_output,
+    initialize,
+    which_tool_name,
+)
+from wcgw.types_ import (
     BashCommand,
     BashInteraction,
     ContextSave,
@@ -36,16 +46,6 @@
     ScreenShot,
     WriteIfEmpty,
 )
-from src.wcgw.client.common import discard_input
-from src.wcgw.client.memory import load_memory
-from src.wcgw.client.tools import (
-    DoneFlag,
-    ImageData,
-    default_enc,
-    get_tool_output,
-    initialize,
-    which_tool_name,
-)
 
 History = list[MessageParam]
 
@@ -290,7 +290,11 @@ def loop(
         mode="wcgw",
     )
 
-    with open(os.path.join(os.path.dirname(__file__), "..", "wcgw", "client", "diff-instructions.txt")) as f:
+    with open(
+        os.path.join(
+            os.path.dirname(__file__), "..", "wcgw", "client", "diff-instructions.txt"
+        )
+    ) as f:
         system += f.read()
 
     if history:

src/wcgw_cli/cli.py

@@ -1,11 +1,11 @@
 import importlib
 from typing import Optional
-from typer import Typer
-import typer
 
-from src.wcgw_cli.openai_client import loop as openai_loop
-from src.wcgw_cli.anthropic_client import loop as claude_loop
+import typer
+from typer import Typer
 
+from wcgw_cli.anthropic_client import loop as claude_loop
+from wcgw_cli.openai_client import loop as openai_loop
 
 app = Typer(pretty_exceptions_show_locals=False)
 

src/wcgw_cli/openai_client.py

@@ -23,7 +23,17 @@
 from pydantic import BaseModel
 from typer import Typer
 
-from src.wcgw.types_ import (
+from wcgw.client.common import CostData, History, Models, discard_input
+from wcgw.client.memory import load_memory
+from wcgw.client.tools import (
+    DoneFlag,
+    ImageData,
+    default_enc,
+    get_tool_output,
+    initialize,
+    which_tool,
+)
+from wcgw.types_ import (
     BashCommand,
     BashInteraction,
     ContextSave,
@@ -33,17 +43,8 @@
     ResetShell,
     WriteIfEmpty,
 )
-from src.wcgw.client.common import CostData, History, Models, discard_input
-from src.wcgw.client.memory import load_memory
+
 from .openai_utils import get_input_cost, get_output_cost
-from src.wcgw.client.tools import (
-    DoneFlag,
-    ImageData,
-    default_enc,
-    get_tool_output,
-    initialize,
-    which_tool,
-)
 
 
 class Config(BaseModel):
@@ -235,7 +236,11 @@ def loop(
         mode="wcgw",
     )
 
-    with open(os.path.join(os.path.dirname(__file__), "..", "wcgw", "client", "diff-instructions.txt")) as f:
+    with open(
+        os.path.join(
+            os.path.dirname(__file__), "..", "wcgw", "client", "diff-instructions.txt"
+        )
+    ) as f:
         system += f.read()
 
     if not history: