From e7c6b009e676ad85c36e1bbc63329e5561be4141 Mon Sep 17 00:00:00 2001
From: Believethehype <tobias_baur@yahoo.com>
Date: Wed, 29 Nov 2023 11:12:11 +0100
Subject: [PATCH] little restructure

---
 .gitignore                                     | 7 ++-----
 bot.py => bot/bot.py                           | 0
 dvm.py => core/dvm.py                          | 0
 interfaces/dvmtaskinterface.py                 | 2 +-
 main.py                                        | 2 +-
 start.cmd                                      | 2 ++
 tasks/imagegeneration_openai_dalle.py          | 6 ------
 tasks/textextractionpdf.py                     | 2 --
 tasks/translation_google.py                    | 2 --
 tasks/translation_libretranslate.py            | 2 --
 test_dvm_client.py => tests/test_dvm_client.py | 2 +-
 11 files changed, 7 insertions(+), 20 deletions(-)
 rename bot.py => bot/bot.py (100%)
 rename dvm.py => core/dvm.py (100%)
 create mode 100644 start.cmd
 rename test_dvm_client.py => tests/test_dvm_client.py (99%)

diff --git a/.gitignore b/.gitignore
index b934a38..8bbb05d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,8 +160,5 @@ cython_debug/
 #.idea/
 .DS_Store
 *.db
-outputs/yt.mp3
-.\outputs\audio.mp3
-.\outputs\/yt.mp3
-.\outputs\audio.mp3
-.\outputs\/yt.mp3
+
+outputs/
\ No newline at end of file
diff --git a/bot.py b/bot/bot.py
similarity index 100%
rename from bot.py
rename to bot/bot.py
diff --git a/dvm.py b/core/dvm.py
similarity index 100%
rename from dvm.py
rename to core/dvm.py
diff --git a/interfaces/dvmtaskinterface.py b/interfaces/dvmtaskinterface.py
index 3e1b48d..8aea1a9 100644
--- a/interfaces/dvmtaskinterface.py
+++ b/interfaces/dvmtaskinterface.py
@@ -6,7 +6,7 @@ from nostr_sdk import Keys
 from utils.admin_utils import AdminConfig
 from utils.dvmconfig import DVMConfig
 from utils.nip89_utils import NIP89Announcement, NIP89Config
-from dvm import DVM
+from core.dvm import DVM
 
 
 class DVMTaskInterface:
diff --git a/main.py b/main.py
index 5cfe8e5..002f3f8 100644
--- a/main.py
+++ b/main.py
@@ -8,7 +8,7 @@ from threading import Thread
 import dotenv
 from nostr_sdk import Keys
 
-from bot import Bot
+from bot.bot import Bot
 from playground import build_pdf_extractor, build_googletranslator, build_unstable_diffusion, build_sketcher, \
     build_dalle, \
     build_whisperx, build_libretranslator
diff --git a/start.cmd b/start.cmd
new file mode 100644
index 0000000..83c52f0
--- /dev/null
+++ b/start.cmd
@@ -0,0 +1,2 @@
+call venv/Scripts/activate
+python main.py
\ No newline at end of file
diff --git a/tasks/imagegeneration_openai_dalle.py b/tasks/imagegeneration_openai_dalle.py
index 99444e5..cf0c9d7 100644
--- a/tasks/imagegeneration_openai_dalle.py
+++ b/tasks/imagegeneration_openai_dalle.py
@@ -1,11 +1,5 @@
 import json
-import os
-import time
-from multiprocessing.pool import ThreadPool
-from threading import Thread
 
-from backends.nova_server import check_nova_server_status, send_request_to_nova_server
-from dvm import DVM
 from interfaces.dvmtaskinterface import DVMTaskInterface
 from utils.admin_utils import AdminConfig
 from utils.definitions import EventDefinitions
diff --git a/tasks/textextractionpdf.py b/tasks/textextractionpdf.py
index 4a38d04..2423b53 100644
--- a/tasks/textextractionpdf.py
+++ b/tasks/textextractionpdf.py
@@ -1,9 +1,7 @@
 import json
 import os
 import re
-from threading import Thread
 
-from dvm import DVM
 from interfaces.dvmtaskinterface import DVMTaskInterface
 from utils.admin_utils import AdminConfig
 from utils.definitions import EventDefinitions
diff --git a/tasks/translation_google.py b/tasks/translation_google.py
index ccbe984..c75edcf 100644
--- a/tasks/translation_google.py
+++ b/tasks/translation_google.py
@@ -1,7 +1,5 @@
 import json
-from threading import Thread
 
-from dvm import DVM
 from interfaces.dvmtaskinterface import DVMTaskInterface
 from utils.admin_utils import AdminConfig
 from utils.definitions import EventDefinitions
diff --git a/tasks/translation_libretranslate.py b/tasks/translation_libretranslate.py
index 8af2268..d44737e 100644
--- a/tasks/translation_libretranslate.py
+++ b/tasks/translation_libretranslate.py
@@ -1,9 +1,7 @@
 import json
-from threading import Thread
 
 import requests
 
-from dvm import DVM
 from interfaces.dvmtaskinterface import DVMTaskInterface
 from utils.admin_utils import AdminConfig
 from utils.definitions import EventDefinitions
diff --git a/test_dvm_client.py b/tests/test_dvm_client.py
similarity index 99%
rename from test_dvm_client.py
rename to tests/test_dvm_client.py
index a654778..4a78fa9 100644
--- a/test_dvm_client.py
+++ b/tests/test_dvm_client.py
@@ -161,7 +161,7 @@ def nostr_client():
 
 if __name__ == '__main__':
 
-    env_path = Path('.env')
+    env_path = Path('../.env')
     if env_path.is_file():
         print(f'loading environment from {env_path.resolve()}')
         dotenv.load_dotenv(env_path, verbose=True, override=True)