Merge branch 'main' into backends-nserver

This commit is contained in:
Believethehype 2023-12-15 10:37:12 +01:00
commit 3dc79d7dc9
11 changed files with 36 additions and 50 deletions

View File

@ -170,10 +170,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 AdvancedSearch(name=name, dvm_config=dvm_config, nip89config=nip89config,
admin_config=admin_config)

View File

@ -14,7 +14,7 @@ from nostr_dvm.utils.output_utils import upload_media_to_hoster
"""
This File contains a Module to call Google Translate Services locally on the DVM Machine
This File contains a Module convert media locally
Accepted Inputs: Text, Events, Jobs (Text Extraction, Summary, Translation)
Outputs: Text containing the TranslationGoogle in the desired language.

View File

@ -191,12 +191,10 @@ 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 DiscoverInactiveFollows(name=name, dvm_config=dvm_config, nip89config=nip89config,
admin_config=admin_config)

View File

@ -16,7 +16,6 @@ from nostr_dvm.utils.nip89_utils import NIP89Config, check_and_set_d_tag
from nostr_dvm.utils.output_utils import upload_media_to_hoster
from nostr_dvm.utils.zap_utils import get_price_per_sat
"""
This File contains a Module to transform Text input on OpenAI's servers with DALLE-3 and receive results back.
@ -120,6 +119,7 @@ class ImageGenerationDALLE(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
@ -144,12 +144,10 @@ 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 ImageGenerationDALLE(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config)

View File

@ -17,7 +17,7 @@ from nostr_dvm.utils.output_utils import upload_media_to_hoster
from nostr_dvm.utils.zap_utils import get_price_per_sat
"""
This File contains a Module to transform Text input on NOVA-Server and receive results back.
This File contains a Module to generate an Image on replicate and receive results back.
Accepted Inputs: Prompt (text)
Outputs: An url to an Image
@ -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__':

View File

@ -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)

View File

@ -13,7 +13,7 @@ from nostr_dvm.utils.dvmconfig import DVMConfig, build_default_config
from nostr_dvm.utils.nip89_utils import NIP89Config, check_and_set_d_tag
"""
This File contains a Module to generate Text, based on a prompt using a LLM (local or API)
This File contains a Module to generate Text, based on a prompt using a LLM (local or API) (Ollama, custom model, chatgpt)
Accepted Inputs: Prompt (text)
Outputs: Generated text
@ -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)

View File

@ -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__':

View File

@ -15,7 +15,7 @@ from nostr_dvm.utils.nostr_utils import get_referenced_event_by_id, get_event_by
"""
This File contains a Module to call Google Translate Services locally on the DVM Machine
This File contains a Module to call Libre Translate Services
Accepted Inputs: Text, Events, Jobs (Text Extraction, Summary, Translation)
Outputs: Text containing the Translation with LibreTranslation in the desired language.
@ -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 TranslationLibre(name=name, dvm_config=dvm_config, nip89config=nip89config,
admin_config=admin_config, options=options)

View File

@ -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__':

View File

@ -53,9 +53,9 @@ class VideoGenerationReplicateSVD(DVMTaskInterface):
length = "25_frames_with_svd_xt"
else:
length = "14_frames_with_svd"
sizing_strategy = "maintain_aspect_ratio" #crop_to_16_9, use_image_dimensions
sizing_strategy = "maintain_aspect_ratio" # crop_to_16_9, use_image_dimensions
frames_per_second = 6
motion_bucket_id = 127 #Increase overall motion in the generated video
motion_bucket_id = 127 # Increase overall motion in the generated video
cond_aug = 0.02 # Amount of noise to add to input image
for tag in event.tags():
@ -63,7 +63,7 @@ class VideoGenerationReplicateSVD(DVMTaskInterface):
input_type = tag.as_vec()[2]
if input_type == "url":
url = tag.as_vec()[1]
#TODO add params as defined above
# TODO add params as defined above
options = {
"url": url,
@ -107,6 +107,7 @@ class VideoGenerationReplicateSVD(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
@ -126,14 +127,12 @@ def build_example(name, identifier, admin_config):
"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)
# We add an optional AdminConfig for this one, and tell the dvm to rebroadcast its NIP89
return VideoGenerationReplicateSVD(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config)
return VideoGenerationReplicateSVD(name=name, dvm_config=dvm_config, nip89config=nip89config,
admin_config=admin_config)
if __name__ == '__main__':