From dca65f2f7db72eb94235fe9672c66f84d0f93c75 Mon Sep 17 00:00:00 2001 From: Believethehype Date: Fri, 15 Dec 2023 10:37:05 +0100 Subject: [PATCH] cleanup --- nostr_dvm/tasks/imagegeneration_replicate_sdxl.py | 11 +++++------ nostr_dvm/tasks/textextraction_google.py | 4 ++-- nostr_dvm/tasks/textgeneration_llmlite.py | 9 ++++----- nostr_dvm/tasks/translation_google.py | 4 ++-- nostr_dvm/tasks/trending_notes_nostrband.py | 12 +++--------- 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/nostr_dvm/tasks/imagegeneration_replicate_sdxl.py b/nostr_dvm/tasks/imagegeneration_replicate_sdxl.py index 4cc8948..480d0ba 100644 --- a/nostr_dvm/tasks/imagegeneration_replicate_sdxl.py +++ b/nostr_dvm/tasks/imagegeneration_replicate_sdxl.py @@ -59,7 +59,6 @@ class ImageGenerationReplicateSDXL(DVMTaskInterface): width = "1024" height = "1024" - for tag in event.tags(): if tag.as_vec()[0] == 'i': input_type = tag.as_vec()[2] @@ -116,6 +115,7 @@ class ImageGenerationReplicateSDXL(DVMTaskInterface): print("Error in Module") raise Exception(e) + # We build an example here that we can call by either calling this file directly from the main directory, # or by adding it to our playground. You can call the example and adjust it to your needs or redefine it in the # playground or elsewhere @@ -139,13 +139,12 @@ def build_example(name, identifier, admin_config): } } - nip89config = NIP89Config() - nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) nip89config.CONTENT = json.dumps(nip89info) - # We add an optional AdminConfig for this one, and tell the dvm to rebroadcast its NIP89 - return ImageGenerationReplicateSDXL(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config) + + return ImageGenerationReplicateSDXL(name=name, dvm_config=dvm_config, nip89config=nip89config, + admin_config=admin_config) if __name__ == '__main__': diff --git a/nostr_dvm/tasks/textextraction_google.py b/nostr_dvm/tasks/textextraction_google.py index a226558..cbae2c3 100644 --- a/nostr_dvm/tasks/textextraction_google.py +++ b/nostr_dvm/tasks/textextraction_google.py @@ -150,9 +150,9 @@ def build_example(name, identifier, admin_config): } } nip89config = NIP89Config() - nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) nip89config.CONTENT = json.dumps(nip89info) + return SpeechToTextGoogle(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) diff --git a/nostr_dvm/tasks/textgeneration_llmlite.py b/nostr_dvm/tasks/textgeneration_llmlite.py index 01a3548..0a692e7 100644 --- a/nostr_dvm/tasks/textgeneration_llmlite.py +++ b/nostr_dvm/tasks/textgeneration_llmlite.py @@ -102,6 +102,8 @@ def build_example(name, identifier, admin_config): dvm_config = build_default_config(identifier) admin_config.LUD16 = dvm_config.LN_ADDRESS + options = {'default_model': "ollama/llama2-uncensored", 'server': "http://localhost:11434"} + nip89info = { "name": name, "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", @@ -116,13 +118,10 @@ def build_example(name, identifier, admin_config): } } - options = {'default_model': "ollama/llama2-uncensored", 'server': "http://localhost:11434"} - nip89config = NIP89Config() - nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) nip89config.CONTENT = json.dumps(nip89info) - # We add an optional AdminConfig for this one, and tell the dvm to rebroadcast its NIP89 + return TextGenerationOLLAMA(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) diff --git a/nostr_dvm/tasks/translation_google.py b/nostr_dvm/tasks/translation_google.py index 73b5462..642cf49 100644 --- a/nostr_dvm/tasks/translation_google.py +++ b/nostr_dvm/tasks/translation_google.py @@ -136,9 +136,9 @@ def build_example(name, identifier, admin_config): } } nip89config = NIP89Config() - nip89config.DTAG = nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) nip89config.CONTENT = json.dumps(nip89info) + return TranslationGoogle(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config) if __name__ == '__main__': diff --git a/nostr_dvm/tasks/trending_notes_nostrband.py b/nostr_dvm/tasks/trending_notes_nostrband.py index 82d48f7..480de1f 100644 --- a/nostr_dvm/tasks/trending_notes_nostrband.py +++ b/nostr_dvm/tasks/trending_notes_nostrband.py @@ -82,10 +82,6 @@ class TrendingNotesNostrBand(DVMTaskInterface): except: return "error" - - - - def post_process(self, result, event): """Overwrite the interface function to return a social client readable format, if requested""" for tag in event.tags(): @@ -114,14 +110,12 @@ def build_example(name, identifier, admin_config): "cashuAccepted": True, "nip90Params": {} } - nip89config = NIP89Config() - nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) - + nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) nip89config.CONTENT = json.dumps(nip89info) + return TrendingNotesNostrBand(name=name, dvm_config=dvm_config, nip89config=nip89config, - admin_config=admin_config) + admin_config=admin_config) if __name__ == '__main__':