rename request function

core/dvm.py

@@ -451,8 +451,8 @@ class DVM:
                 for dvm in self.dvm_config.SUPPORTED_DVMS:
                     try:
                         if task == dvm.TASK:
-                            request_form = dvm.create_request_form_from_nostr_event(job_event, self.client,
-                                                                                    self.dvm_config)
+                            request_form = dvm.create_request_from_nostr_event(job_event, self.client,
+                                                                               self.dvm_config)
                             result = dvm.process(request_form)
                             try:
                                 post_processed = dvm.post_process(result, job_event)

interfaces/dvmtaskinterface.py

@@ -67,7 +67,7 @@ class DVMTaskInterface:
         """Check if input is supported for current Task."""
         pass
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None) -> dict:
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None) -> dict:
         """Parse input into a request form that will be given to the process method"""
         pass
 

tasks/advanced_search.py

@@ -40,7 +40,7 @@ class AdvancedSearch(DVMTaskInterface):
         # no input required
         return True
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None):
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
         self.dvm_config = dvm_config
         print(self.dvm_config.PRIVATE_KEY)
 

tasks/convert_media.py

@@ -44,7 +44,7 @@ class MediaConverter(DVMTaskInterface):
                     return False
         return True
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None):
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
         request_form = {"jobID": event.id().to_hex()}
         url = ""
         media_format = "video/mp4"

tasks/discovery_inactive_follows.py

@@ -42,7 +42,7 @@ class DiscoverInactiveFollows(DVMTaskInterface):
         # no input required
         return True
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None):
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
         self.client = client
         self.dvm_config = dvm_config
 

tasks/imagegeneration_openai_dalle.py

@@ -54,7 +54,7 @@ class ImageGenerationDALLE(DVMTaskInterface):
 
         return True
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None):
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
         request_form = {"jobID": event.id().to_hex() + "_" + self.NAME.replace(" ", "")}
         prompt = ""
         width = "1024"

tasks/imagegeneration_sdxl.py

@@ -51,7 +51,7 @@ class ImageGenerationSDXL(DVMTaskInterface):
 
         return True
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None):
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
         request_form = {"jobID": event.id().to_hex() + "_" + self.NAME.replace(" ", "")}
         request_form["trainerFilePath"] = 'modules\\stablediffusionxl\\stablediffusionxl.trainer'
 

tasks/imagegeneration_sdxlimg2img.py

@@ -58,7 +58,7 @@ class ImageGenerationSDXLIMG2IMG(DVMTaskInterface):
 
         return True
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None):
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
         request_form = {"jobID": event.id().to_hex() + "_" + self.NAME.replace(" ", "")}
         request_form["trainerFilePath"] = r'modules\stablediffusionxl\stablediffusionxl-img2img.trainer'
 

tasks/textextraction_google.py

@@ -53,7 +53,7 @@ class SpeechToTextGoogle(DVMTaskInterface):
 
         return True
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None):
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
         request_form = {"jobID": event.id().to_hex() + "_" + self.NAME.replace(" ", "")}
 
         url = ""

tasks/textextraction_pdf.py

@@ -40,7 +40,7 @@ class TextExtractionPDF(DVMTaskInterface):
                     return False
         return True
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None):
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
         request_form = {"jobID": event.id().to_hex()}
 
         # default values

tasks/textextraction_whisperx.py

@@ -51,7 +51,7 @@ class SpeechToTextWhisperX(DVMTaskInterface):
 
         return True
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None):
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
         request_form = {"jobID": event.id().to_hex() + "_" + self.NAME.replace(" ", ""),
                         "trainerFilePath": 'modules\\whisperx\\whisperx_transcript.trainer'}
 

tasks/translation_google.py

@@ -41,7 +41,7 @@ class TranslationGoogle(DVMTaskInterface):
                     return False
         return True
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None):
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
         request_form = {"jobID": event.id().to_hex()}
         text = ""
         translation_lang = "en"

tasks/translation_libretranslate.py

@@ -44,7 +44,7 @@ class TranslationLibre(DVMTaskInterface):
                     return False
         return True
 
-    def create_request_form_from_nostr_event(self, event, client=None, dvm_config=None):
+    def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
         request_form = {"jobID": event.id().to_hex()}
         text = ""
         translation_lang = "en"