diff --git a/core/dvm.py b/core/dvm.py index fde9c41..fe9a8b3 100644 --- a/core/dvm.py +++ b/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) diff --git a/interfaces/dvmtaskinterface.py b/interfaces/dvmtaskinterface.py index ed9bfbc..932074c 100644 --- a/interfaces/dvmtaskinterface.py +++ b/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 diff --git a/tasks/advanced_search.py b/tasks/advanced_search.py index f3b839f..3bfc9a8 100644 --- a/tasks/advanced_search.py +++ b/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) diff --git a/tasks/convert_media.py b/tasks/convert_media.py index 3c25e9e..29c6544 100644 --- a/tasks/convert_media.py +++ b/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" diff --git a/tasks/discovery_inactive_follows.py b/tasks/discovery_inactive_follows.py index ff4937e..34092a5 100644 --- a/tasks/discovery_inactive_follows.py +++ b/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 diff --git a/tasks/imagegeneration_openai_dalle.py b/tasks/imagegeneration_openai_dalle.py index 611c6df..db680f9 100644 --- a/tasks/imagegeneration_openai_dalle.py +++ b/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" diff --git a/tasks/imagegeneration_sdxl.py b/tasks/imagegeneration_sdxl.py index 84856ad..834ace7 100644 --- a/tasks/imagegeneration_sdxl.py +++ b/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' diff --git a/tasks/imagegeneration_sdxlimg2img.py b/tasks/imagegeneration_sdxlimg2img.py index 3d75a68..8a13741 100644 --- a/tasks/imagegeneration_sdxlimg2img.py +++ b/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' diff --git a/tasks/textextraction_google.py b/tasks/textextraction_google.py index a6a2c4a..5dc09ae 100644 --- a/tasks/textextraction_google.py +++ b/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 = "" diff --git a/tasks/textextraction_pdf.py b/tasks/textextraction_pdf.py index 3f52f52..f2e2878 100644 --- a/tasks/textextraction_pdf.py +++ b/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 diff --git a/tasks/textextraction_whisperx.py b/tasks/textextraction_whisperx.py index 71d5dd4..f98f927 100644 --- a/tasks/textextraction_whisperx.py +++ b/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'} diff --git a/tasks/translation_google.py b/tasks/translation_google.py index ad34d6b..3a5b026 100644 --- a/tasks/translation_google.py +++ b/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" diff --git a/tasks/translation_libretranslate.py b/tasks/translation_libretranslate.py index 3a8965c..dd100fa 100644 --- a/tasks/translation_libretranslate.py +++ b/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"