From e9365c46782b0ba4724b9f75cc46c3dead4a06f7 Mon Sep 17 00:00:00 2001
From: Benjamin Berman <benjamin.s.berman@gmail.com>
Date: Wed, 23 Aug 2023 16:14:12 -0700
Subject: [PATCH] wip

---
 comfy/app/__init__.py             |  0
 comfy/cmd/server.py               | 13 +++++++++----
 comfy/for_developers/lib_comfy.py | 13 +++++++++++++
 comfy/nodes/package.py            |  2 +-
 setup.py                          |  2 +-
 5 files changed, 24 insertions(+), 6 deletions(-)
 delete mode 100644 comfy/app/__init__.py
 create mode 100644 comfy/for_developers/lib_comfy.py

diff --git a/comfy/app/__init__.py b/comfy/app/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/comfy/cmd/server.py b/comfy/cmd/server.py
index 61b574171..04a3750d8 100644
--- a/comfy/cmd/server.py
+++ b/comfy/cmd/server.py
@@ -12,7 +12,7 @@ from io import BytesIO
 import json
 import os
 import uuid
-from asyncio import Future
+from asyncio import Future, AbstractEventLoop
 from typing import List
 
 import aiofiles
@@ -75,6 +75,12 @@ class PromptServer():
     prompt_queue: execution.PromptQueue | None
     address: str
     port: int
+    loop: AbstractEventLoop
+    messages: asyncio.Queue
+    number: int
+    supports: List[str]
+    app: web.Application
+    routes: web.RouteTableDef
 
     def __init__(self, loop):
         PromptServer.instance = self
@@ -539,7 +545,6 @@ class PromptServer():
                 return web.Response(status=429,
                                     reason=f"the queue has {queue_size} elements and {queue_too_busy_size} is the limit for this worker")
             # read the request
-            upload_dir = PromptServer.get_upload_dir()
             prompt_dict: dict = {}
             if request.headers[aiohttp.hdrs.CONTENT_TYPE] == 'application/json':
                 prompt_dict = await request.json()
@@ -556,6 +561,7 @@ class PromptServer():
                         elif part.filename:
                             file_data = await part.read(decode=True)
                             # overwrite existing files
+                            upload_dir = PromptServer.get_upload_dir()
                             async with aiofiles.open(os.path.join(upload_dir, part.filename), mode='wb') as file:
                                 await file.write(file_data)
                 except IOError | MemoryError as ioError:
@@ -567,8 +573,7 @@ class PromptServer():
                 return web.Response(status=400, reason="no prompt was specified")
 
             content_digest = digest(prompt_dict)
-            dump = json.dumps(prompt_dict)
-            
+
             valid = execution.validate_prompt(prompt_dict)
             if not valid[0]:
                 return web.Response(status=400, body=valid[1])
diff --git a/comfy/for_developers/lib_comfy.py b/comfy/for_developers/lib_comfy.py
new file mode 100644
index 000000000..f8efd7b1b
--- /dev/null
+++ b/comfy/for_developers/lib_comfy.py
@@ -0,0 +1,13 @@
+from asyncio import AbstractEventLoop
+
+from ..cmd.execution import PromptQueue
+from ..cmd.server import PromptServer
+
+
+class Comfy:
+    loop: AbstractEventLoop
+    server: PromptServer
+    queue: PromptQueue
+
+    def __init__(self):
+        pass
diff --git a/comfy/nodes/package.py b/comfy/nodes/package.py
index 46ecbb558..90c5008f5 100644
--- a/comfy/nodes/package.py
+++ b/comfy/nodes/package.py
@@ -7,7 +7,7 @@ import time
 import types
 
 from . import base_nodes
-from ..comfy_extras import nodes as comfy_extras_nodes
+from comfy_extras import nodes as comfy_extras_nodes
 
 try:
     import custom_nodes
diff --git a/setup.py b/setup.py
index b42959be4..4ff004cc1 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ from setuptools import setup, find_packages
 """
 The name of the package.
 """
-package_name = "comfy"
+package_name = "comfyui"
 
 """
 The current version.