fix: circular import in arcade.core (#137)

Fixes a circular import issue where `arcade.sdk -> arcade.core` but also
`arcade.core -> arcade.sdk`. My mistake!

Moved some of the shared classes down into `core`, and re-exported them
to `sdk` to keep the expected interface for devs.

arcade/arcade/core/catalog.py

@@ -23,6 +23,8 @@ from pydantic import BaseModel, Field, create_model
 from pydantic.fields import FieldInfo
 from pydantic_core import PydanticUndefined
 
+from arcade.core.annotations import Inferrable
+from arcade.core.auth import OAuth2, ToolAuthorization
 from arcade.core.errors import ToolDefinitionError
 from arcade.core.schema import (
     TOOL_NAME_SEPARATOR,
@@ -46,8 +48,6 @@ from arcade.core.utils import (
     is_union,
     snake_to_pascal_case,
 )
-from arcade.sdk.annotations import Inferrable
-from arcade.sdk.auth import OAuth2, ToolAuthorization
 
 InnerWireType = Literal["string", "integer", "number", "boolean", "json"]
 WireType = Union[InnerWireType, Literal["array"]]

arcade/arcade/sdk/annotations/__init__.py

@@ -0,0 +1,3 @@
+from arcade.core.annotations import Inferrable
+
+__all__ = ["Inferrable"]

arcade/arcade/sdk/auth/__init__.py

@@ -0,0 +1,23 @@
+from arcade.core.auth import (
+    GitHub,
+    Google,
+    LinkedIn,
+    OAuth2,
+    Slack,
+    Spotify,
+    ToolAuthorization,
+    X,
+    Zoom,
+)
+
+__all__ = [
+    "GitHub",
+    "Google",
+    "LinkedIn",
+    "OAuth2",
+    "Slack",
+    "Spotify",
+    "ToolAuthorization",
+    "X",
+    "Zoom",
+]

examples/fastapi/arcade_example_fastapi/main.py

@@ -12,14 +12,14 @@ client = AsyncOpenAI(api_key=os.environ["ARCADE_API_KEY"], base_url="http://loca
 
 app = FastAPI()
 
-actor_secret = os.environ.get("ARCADE_ACTOR_SECRET")
+actor_secret = os.environ["ARCADE_ACTOR_SECRET"]
 actor = FastAPIActor(app, secret=actor_secret)
 actor.register_toolkit(Toolkit.from_module(arcade_math))
 
 
 class ChatRequest(BaseModel):
     message: str
-    user_id: str
+    user_id: str | None = None
 
 
 @app.post("/chat")
@@ -33,14 +33,13 @@ async def postChat(request: ChatRequest, tool_choice: str = "execute"):
             model="gpt-4o-mini",
             max_tokens=500,
             tools=[
-                # "Google.GetEmails",
+                "Math.Add",
-                # "Google.SearchEmailsByHeader",
+                "Math.Subtract",
-                # "Google.WriteDraft",
+                "Math.Multiply",
-                # "GitHub.CountStargazers",
+                "Math.Divide",
-                # "GitHub.SetStarred",
+                "Math.Sqrt",
-                # "GitHub.SearchIssues",
+                # Other tools can be added as needed:
-                # "Slack.SendDmToUser",
+                # "Math.SumList"
-                # "Slack.SendMessageToChannel",
             ],
             tool_choice=tool_choice,
             user=request.user_id,