Merge pull request #434 from PrefectHQ/fixes-circular-imports-from-op…

…enai

fix circular imports

src/marvin/functions/__init__.py

@@ -4,7 +4,7 @@
 from typing import Callable, TypeVar, Optional, Any, Type
 
 from fastapi.routing import APIRouter
-from marvin.openai.Function import marvin_fn
+
 from marvin.utilities.types import function_to_model
 
 
@@ -80,6 +80,9 @@ def decorator(fn: Callable[[A], T] = None) -> Callable[[A], T]:
     return decorator
 
 
+marvin_fn = FunctionDecoratorFactory(name="openai", func_class=Function)
+
+
 class FunctionRegistry(APIRouter):
     def __init__(self, function_decorator=marvin_fn, *args, **kwargs):
         super().__init__(*args, **kwargs)

src/marvin/openai/Function/Registry/__init__.py

@@ -3,7 +3,7 @@
 from pydantic import BaseModel, validate_arguments
 from marvin.utilities.types import function_to_model
 from marvin.models.messages import Message
-from marvin.openai.Function import marvin_fn, openai_fn
+from marvin.openai.Function import openai_fn
 from openai.openai_object import OpenAIObject
 from marvin.functions import FunctionRegistry