[FIX]

The-Swarm-Corporation · Aug 15, 2024 · 0109abd · 0109abd
1 parent 24355f6
commit 0109abd
Show file tree

Hide file tree

Showing 10 changed files with 93 additions and 175 deletions.
diff --git a/api.py b/api.py
@@ -8,7 +8,7 @@
 from swarms import Agent, OpenAIChat
 from swarms.utils.loguru_logger import logger
 from swarms_cloud.schema.cog_vlm_schemas import ChatCompletionResponse, UsageInfo
-from agent_api_schemas import (
+from swarms_cloud.schema.agent_api_schemas import (
     AgentInput,
     AgentOutput,
     ModelList,
@@ -127,7 +127,7 @@ async def create_agent(request: Request, agent_input: AgentInput):
     # Dict
     agent_dict = agent.to_dict()
 
-    creation_log = {
+    {
         "Timestamp": time.time(),
         "Agent": agent_dict,
         "IP": request.client.host,

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "swarms-cloud"
-version = "0.3.2"
+version = "0.3.4"
 description = "Swarms Cloud - Pytorch"
 license = "MIT"
 authors = ["Kye Gomez <[email protected]>"]

diff --git a/swarms_cloud/__init__.py b/swarms_cloud/__init__.py
@@ -1,83 +1,3 @@
-from swarms_cloud.check_model_list import (
-    create_error_response,
-)
-from swarms_cloud.utils.calculate_pricing import calculate_pricing, count_tokens
-from swarms_cloud.loggers.log_api_request_to_supabase import (
-    ModelAPILogEntry,
-    log_to_supabase,
-)
-from swarms_cloud.schema.openai_protocol import (  # noqa: E501
-    ChatCompletionRequest,
-    ChatCompletionRequestQos,
-    ChatCompletionResponse,
-    ChatCompletionResponseChoice,
-    ChatCompletionResponseStreamChoice,
-    ChatCompletionStreamResponse,
-    ChatMessage,
-    CompletionRequest,
-    CompletionRequestQos,
-    CompletionResponse,
-    CompletionResponseChoice,
-    CompletionResponseStreamChoice,
-    CompletionStreamResponse,
-    DeltaMessage,
-    EmbeddingsRequest,
-    EncodeRequest,
-    EncodeResponse,
-    ErrorResponse,
-    GenerateRequest,
-    GenerateRequestQos,
-    GenerateResponse,
-    GenerationConfig,
-    ModelCard,
-    ModelList,
-    ModelPermission,
-    UsageInfo,
-)
-from swarms_cloud.schema.openai_spec import (
-    InputOpenAISpec,
-    OpenAIAPIWrapper,
-    OutputOpenAISpec,
-)
-from swarms_cloud.utils.api_key_generator import generate_api_key
-from swarms_cloud.utils.rate_limiter import rate_limiter
-from swarms_cloud.models import *
-
-__all__ = [
-    "create_error_response",
-    "calculate_pricing",
-    "count_tokens",
-    "ModelAPILogEntry",
-    "log_to_supabase",
-    "ChatCompletionRequest",
-    "ChatCompletionRequestQos",
-    "ChatCompletionResponse",
-    "ChatCompletionResponseChoice",
-    "ChatCompletionResponseStreamChoice",
-    "ChatCompletionStreamResponse",
-    "ChatMessage",
-    "CompletionRequest",
-    "CompletionRequestQos",
-    "CompletionResponse",
-    "CompletionResponseChoice",
-    "CompletionResponseStreamChoice",
-    "CompletionStreamResponse",
-    "DeltaMessage",
-    "EmbeddingsRequest",
-    "EncodeRequest",
-    "EncodeResponse",
-    "ErrorResponse",
-    "GenerateRequest",
-    "GenerateRequestQos",
-    "GenerateResponse",
-    "GenerationConfig",
-    "ModelCard",
-    "ModelList",
-    "ModelPermission",
-    "UsageInfo",
-    "InputOpenAISpec",
-    "OpenAIAPIWrapper",
-    "OutputOpenAISpec",
-    "generate_api_key",
-    "rate_limiter",
-]
+from swarms_cloud.utils import *
+from swarms_cloud.schema import *
+from swarms_cloud.loggers import *
diff --git a/swarms_cloud/loggers/__init__.py b/swarms_cloud/loggers/__init__.py
@@ -0,0 +1,9 @@
+from swarms_cloud.loggers.log_api_request_to_supabase import (
+    ModelAPILogEntry,
+    log_to_supabase,
+)
+
+__all__ = [
+    "ModelAPILogEntry",
+    "log_to_supabase",
+]
diff --git a/swarms_cloud/models/__init__.py b/swarms_cloud/models/__init__.py
diff --git a/swarms_cloud/models/pali_gemma.py b/swarms_cloud/models/pali_gemma.py
diff --git a/swarms_cloud/schema/__init__.py b/swarms_cloud/schema/__init__.py
@@ -1,14 +1,75 @@
-from agent_api_schemas import (
+from swarms_cloud.schema.agent_api_schemas import (
     AgentInput,
+    AgentOutput,
+    ModelList,
     ModelSchema,
+)
+from swarms_cloud.schema.openai_protocol import (  # noqa: E501
+    ChatCompletionRequest,
+    ChatCompletionRequestQos,
+    ChatCompletionResponse,
+    ChatCompletionResponseChoice,
+    ChatCompletionResponseStreamChoice,
+    ChatCompletionStreamResponse,
+    ChatMessage,
+    CompletionRequest,
+    CompletionRequestQos,
+    CompletionResponse,
+    CompletionResponseChoice,
+    CompletionResponseStreamChoice,
+    CompletionStreamResponse,
+    DeltaMessage,
+    EmbeddingsRequest,
+    EncodeRequest,
+    EncodeResponse,
+    ErrorResponse,
+    GenerateRequest,
+    GenerateRequestQos,
+    GenerateResponse,
+    GenerationConfig,
+    ModelCard,
     ModelList,
-    AgentOutput,
+    ModelPermission,
+    UsageInfo,
+)
+from swarms_cloud.schema.openai_spec import (
+    InputOpenAISpec,
+    OpenAIAPIWrapper,
+    OutputOpenAISpec,
 )
-
 
 __all__ = [
     "AgentInput",
     "ModelSchema",
     "ModelList",
     "AgentOutput",
+    "ChatCompletionRequest",
+    "ChatCompletionRequestQos",
+    "ChatCompletionResponse",
+    "ChatCompletionResponseChoice",
+    "ChatCompletionResponseStreamChoice",
+    "ChatCompletionStreamResponse",
+    "ChatMessage",
+    "CompletionRequest",
+    "CompletionRequestQos",
+    "CompletionResponse",
+    "CompletionResponseChoice",
+    "CompletionResponseStreamChoice",
+    "CompletionStreamResponse",
+    "DeltaMessage",
+    "EmbeddingsRequest",
+    "EncodeRequest",
+    "EncodeResponse",
+    "ErrorResponse",
+    "GenerateRequest",
+    "GenerateRequestQos",
+    "GenerateResponse",
+    "GenerationConfig",
+    "ModelCard",
+    "ModelList",
+    "ModelPermission",
+    "UsageInfo",
+    "InputOpenAISpec",
+    "OpenAIAPIWrapper",
+    "OutputOpenAISpec",
 ]
diff --git a/agent_api_schemas.py → swarms_cloud/schema/agent_api_schemas.py b/agent_api_schemas.py → swarms_cloud/schema/agent_api_schemas.py
@@ -5,9 +5,6 @@
 
 from swarms_cloud.schema.cog_vlm_schemas import (
     AgentChatCompletionResponse,
-    ChatCompletionResponseChoice,
-    ChatCompletionResponse,
-    ChatMessageResponse,
 )
 
 
@@ -133,4 +130,3 @@ class ParallelSwarmAPIOutput(BaseModel):
     )
     created_at: int = time.time()
     owned_by: str = "TGSC"
-
diff --git a/swarms_cloud/utils/__init__.py b/swarms_cloud/utils/__init__.py
@@ -0,0 +1,14 @@
+from swarms_cloud.utils.api_key_generator import generate_api_key
+from swarms_cloud.utils.calculate_pricing import calculate_pricing, count_tokens
+from swarms_cloud.utils.rate_limiter import rate_limiter
+from swarms_cloud.utils.check_model_list import (
+    create_error_response,
+)
+
+__all__ = [
+    "generate_api_key",
+    "calculate_pricing",
+    "count_tokens",
+    "rate_limiter",
+    "create_error_response",
+]
diff --git a/swarms_cloud/check_model_list.py → swarms_cloud/utils/check_model_list.py b/swarms_cloud/check_model_list.py → swarms_cloud/utils/check_model_list.py