From b88f4a54ca8c186559316c940c16f9b77a6bb7f9 Mon Sep 17 00:00:00 2001 From: Believethehype <1097224+believethehype@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:14:39 +0100 Subject: [PATCH] deprecate "image" in nip89, use picture instead --- examples/ollama_dvm/main.py | 4 +- examples/tts_dvm/main.py | 4 +- examples/unleashed_dvm/main.py | 4 +- main.py | 4 +- nostr_dvm/bot.py | 4 +- nostr_dvm/tasks/advanced_search.py | 4 +- nostr_dvm/tasks/advanced_search_wine.py | 4 +- nostr_dvm/tasks/audiogeneration_suno_ai.py | 4 +- ...ent_discovery_currently_latest_longform.py | 10 ++--- ...content_discovery_currently_latest_wiki.py | 10 ++--- .../content_discovery_currently_popular.py | 10 ++--- ...discovery_currently_popular_by_top_zaps.py | 10 ++--- ...t_discovery_currently_popular_followers.py | 10 ++--- ...ent_discovery_currently_popular_gallery.py | 10 ++--- ...ntent_discovery_currently_popular_mostr.py | 10 ++--- ...iscovery_currently_popular_nonfollowers.py | 10 ++--- ...ntent_discovery_currently_popular_topic.py | 10 ++--- ...ntent_discovery_latest_one_per_follower.py | 4 +- .../tasks/content_discovery_update_db_only.py | 10 ++--- nostr_dvm/tasks/convert_media.py | 2 +- nostr_dvm/tasks/discovery_bot_farms.py | 4 +- nostr_dvm/tasks/discovery_censor_wot.py | 4 +- nostr_dvm/tasks/discovery_inactive_follows.py | 4 +- nostr_dvm/tasks/discovery_nonfollowers.py | 4 +- .../discovery_trending_notes_gleasonator.py | 5 +-- .../discovery_trending_notes_nostrband.py | 3 +- nostr_dvm/tasks/generic_dvm.py | 4 +- .../tasks/imagegeneration_openai_dalle.py | 4 +- nostr_dvm/tasks/imagegeneration_replicate.py | 4 +- .../imagegeneration_replicate_fluxpro.py | 4 +- .../imagegeneration_replicate_recraft.py | 4 +- .../tasks/imagegeneration_replicate_sdxl.py | 4 +- nostr_dvm/tasks/imagegeneration_sd21_mlx.py | 4 +- nostr_dvm/tasks/imagegeneration_sd35_api.py | 4 +- nostr_dvm/tasks/imagegeneration_sdxl.py | 4 +- .../tasks/imagegeneration_sdxlimg2img.py | 4 +- nostr_dvm/tasks/imageinterrogator.py | 4 +- nostr_dvm/tasks/imageupscale.py | 4 +- nostr_dvm/tasks/people_discovery_mywot.py | 11 +++-- nostr_dvm/tasks/people_discovery_wot.py | 10 ++--- nostr_dvm/tasks/search_users.py | 4 +- nostr_dvm/tasks/summarization_duckduck_ai.py | 4 +- nostr_dvm/tasks/summarization_huggingchat.py | 4 +- .../tasks/summarization_unleashed_chat.py | 4 +- nostr_dvm/tasks/textextraction_google.py | 4 +- nostr_dvm/tasks/textextraction_pdf.py | 4 +- nostr_dvm/tasks/textextraction_whisperx.py | 4 +- nostr_dvm/tasks/textgeneration_huggingchat.py | 4 +- nostr_dvm/tasks/textgeneration_llmlite.py | 4 +- .../tasks/textgeneration_unleashed_chat.py | 4 +- nostr_dvm/tasks/texttospeech.py | 4 +- nostr_dvm/tasks/translation_google.py | 4 +- nostr_dvm/tasks/translation_libretranslate.py | 4 +- .../tasks/videogeneration_replicate_svd.py | 4 +- nostr_dvm/tasks/videogeneration_svd.py | 4 +- nostr_dvm/utils/external_dvm_utils.py | 6 ++- nostr_dvm/utils/nip88_utils.py | 2 +- nostr_dvm/utils/nostr_utils.py | 2 +- tests/chat_bot.py | 4 +- tests/dalle.py | 4 +- tests/discovery.py | 40 +++++++------------ tests/discovery_custom_feed.py | 3 +- tests/discovery_gallery.py | 3 +- tests/discovery_mostr.py | 3 +- tests/discovery_one_per_follow.py | 3 +- tests/discovery_people.py | 3 +- tests/discovery_test.py | 40 +++++++------------ tests/generic_dvm.py | 4 +- tests/generic_dvm_autotopic_feed.py | 4 +- tests/generic_dvm_duck_chat.py | 4 +- tests/generic_dvm_flux_hf.py | 4 +- tests/otherstuff.py | 40 +++++++++---------- tests/sd35_api.py | 4 +- tests/search.py | 12 +++--- tests/summarization_duck.py | 4 +- tests/tts.py | 4 +- tutorials/05_announce_dvm.py | 2 +- tutorials/06_dvm_config.py | 2 +- tutorials/07_admin_config.py | 2 +- 79 files changed, 220 insertions(+), 270 deletions(-) diff --git a/examples/ollama_dvm/main.py b/examples/ollama_dvm/main.py index 6e0fb91..0695eb3 100644 --- a/examples/ollama_dvm/main.py +++ b/examples/ollama_dvm/main.py @@ -22,7 +22,7 @@ def main(): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I use a LLM connected via OLLAMA", "encryptionSupported": True, "cashuAccepted": True, @@ -32,7 +32,7 @@ def main(): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) ollama = TextGenerationLLMLite(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, diff --git a/examples/tts_dvm/main.py b/examples/tts_dvm/main.py index 2ce8d46..7154cab 100644 --- a/examples/tts_dvm/main.py +++ b/examples/tts_dvm/main.py @@ -22,7 +22,7 @@ def main(): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I Generate Speech from Text", "encryptionSupported": True, "cashuAccepted": True, @@ -35,7 +35,7 @@ def main(): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) tts = TextToSpeech(name=name, diff --git a/examples/unleashed_dvm/main.py b/examples/unleashed_dvm/main.py index d32c250..babf537 100644 --- a/examples/unleashed_dvm/main.py +++ b/examples/unleashed_dvm/main.py @@ -22,7 +22,7 @@ def main(): nip89info = { "name": name, - "image": "https://unleashed.chat/_app/immutable/assets/hero.pehsu4x_.jpeg", + "picture": "https://unleashed.chat/_app/immutable/assets/hero.pehsu4x_.jpeg", "about": "I generate Text with Unleashed.chat", "encryptionSupported": True, "cashuAccepted": True, @@ -30,7 +30,7 @@ def main(): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) diff --git a/main.py b/main.py index e5cd934..f7d5b77 100644 --- a/main.py +++ b/main.py @@ -24,7 +24,7 @@ def playground(announce=False): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", + "picture": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", "about": "I'm just a demo DVM, not doing much.'", "encryptionSupported": True, "cashuAccepted": True, @@ -33,7 +33,7 @@ def playground(announce=False): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) options = { diff --git a/nostr_dvm/bot.py b/nostr_dvm/bot.py index 443b09f..2179f06 100644 --- a/nostr_dvm/bot.py +++ b/nostr_dvm/bot.py @@ -741,7 +741,9 @@ class Bot: if nip89content.get("name"): info += "Name: " + nip89content.get("name") + "\n" - if nip89content.get("image"): + if nip89content.get("picture"): + info += nip89content.get("picture") + "\n" + elif nip89content.get("image"): info += nip89content.get("image") + "\n" if nip89content.get("about"): info += "About:\n" + nip89content.get("about") + "\n\n" diff --git a/nostr_dvm/tasks/advanced_search.py b/nostr_dvm/tasks/advanced_search.py index 4bfe692..542148b 100644 --- a/nostr_dvm/tasks/advanced_search.py +++ b/nostr_dvm/tasks/advanced_search.py @@ -162,7 +162,7 @@ def build_example(name, identifier, admin_config): # Add NIP89 nip89info = { "name": name, - "image": "https://nostr.band/android-chrome-192x192.png", + "picture": "https://nostr.band/android-chrome-192x192.png", "about": "I search notes on Nostr.band.", "encryptionSupported": True, "cashuAccepted": True, @@ -191,7 +191,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) options = {"relay": "wss://relay.nostr.band"} diff --git a/nostr_dvm/tasks/advanced_search_wine.py b/nostr_dvm/tasks/advanced_search_wine.py index 68a5715..8f6f559 100644 --- a/nostr_dvm/tasks/advanced_search_wine.py +++ b/nostr_dvm/tasks/advanced_search_wine.py @@ -147,7 +147,7 @@ def build_example(name, identifier, admin_config): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/d844d6a963724b9f9deb6b3326984fd95352343336718812424d5e99d93a6f2d.jpg", + "picture": "https://image.nostr.build/d844d6a963724b9f9deb6b3326984fd95352343336718812424d5e99d93a6f2d.jpg", "about": "I search notes on nostr.wine using the nostr-wine API", "encryptionSupported": True, "cashuAccepted": True, @@ -176,7 +176,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return AdvancedSearchWine(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/audiogeneration_suno_ai.py b/nostr_dvm/tasks/audiogeneration_suno_ai.py index a0af881..de2c585 100644 --- a/nostr_dvm/tasks/audiogeneration_suno_ai.py +++ b/nostr_dvm/tasks/audiogeneration_suno_ai.py @@ -156,7 +156,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I create songs based on prompts with suno.ai", "encryptionSupported": True, "cashuAccepted": True, @@ -164,7 +164,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return AudioGenerationSonoAI(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/content_discovery_currently_latest_longform.py b/nostr_dvm/tasks/content_discovery_currently_latest_longform.py index df85bc4..e1a3f6e 100644 --- a/nostr_dvm/tasks/content_discovery_currently_latest_longform.py +++ b/nostr_dvm/tasks/content_discovery_currently_latest_longform.py @@ -227,7 +227,6 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show the latest longform notes.", "lud16": dvm_config.LN_ADDRESS, @@ -245,7 +244,7 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -273,7 +272,6 @@ def build_example_subscription(name, identifier, admin_config, options, update_r # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show the latest longform notes", "lud16": dvm_config.LN_ADDRESS, @@ -291,14 +289,14 @@ def build_example_subscription(name, identifier, admin_config, options, update_r } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/content_discovery_currently_latest_wiki.py b/nostr_dvm/tasks/content_discovery_currently_latest_wiki.py index 5bbba0c..dc0c78e 100644 --- a/nostr_dvm/tasks/content_discovery_currently_latest_wiki.py +++ b/nostr_dvm/tasks/content_discovery_currently_latest_wiki.py @@ -226,7 +226,6 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show the latest longform notes.", "lud16": dvm_config.LN_ADDRESS, @@ -244,7 +243,7 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -272,7 +271,6 @@ def build_example_subscription(name, identifier, admin_config, options, update_r # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show the latest longform notes", "lud16": dvm_config.LN_ADDRESS, @@ -290,14 +288,14 @@ def build_example_subscription(name, identifier, admin_config, options, update_r } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/content_discovery_currently_popular.py b/nostr_dvm/tasks/content_discovery_currently_popular.py index 6417c2b..ce0799f 100644 --- a/nostr_dvm/tasks/content_discovery_currently_popular.py +++ b/nostr_dvm/tasks/content_discovery_currently_popular.py @@ -225,7 +225,6 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular", "lud16": dvm_config.LN_ADDRESS, @@ -243,7 +242,7 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -270,7 +269,6 @@ def build_example_subscription(name, identifier, admin_config, options, update_r # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular all over Nostr. I'm also used for testing subscriptions.", "lud16": dvm_config.LN_ADDRESS, @@ -288,14 +286,14 @@ def build_example_subscription(name, identifier, admin_config, options, update_r } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/content_discovery_currently_popular_by_top_zaps.py b/nostr_dvm/tasks/content_discovery_currently_popular_by_top_zaps.py index 718fad8..1398258 100644 --- a/nostr_dvm/tasks/content_discovery_currently_popular_by_top_zaps.py +++ b/nostr_dvm/tasks/content_discovery_currently_popular_by_top_zaps.py @@ -269,7 +269,6 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently zapped the most.", "lud16": dvm_config.LN_ADDRESS, @@ -287,7 +286,7 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -314,7 +313,6 @@ def build_example_subscription(name, identifier, admin_config, options, update_r # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular all over Nostr. I'm also used for testing subscriptions.", "lud16": dvm_config.LN_ADDRESS, @@ -332,14 +330,14 @@ def build_example_subscription(name, identifier, admin_config, options, update_r } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/content_discovery_currently_popular_followers.py b/nostr_dvm/tasks/content_discovery_currently_popular_followers.py index 5ab4e9d..657d0d4 100644 --- a/nostr_dvm/tasks/content_discovery_currently_popular_followers.py +++ b/nostr_dvm/tasks/content_discovery_currently_popular_followers.py @@ -243,7 +243,6 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=3 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular from people you follow", "lud16": dvm_config.LN_ADDRESS, @@ -261,7 +260,7 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=3 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -287,7 +286,6 @@ def build_example_subscription(name, identifier, admin_config, options, processi image = "https://image.nostr.build/d92652a6a07677e051d647dcf9f0f59e265299b3335a939d008183a911513f4a.jpg" nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular, just like the free DVM, I'm also used for testing subscriptions. (beta)", "lud16": dvm_config.LN_ADDRESS, @@ -305,14 +303,14 @@ def build_example_subscription(name, identifier, admin_config, options, processi } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/content_discovery_currently_popular_gallery.py b/nostr_dvm/tasks/content_discovery_currently_popular_gallery.py index 80faca5..431b451 100644 --- a/nostr_dvm/tasks/content_discovery_currently_popular_gallery.py +++ b/nostr_dvm/tasks/content_discovery_currently_popular_gallery.py @@ -293,7 +293,6 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular", "lud16": dvm_config.LN_ADDRESS, @@ -311,7 +310,7 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -338,7 +337,6 @@ def build_example_subscription(name, identifier, admin_config, options, update_r # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular all over Nostr. I'm also used for testing subscriptions.", "lud16": dvm_config.LN_ADDRESS, @@ -356,14 +354,14 @@ def build_example_subscription(name, identifier, admin_config, options, update_r } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/content_discovery_currently_popular_mostr.py b/nostr_dvm/tasks/content_discovery_currently_popular_mostr.py index 6c5b725..6e55033 100644 --- a/nostr_dvm/tasks/content_discovery_currently_popular_mostr.py +++ b/nostr_dvm/tasks/content_discovery_currently_popular_mostr.py @@ -247,7 +247,6 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular", "lud16": dvm_config.LN_ADDRESS, @@ -265,7 +264,7 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -293,7 +292,6 @@ def build_example_subscription(name, identifier, admin_config, options, update_r # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular all over Nostr. I'm also used for testing subscriptions.", "lud16": dvm_config.LN_ADDRESS, @@ -311,14 +309,14 @@ def build_example_subscription(name, identifier, admin_config, options, update_r } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/content_discovery_currently_popular_nonfollowers.py b/nostr_dvm/tasks/content_discovery_currently_popular_nonfollowers.py index 13e3e92..99b3860 100644 --- a/nostr_dvm/tasks/content_discovery_currently_popular_nonfollowers.py +++ b/nostr_dvm/tasks/content_discovery_currently_popular_nonfollowers.py @@ -279,7 +279,6 @@ def build_example(name, identifier, admin_config, options, image, description, u # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": description, "lud16": dvm_config.LN_ADDRESS, @@ -297,7 +296,7 @@ def build_example(name, identifier, admin_config, options, image, description, u } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularNonFollowers(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -319,7 +318,6 @@ def build_example_subscription(name, identifier, admin_config, options, image, d # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": description, "lud16": dvm_config.LN_ADDRESS, @@ -337,14 +335,14 @@ def build_example_subscription(name, identifier, admin_config, options, image, d } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/content_discovery_currently_popular_topic.py b/nostr_dvm/tasks/content_discovery_currently_popular_topic.py index 6b45459..83e806c 100644 --- a/nostr_dvm/tasks/content_discovery_currently_popular_topic.py +++ b/nostr_dvm/tasks/content_discovery_currently_popular_topic.py @@ -256,7 +256,6 @@ def build_example(name, identifier, admin_config, options, image, description, u # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": description, "lud16": dvm_config.LN_ADDRESS, @@ -274,7 +273,7 @@ def build_example(name, identifier, admin_config, options, image, description, u } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularbyTopic(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -296,7 +295,6 @@ def build_example_subscription(name, identifier, admin_config, options, image, d # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": description, "lud16": dvm_config.LN_ADDRESS, @@ -314,14 +312,14 @@ def build_example_subscription(name, identifier, admin_config, options, image, d } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/content_discovery_latest_one_per_follower.py b/nostr_dvm/tasks/content_discovery_latest_one_per_follower.py index d182f20..101d407 100644 --- a/nostr_dvm/tasks/content_discovery_latest_one_per_follower.py +++ b/nostr_dvm/tasks/content_discovery_latest_one_per_follower.py @@ -205,7 +205,7 @@ def build_example(name, identifier, admin_config): # Add NIP89 nip89info = { "name": name, - "image": "https://i.nostr.build/H6SMmCl7eRDvkbAn.jpg", + "picture": "https://i.nostr.build/H6SMmCl7eRDvkbAn.jpg", "about": "I discover users you follow, but that have been inactive on Nostr", "action": "unfollow", # follow, mute, unmute "encryptionSupported": True, @@ -224,7 +224,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return Discoverlatestperfollower(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/content_discovery_update_db_only.py b/nostr_dvm/tasks/content_discovery_update_db_only.py index 6ff5c0e..e26ee48 100644 --- a/nostr_dvm/tasks/content_discovery_update_db_only.py +++ b/nostr_dvm/tasks/content_discovery_update_db_only.py @@ -217,7 +217,6 @@ def build_example(name, identifier, admin_config, options, image, description, u # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": description, "lud16": dvm_config.LN_ADDRESS, @@ -235,7 +234,7 @@ def build_example(name, identifier, admin_config, options, image, description, u } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentDBUpdateScheduler(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -257,7 +256,6 @@ def build_example_subscription(name, identifier, admin_config, options, image, d # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": description, "lud16": dvm_config.LN_ADDRESS, @@ -275,14 +273,14 @@ def build_example_subscription(name, identifier, admin_config, options, image, d } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/convert_media.py b/nostr_dvm/tasks/convert_media.py index d69c15a..b1f9a72 100644 --- a/nostr_dvm/tasks/convert_media.py +++ b/nostr_dvm/tasks/convert_media.py @@ -87,7 +87,7 @@ def build_example(name, identifier, admin_config): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I convert videos from urls to given output format.", "encryptionSupported": True, "cashuAccepted": True, diff --git a/nostr_dvm/tasks/discovery_bot_farms.py b/nostr_dvm/tasks/discovery_bot_farms.py index b6e89a1..8e1a18a 100644 --- a/nostr_dvm/tasks/discovery_bot_farms.py +++ b/nostr_dvm/tasks/discovery_bot_farms.py @@ -163,7 +163,7 @@ def build_example(name, identifier, admin_config): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/981b560820bc283c58de7989b7abc6664996b487a531d852e4ef7322586a2122.jpg", + "picture": "https://image.nostr.build/981b560820bc283c58de7989b7abc6664996b487a531d852e4ef7322586a2122.jpg", "about": "I hunt down bot farms.", "encryptionSupported": True, "cashuAccepted": True, @@ -178,7 +178,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) options = {"relay": "wss://relay.damus.io"} diff --git a/nostr_dvm/tasks/discovery_censor_wot.py b/nostr_dvm/tasks/discovery_censor_wot.py index 596f375..6c8b69d 100644 --- a/nostr_dvm/tasks/discovery_censor_wot.py +++ b/nostr_dvm/tasks/discovery_censor_wot.py @@ -171,7 +171,7 @@ def build_example(name, identifier, admin_config): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/19872a2edd866258fa9eab137631efda89310d52b2c6ea8f99ef057325aa1c7b.jpg", + "picture": "https://image.nostr.build/19872a2edd866258fa9eab137631efda89310d52b2c6ea8f99ef057325aa1c7b.jpg", "about": "I show users that have been reported by either your followers or your Web of Trust. Note: Anyone can report, so you might double check and decide for yourself who to mute. Considers spam, illegal and impersonation reports. Notice: This works with NIP51 mute lists. Not all clients support the new mute list format.", "encryptionSupported": True, "cashuAccepted": True, @@ -185,7 +185,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DiscoverReports(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/discovery_inactive_follows.py b/nostr_dvm/tasks/discovery_inactive_follows.py index ef48c01..d39aaa4 100644 --- a/nostr_dvm/tasks/discovery_inactive_follows.py +++ b/nostr_dvm/tasks/discovery_inactive_follows.py @@ -191,7 +191,7 @@ def build_example(name, identifier, admin_config): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I discover users you follow, but that have been inactive on Nostr", "action": "unfollow", # follow, mute, unmute "encryptionSupported": True, @@ -210,7 +210,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DiscoverInactiveFollows(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/discovery_nonfollowers.py b/nostr_dvm/tasks/discovery_nonfollowers.py index b1e6d07..5b4a80e 100644 --- a/nostr_dvm/tasks/discovery_nonfollowers.py +++ b/nostr_dvm/tasks/discovery_nonfollowers.py @@ -195,7 +195,7 @@ def build_example(name, identifier, admin_config): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I discover users you follow, but that don't follow you back.", "encryptionSupported": True, "cashuAccepted": True, @@ -213,7 +213,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DiscoverNonFollowers(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/discovery_trending_notes_gleasonator.py b/nostr_dvm/tasks/discovery_trending_notes_gleasonator.py index ad60f5f..1127a60 100644 --- a/nostr_dvm/tasks/discovery_trending_notes_gleasonator.py +++ b/nostr_dvm/tasks/discovery_trending_notes_gleasonator.py @@ -125,8 +125,7 @@ def build_example(name, identifier, admin_config, custom_processing_msg): nip89info = { "name": name, - "picture": "0c760b3ecdbc993ba47b785d0adecf00c760b3ecdbc993ba47b785d0adecf0ec71fd9c59808e27d0665b9f77a32d8de.png", - "image": "0c760b3ecdbc993ba47b785d0adecf00c760b3ecdbc993ba47b785d0adecf0ec71fd9c59808e27d0665b9f77a32d8de.png", + "picture": "https://image.nostr.build/0c760b3ecdbc993ba47b785d0adecf00c760b3ecdbc993ba47b785d0adecf0ec71fd9c59808e27d0665b9f77a32d8de.png", "about": "I show trending notes from Soapbox Ditto", "amount": "Free", "encryptionSupported": True, @@ -134,7 +133,7 @@ def build_example(name, identifier, admin_config, custom_processing_msg): "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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TrendingNotesGleasonator(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/discovery_trending_notes_nostrband.py b/nostr_dvm/tasks/discovery_trending_notes_nostrband.py index edc91fc..a767d0f 100644 --- a/nostr_dvm/tasks/discovery_trending_notes_nostrband.py +++ b/nostr_dvm/tasks/discovery_trending_notes_nostrband.py @@ -117,7 +117,6 @@ def build_example(name, identifier, admin_config, custom_processing_msg): nip89info = { "name": name, - "image": "https://nostr.band/android-chrome-192x192.png", "picture": "https://nostr.band/android-chrome-192x192.png", "about": "I show trending notes from nostr.band", "amount": "Free", @@ -126,7 +125,7 @@ def build_example(name, identifier, admin_config, custom_processing_msg): "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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TrendingNotesNostrBand(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/generic_dvm.py b/nostr_dvm/tasks/generic_dvm.py index f26e989..3e272de 100644 --- a/nostr_dvm/tasks/generic_dvm.py +++ b/nostr_dvm/tasks/generic_dvm.py @@ -83,7 +83,7 @@ def build_example(name, identifier, admin_config, announce=False): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", + "picture": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", "about": "I'm an all purpose DVM'", "encryptionSupported": True, "cashuAccepted": True, @@ -92,7 +92,7 @@ def build_example(name, identifier, admin_config, announce=False): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) options = { diff --git a/nostr_dvm/tasks/imagegeneration_openai_dalle.py b/nostr_dvm/tasks/imagegeneration_openai_dalle.py index bfc6773..6c2cef0 100644 --- a/nostr_dvm/tasks/imagegeneration_openai_dalle.py +++ b/nostr_dvm/tasks/imagegeneration_openai_dalle.py @@ -133,7 +133,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I use OpenAI's DALL·E 3", "encryptionSupported": True, "cashuAccepted": True, @@ -146,7 +146,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return ImageGenerationDALLE(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config) diff --git a/nostr_dvm/tasks/imagegeneration_replicate.py b/nostr_dvm/tasks/imagegeneration_replicate.py index 6f6e902..b94bf52 100644 --- a/nostr_dvm/tasks/imagegeneration_replicate.py +++ b/nostr_dvm/tasks/imagegeneration_replicate.py @@ -148,7 +148,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I use Replicate to run StableDiffusion 3", "encryptionSupported": True, "cashuAccepted": True, @@ -161,7 +161,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return ImageGenerationReplicate(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/imagegeneration_replicate_fluxpro.py b/nostr_dvm/tasks/imagegeneration_replicate_fluxpro.py index f5a8702..4159a0f 100644 --- a/nostr_dvm/tasks/imagegeneration_replicate_fluxpro.py +++ b/nostr_dvm/tasks/imagegeneration_replicate_fluxpro.py @@ -143,7 +143,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I use Replicate to run FluxPro", "encryptionSupported": True, "cashuAccepted": True, @@ -156,7 +156,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return ImageGenerationReplicateFluxPro(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/imagegeneration_replicate_recraft.py b/nostr_dvm/tasks/imagegeneration_replicate_recraft.py index dbb285c..dfd46db 100644 --- a/nostr_dvm/tasks/imagegeneration_replicate_recraft.py +++ b/nostr_dvm/tasks/imagegeneration_replicate_recraft.py @@ -141,7 +141,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I use Replicate to run Recraft", "encryptionSupported": True, "cashuAccepted": True, @@ -154,7 +154,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return ImageGenerationReplicateRecraft(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/imagegeneration_replicate_sdxl.py b/nostr_dvm/tasks/imagegeneration_replicate_sdxl.py index 749f463..7e8848e 100644 --- a/nostr_dvm/tasks/imagegeneration_replicate_sdxl.py +++ b/nostr_dvm/tasks/imagegeneration_replicate_sdxl.py @@ -127,7 +127,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I use Replicate to run StableDiffusion XL", "encryptionSupported": True, "cashuAccepted": True, @@ -140,7 +140,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return ImageGenerationReplicateSDXL(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/imagegeneration_sd21_mlx.py b/nostr_dvm/tasks/imagegeneration_sd21_mlx.py index 3c66dbf..449813e 100644 --- a/nostr_dvm/tasks/imagegeneration_sd21_mlx.py +++ b/nostr_dvm/tasks/imagegeneration_sd21_mlx.py @@ -156,7 +156,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I use Replicate to run StableDiffusion XL", "encryptionSupported": True, "cashuAccepted": True, @@ -169,7 +169,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return ImageGenerationMLX(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/imagegeneration_sd35_api.py b/nostr_dvm/tasks/imagegeneration_sd35_api.py index 981e116..0352bb7 100644 --- a/nostr_dvm/tasks/imagegeneration_sd35_api.py +++ b/nostr_dvm/tasks/imagegeneration_sd35_api.py @@ -264,7 +264,7 @@ def build_example(name, identifier, admin_config, server_address, default_model= nip89info = { "name": name, - "image": "https://i.nostr.build/NOXcCIPmOZrDTK35.jpg", + "picture": "https://i.nostr.build/NOXcCIPmOZrDTK35.jpg", "about": "I draw images using Stable diffusion ultra", "encryptionSupported": True, "cashuAccepted": True, @@ -284,7 +284,7 @@ def build_example(name, identifier, admin_config, server_address, default_model= } } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return ImageGenerationSD35(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/imagegeneration_sdxl.py b/nostr_dvm/tasks/imagegeneration_sdxl.py index 7c7e743..c51da2e 100644 --- a/nostr_dvm/tasks/imagegeneration_sdxl.py +++ b/nostr_dvm/tasks/imagegeneration_sdxl.py @@ -175,7 +175,7 @@ def build_example(name, identifier, admin_config, server_address, default_model= nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I draw images based on a prompt with a Model called unstable diffusion", "encryptionSupported": True, "cashuAccepted": True, @@ -191,7 +191,7 @@ def build_example(name, identifier, admin_config, server_address, default_model= } } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return ImageGenerationSDXL(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/imagegeneration_sdxlimg2img.py b/nostr_dvm/tasks/imagegeneration_sdxlimg2img.py index 9fa5fea..30d3aef 100644 --- a/nostr_dvm/tasks/imagegeneration_sdxlimg2img.py +++ b/nostr_dvm/tasks/imagegeneration_sdxlimg2img.py @@ -197,7 +197,7 @@ def build_example(name, identifier, admin_config, server_address, default_lora=" nip89info = { "name": name, - "image": "https://image.nostr.build/229c14e440895da30de77b3ca145d66d4b04efb4027ba3c44ca147eecde891f1.jpg", + "picture": "https://image.nostr.build/229c14e440895da30de77b3ca145d66d4b04efb4027ba3c44ca147eecde891f1.jpg", "about": "I convert an image to another image, kinda random for now. ", "encryptionSupported": True, "cashuAccepted": True, @@ -221,7 +221,7 @@ def build_example(name, identifier, admin_config, server_address, default_lora=" options = {'default_lora': default_lora, 'strength': strength, 'server': server_address} 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return ImageGenerationSDXLIMG2IMG(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/imageinterrogator.py b/nostr_dvm/tasks/imageinterrogator.py index 3dfcf57..314595e 100644 --- a/nostr_dvm/tasks/imageinterrogator.py +++ b/nostr_dvm/tasks/imageinterrogator.py @@ -114,7 +114,7 @@ def build_example(name, identifier, admin_config, server_address): nip89info = { "name": name, - "image": "https://image.nostr.build/229c14e440895da30de77b3ca145d66d4b04efb4027ba3c44ca147eecde891f1.jpg", + "picture": "https://image.nostr.build/229c14e440895da30de77b3ca145d66d4b04efb4027ba3c44ca147eecde891f1.jpg", "about": "I analyse Images an return a prompt or a prompt analysis", "encryptionSupported": True, "cashuAccepted": True, @@ -134,7 +134,7 @@ def build_example(name, identifier, admin_config, server_address): options = {'server': server_address} 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return ImageInterrogator(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/imageupscale.py b/nostr_dvm/tasks/imageupscale.py index afdccad..2676ec2 100644 --- a/nostr_dvm/tasks/imageupscale.py +++ b/nostr_dvm/tasks/imageupscale.py @@ -119,7 +119,7 @@ def build_example(name, identifier, admin_config, server_address): nip89info = { "name": name, - "image": "https://image.nostr.build/229c14e440895da30de77b3ca145d66d4b04efb4027ba3c44ca147eecde891f1.jpg", + "picture": "https://image.nostr.build/229c14e440895da30de77b3ca145d66d4b04efb4027ba3c44ca147eecde891f1.jpg", "about": "I upscale an image using realESRGan up to factor 4 (default is factor 4)", "encryptionSupported": True, "cashuAccepted": True, @@ -131,7 +131,7 @@ def build_example(name, identifier, admin_config, server_address): } } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return ImageUpscale(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/people_discovery_mywot.py b/nostr_dvm/tasks/people_discovery_mywot.py index 79ff77e..c411881 100644 --- a/nostr_dvm/tasks/people_discovery_mywot.py +++ b/nostr_dvm/tasks/people_discovery_mywot.py @@ -8,6 +8,7 @@ from nostr_sdk import Timestamp, PublicKey, Tag, Keys, Options, SecretKey, Nostr ClientBuilder, Filter, SyncOptions, SyncDirection, init_logger, LogLevel, Kind from nostr_dvm.interfaces.dvmtaskinterface import DVMTaskInterface, process_venv +from nostr_dvm.tasks.people_discovery_wot import DiscoverPeopleWOT from nostr_dvm.utils.admin_utils import AdminConfig from nostr_dvm.utils.definitions import EventDefinitions from nostr_dvm.utils.dvmconfig import DVMConfig, build_default_config @@ -306,7 +307,6 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular", "lud16": dvm_config.LN_ADDRESS, @@ -324,7 +324,7 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -351,7 +351,6 @@ def build_example_subscription(name, identifier, admin_config, options, update_r # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular all over Nostr. I'm also used for testing subscriptions.", "lud16": dvm_config.LN_ADDRESS, @@ -369,14 +368,14 @@ def build_example_subscription(name, identifier, admin_config, options, update_r } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/people_discovery_wot.py b/nostr_dvm/tasks/people_discovery_wot.py index 6c79456..64654f1 100644 --- a/nostr_dvm/tasks/people_discovery_wot.py +++ b/nostr_dvm/tasks/people_discovery_wot.py @@ -311,7 +311,6 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular", "lud16": dvm_config.LN_ADDRESS, @@ -329,7 +328,7 @@ def build_example(name, identifier, admin_config, options, cost=0, update_rate=1 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -356,7 +355,6 @@ def build_example_subscription(name, identifier, admin_config, options, update_r # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular all over Nostr. I'm also used for testing subscriptions.", "lud16": dvm_config.LN_ADDRESS, @@ -374,14 +372,14 @@ def build_example_subscription(name, identifier, admin_config, options, update_r } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 diff --git a/nostr_dvm/tasks/search_users.py b/nostr_dvm/tasks/search_users.py index 49ea8c2..11ddd1a 100644 --- a/nostr_dvm/tasks/search_users.py +++ b/nostr_dvm/tasks/search_users.py @@ -204,7 +204,7 @@ def build_example(name, identifier, admin_config): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/a99ab925084029d9468fef8330ff3d9be2cf67da473b024f2a6d48b5cd77197f.jpg", + "picture": "https://image.nostr.build/a99ab925084029d9468fef8330ff3d9be2cf67da473b024f2a6d48b5cd77197f.jpg", "about": "I search users.", "encryptionSupported": True, "cashuAccepted": True, @@ -233,7 +233,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return SearchUser(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/summarization_duckduck_ai.py b/nostr_dvm/tasks/summarization_duckduck_ai.py index 74b6b1b..b252b04 100644 --- a/nostr_dvm/tasks/summarization_duckduck_ai.py +++ b/nostr_dvm/tasks/summarization_duckduck_ai.py @@ -120,7 +120,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", + "picture": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", "about": "I summarize Text", "encryptionSupported": True, "cashuAccepted": True, @@ -128,7 +128,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) admin_config2 = AdminConfig() admin_config2.REBROADCAST_NIP89 = False diff --git a/nostr_dvm/tasks/summarization_huggingchat.py b/nostr_dvm/tasks/summarization_huggingchat.py index 8aea328..bd975ce 100644 --- a/nostr_dvm/tasks/summarization_huggingchat.py +++ b/nostr_dvm/tasks/summarization_huggingchat.py @@ -125,7 +125,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/720eadc9af89084bb09de659af43ad17fec1f4b0887084e83ac0ae708dfa83a6.png", + "picture": "https://image.nostr.build/720eadc9af89084bb09de659af43ad17fec1f4b0887084e83ac0ae708dfa83a6.png", "about": "I use a LLM connected via Huggingchat to summarize Inputs", "encryptionSupported": True, "cashuAccepted": True, @@ -133,7 +133,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TextSummarizationHuggingChat(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/summarization_unleashed_chat.py b/nostr_dvm/tasks/summarization_unleashed_chat.py index fffb175..2d683b5 100644 --- a/nostr_dvm/tasks/summarization_unleashed_chat.py +++ b/nostr_dvm/tasks/summarization_unleashed_chat.py @@ -149,7 +149,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://unleashed.chat/_app/immutable/assets/hero.pehsu4x_.jpeg", + "picture": "https://unleashed.chat/_app/immutable/assets/hero.pehsu4x_.jpeg", "about": "I summarize Text with https://unleashed.chat", "encryptionSupported": True, "cashuAccepted": True, @@ -157,7 +157,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) admin_config2 = AdminConfig() admin_config2.REBROADCAST_NIP89 = False diff --git a/nostr_dvm/tasks/textextraction_google.py b/nostr_dvm/tasks/textextraction_google.py index 04be3cb..9e42a07 100644 --- a/nostr_dvm/tasks/textextraction_google.py +++ b/nostr_dvm/tasks/textextraction_google.py @@ -137,7 +137,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I extract text from media files with the Google API. I understand English by default", "encryptionSupported": True, "cashuAccepted": True, @@ -149,7 +149,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return SpeechToTextGoogle(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/textextraction_pdf.py b/nostr_dvm/tasks/textextraction_pdf.py index 2f15b54..94bb0db 100644 --- a/nostr_dvm/tasks/textextraction_pdf.py +++ b/nostr_dvm/tasks/textextraction_pdf.py @@ -100,7 +100,7 @@ def build_example(name, identifier, admin_config): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I extract text from pdf documents. I only support Latin letters", "encryptionSupported": True, "cashuAccepted": True, @@ -108,7 +108,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TextExtractionPDF(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config) diff --git a/nostr_dvm/tasks/textextraction_whisperx.py b/nostr_dvm/tasks/textextraction_whisperx.py index 910bd37..570edac 100644 --- a/nostr_dvm/tasks/textextraction_whisperx.py +++ b/nostr_dvm/tasks/textextraction_whisperx.py @@ -161,7 +161,7 @@ def build_example(name, identifier, admin_config, server_address): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I extract text from media files with WhisperX", "encryptionSupported": True, "cashuAccepted": True, @@ -178,7 +178,7 @@ def build_example(name, identifier, admin_config, server_address): } } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return SpeechToTextWhisperX(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/textgeneration_huggingchat.py b/nostr_dvm/tasks/textgeneration_huggingchat.py index 163a944..01ae75c 100644 --- a/nostr_dvm/tasks/textgeneration_huggingchat.py +++ b/nostr_dvm/tasks/textgeneration_huggingchat.py @@ -90,7 +90,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/720eadc9af89084bb09de659af43ad17fec1f4b0887084e83ac0ae708dfa83a6.png", + "picture": "https://image.nostr.build/720eadc9af89084bb09de659af43ad17fec1f4b0887084e83ac0ae708dfa83a6.png", "about": "I use a LLM connected via Huggingchat", "encryptionSupported": True, "cashuAccepted": True, @@ -98,7 +98,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TextGenerationHuggingChat(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/textgeneration_llmlite.py b/nostr_dvm/tasks/textgeneration_llmlite.py index ce33766..decf908 100644 --- a/nostr_dvm/tasks/textgeneration_llmlite.py +++ b/nostr_dvm/tasks/textgeneration_llmlite.py @@ -105,7 +105,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I use a LLM connected via OLLAMA", "encryptionSupported": True, "cashuAccepted": True, @@ -113,7 +113,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TextGenerationLLMLite(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, diff --git a/nostr_dvm/tasks/textgeneration_unleashed_chat.py b/nostr_dvm/tasks/textgeneration_unleashed_chat.py index bb27229..14ece25 100644 --- a/nostr_dvm/tasks/textgeneration_unleashed_chat.py +++ b/nostr_dvm/tasks/textgeneration_unleashed_chat.py @@ -113,7 +113,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://unleashed.chat/_app/immutable/assets/hero.pehsu4x_.jpeg", + "picture": "https://unleashed.chat/_app/immutable/assets/hero.pehsu4x_.jpeg", "about": "I generate Text with Unleashed.chat", "encryptionSupported": True, "cashuAccepted": True, @@ -121,7 +121,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TextGenerationUnleashedChat(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/texttospeech.py b/nostr_dvm/tasks/texttospeech.py index b90393a..0d9c6e5 100644 --- a/nostr_dvm/tasks/texttospeech.py +++ b/nostr_dvm/tasks/texttospeech.py @@ -175,7 +175,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I Generate Speech from Text", "encryptionSupported": True, "cashuAccepted": True, @@ -188,7 +188,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TextToSpeech(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, diff --git a/nostr_dvm/tasks/translation_google.py b/nostr_dvm/tasks/translation_google.py index da112f0..91398bc 100644 --- a/nostr_dvm/tasks/translation_google.py +++ b/nostr_dvm/tasks/translation_google.py @@ -118,7 +118,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I translate text from given text/event/job. Currently using Google TranslationGoogle Services to translate " "input into the language defined in params.", "encryptionSupported": True, @@ -143,7 +143,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TranslationGoogle(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config) diff --git a/nostr_dvm/tasks/translation_libretranslate.py b/nostr_dvm/tasks/translation_libretranslate.py index e2fc33a..fad1a98 100644 --- a/nostr_dvm/tasks/translation_libretranslate.py +++ b/nostr_dvm/tasks/translation_libretranslate.py @@ -116,7 +116,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I translate text from given text/event/job using LibreTranslate Services to translate " "input into the language defined in params.", "encryptionSupported": True, @@ -141,7 +141,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TranslationLibre(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/videogeneration_replicate_svd.py b/nostr_dvm/tasks/videogeneration_replicate_svd.py index 92cb235..2a4162f 100644 --- a/nostr_dvm/tasks/videogeneration_replicate_svd.py +++ b/nostr_dvm/tasks/videogeneration_replicate_svd.py @@ -120,7 +120,7 @@ def build_example(name, identifier, admin_config): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I use Replicate to run StableDiffusion XL", "encryptionSupported": True, "cashuAccepted": True, @@ -128,7 +128,7 @@ 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return VideoGenerationReplicateSVD(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/tasks/videogeneration_svd.py b/nostr_dvm/tasks/videogeneration_svd.py index ce60455..c8d68af 100644 --- a/nostr_dvm/tasks/videogeneration_svd.py +++ b/nostr_dvm/tasks/videogeneration_svd.py @@ -108,14 +108,14 @@ def build_example(name, identifier, admin_config, server_address): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I create a short video based on an image", "encryptionSupported": True, "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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return VideoGenerationSVD(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/nostr_dvm/utils/external_dvm_utils.py b/nostr_dvm/utils/external_dvm_utils.py index 04456f1..60e6a73 100644 --- a/nostr_dvm/utils/external_dvm_utils.py +++ b/nostr_dvm/utils/external_dvm_utils.py @@ -44,7 +44,9 @@ def build_external_dvm(pubkey, task, kind, fix_cost, per_unit_cost, config, nip89content = json.loads(nip89content_str) if nip89content.get("name"): name = nip89content.get("name") - if nip89content.get("image"): + if nip89content.get("picture"): + image = nip89content.get("picture") + elif nip89content.get("image"): image = nip89content.get("image") if nip89content.get("about"): about = nip89content.get("about") @@ -58,7 +60,7 @@ def build_external_dvm(pubkey, task, kind, fix_cost, per_unit_cost, config, print("No NIP89 set for " + name) nip89info = { "name": name, - "image": image, + "picture": image, "about": about, "encryptionSupported": encryption_supported, "cashuAccepted": cashu_accepted, diff --git a/nostr_dvm/utils/nip88_utils.py b/nostr_dvm/utils/nip88_utils.py index 1b8c63c..6760dbd 100644 --- a/nostr_dvm/utils/nip88_utils.py +++ b/nostr_dvm/utils/nip88_utils.py @@ -130,7 +130,7 @@ async def nip88_has_active_subscription(user: PublicKey, tiereventdtag, client: async def nip88_announce_tier(dvm_config, client): title_tag = Tag.parse(["title", str(dvm_config.NIP88.TITLE)]) - image_tag = Tag.parse(["image", str(dvm_config.NIP88.IMAGE)]) + image_tag = Tag.parse(["picture", str(dvm_config.NIP88.IMAGE)]) d_tag = Tag.parse(["d", dvm_config.NIP88.DTAG]) # zap splits. Feel free to change this for your DVM diff --git a/nostr_dvm/utils/nostr_utils.py b/nostr_dvm/utils/nostr_utils.py index 33d24b9..9010d75 100644 --- a/nostr_dvm/utils/nostr_utils.py +++ b/nostr_dvm/utils/nostr_utils.py @@ -379,7 +379,7 @@ async def update_profile(dvm_config, client, lud16=""): nip89content = json.loads(dvm_config.NIP89.CONTENT) name = nip89content.get("name") about = nip89content.get("about") - image = nip89content.get("image") + image = nip89content.get("picture") # Set metadata metadata = Metadata() \ diff --git a/tests/chat_bot.py b/tests/chat_bot.py index d89194f..f7c2b22 100644 --- a/tests/chat_bot.py +++ b/tests/chat_bot.py @@ -47,7 +47,7 @@ def playground(announce = False): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", + "picture": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", "about": "I'm briding DuckDuckAI'", "encryptionSupported": True, "cashuAccepted": True, @@ -57,7 +57,7 @@ def playground(announce = False): nip89config = NIP89Config() nip89config.KIND = kind - 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) options = { diff --git a/tests/dalle.py b/tests/dalle.py index 9f4c9db..a29869c 100644 --- a/tests/dalle.py +++ b/tests/dalle.py @@ -35,7 +35,7 @@ def build_dalle(name, identifier): dvm_config.FIX_COST = int(((4.0 / (get_price_per_sat("USD") * 100)) + profit_in_sats)) nip89info = { "name": name, - "image": "https://image.nostr.build/22f2267ca9d4ee9d5e8a0c7818a9fa325bbbcdac5573a60a2d163e699bb69923.jpg", + "picture": "https://image.nostr.build/22f2267ca9d4ee9d5e8a0c7818a9fa325bbbcdac5573a60a2d163e699bb69923.jpg", "about": "I create Images bridging OpenAI's DALL·E 3", "encryptionSupported": True, "cashuAccepted": True, @@ -48,7 +48,7 @@ def build_dalle(name, identifier): } nip89config = NIP89Config() nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89info["picture"]) nip89config.CONTENT = json.dumps(nip89info) aconfig = AdminConfig() aconfig.REBROADCAST_NIP89 = False # We add an optional AdminConfig for this one, and tell the dvm to rebroadcast its NIP89 diff --git a/tests/discovery.py b/tests/discovery.py index 0d57830..6bb3c80 100644 --- a/tests/discovery.py +++ b/tests/discovery.py @@ -75,7 +75,6 @@ def build_db_scheduler(name, identifier, admin_config, options, image, descripti # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": description, "lud16": dvm_config.LN_ADDRESS, @@ -93,7 +92,7 @@ def build_db_scheduler(name, identifier, admin_config, options, image, descripti } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentDBUpdateScheduler(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -118,7 +117,6 @@ def build_example_gallery(name, identifier, admin_config, options, image, cost=0 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show popular gallery entries", "lud16": dvm_config.LN_ADDRESS, @@ -136,7 +134,7 @@ def build_example_gallery(name, identifier, admin_config, options, image, cost=0 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularGallery(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) @@ -156,7 +154,6 @@ def build_example_nostrband(name, identifier, admin_config, image, about, custom nip89info = { "name": name, - "image": image, "picture": image, "about": about, "amount": "Free", @@ -165,7 +162,7 @@ def build_example_nostrband(name, identifier, admin_config, image, about, custom "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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TrendingNotesNostrBand(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -196,7 +193,6 @@ def build_longform(name, identifier, admin_config, options, cost=0, update_rate= # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show the latest longform notes.", "lud16": dvm_config.LN_ADDRESS, @@ -214,7 +210,7 @@ def build_longform(name, identifier, admin_config, options, cost=0, update_rate= } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -249,7 +245,6 @@ def build_wiki(name, identifier, admin_config, options, cost=0, update_rate=180, # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show the latest wikifreedia entries.", "lud16": dvm_config.LN_ADDRESS, @@ -267,7 +262,7 @@ def build_wiki(name, identifier, admin_config, options, cost=0, update_rate=180, } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -298,7 +293,6 @@ def build_example_topic(name, identifier, admin_config, options, image, descript # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": description, "lud16": dvm_config.LN_ADDRESS, @@ -316,7 +310,7 @@ def build_example_topic(name, identifier, admin_config, options, image, descript } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularbyTopic(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -341,7 +335,6 @@ def build_example_popular(name, identifier, admin_config, options, image, cost=0 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular", "lud16": dvm_config.LN_ADDRESS, @@ -359,7 +352,7 @@ def build_example_popular(name, identifier, admin_config, options, image, cost=0 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopular(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) @@ -385,7 +378,6 @@ def build_example_popular_followers(name, identifier, admin_config, options, ima # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular from people you follow", "lud16": dvm_config.LN_ADDRESS, @@ -403,7 +395,7 @@ def build_example_popular_followers(name, identifier, admin_config, options, ima } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularFollowers(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -435,7 +427,6 @@ def build_example_popular_non_followers(name, identifier, admin_config, options, # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular from people you do not follow", "lud16": dvm_config.LN_ADDRESS, @@ -454,14 +445,14 @@ def build_example_popular_non_followers(name, identifier, admin_config, options, } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 @@ -502,7 +493,6 @@ def build_example_top_zapped(name, identifier, admin_config, options, image, cos # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently zapped the most.", "lud16": dvm_config.LN_ADDRESS, @@ -520,7 +510,7 @@ def build_example_top_zapped(name, identifier, admin_config, options, image, cos } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -551,7 +541,6 @@ def build_example_mostr(name, identifier, admin_config, options, image, cost=0, # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes from Mostr.pub and Momostr.pink that are currently popular on Nostr", "lud16": dvm_config.LN_ADDRESS, @@ -569,7 +558,7 @@ def build_example_mostr(name, identifier, admin_config, options, image, cost=0, } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularMostr(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) @@ -594,7 +583,6 @@ def build_example_oneperfollow(name, identifier, admin_config, options, image, c # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show the single latest note of people you follow", "lud16": dvm_config.LN_ADDRESS, @@ -612,7 +600,7 @@ def build_example_oneperfollow(name, identifier, admin_config, options, image, c } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return Discoverlatestperfollower(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) diff --git a/tests/discovery_custom_feed.py b/tests/discovery_custom_feed.py index 679aaac..ec1864d 100644 --- a/tests/discovery_custom_feed.py +++ b/tests/discovery_custom_feed.py @@ -46,7 +46,6 @@ def build_example_topic(name, identifier, admin_config, options, image, descript # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": description, "lud16": dvm_config.LN_ADDRESS, @@ -79,7 +78,7 @@ def build_example_topic(name, identifier, admin_config, options, image, descript } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularbyTopic(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/tests/discovery_gallery.py b/tests/discovery_gallery.py index 618ca4b..49119c5 100644 --- a/tests/discovery_gallery.py +++ b/tests/discovery_gallery.py @@ -37,7 +37,6 @@ def build_example_gallery(name, identifier, admin_config, options, image, cost=0 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show popular gallery entries", "lud16": dvm_config.LN_ADDRESS, @@ -55,7 +54,7 @@ def build_example_gallery(name, identifier, admin_config, options, image, cost=0 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularGallery(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) diff --git a/tests/discovery_mostr.py b/tests/discovery_mostr.py index 29e6153..af93f9c 100644 --- a/tests/discovery_mostr.py +++ b/tests/discovery_mostr.py @@ -51,7 +51,6 @@ def build_example_mostr(name, identifier, admin_config, options, image, cost=0, # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show popular notes from Mostr.pub and Momostr.pink", "lud16": dvm_config.LN_ADDRESS, @@ -69,7 +68,7 @@ def build_example_mostr(name, identifier, admin_config, options, image, cost=0, } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularMostr(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) diff --git a/tests/discovery_one_per_follow.py b/tests/discovery_one_per_follow.py index b230ffd..5b2dece 100644 --- a/tests/discovery_one_per_follow.py +++ b/tests/discovery_one_per_follow.py @@ -40,7 +40,6 @@ def build_example_oneperfollow(name, identifier, admin_config, options, image, c # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show the single latest note of people you follow", "lud16": dvm_config.LN_ADDRESS, @@ -58,7 +57,7 @@ def build_example_oneperfollow(name, identifier, admin_config, options, image, c } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return Discoverlatestperfollower(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) diff --git a/tests/discovery_people.py b/tests/discovery_people.py index 4d91656..f94db9f 100644 --- a/tests/discovery_people.py +++ b/tests/discovery_people.py @@ -45,7 +45,6 @@ def build_example_wot(name, identifier, admin_config, options, image, cost=0, up # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show people to follow from your WOT", "lud16": dvm_config.LN_ADDRESS, @@ -63,7 +62,7 @@ def build_example_wot(name, identifier, admin_config, options, image, cost=0, up } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DiscoverPeopleMyWOT(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) diff --git a/tests/discovery_test.py b/tests/discovery_test.py index aee8b64..cadd7f5 100644 --- a/tests/discovery_test.py +++ b/tests/discovery_test.py @@ -72,7 +72,6 @@ def build_db_scheduler(name, identifier, admin_config, options, image, descripti # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": description, "lud16": dvm_config.LN_ADDRESS, @@ -90,7 +89,7 @@ def build_db_scheduler(name, identifier, admin_config, options, image, descripti } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentDBUpdateScheduler(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -115,7 +114,6 @@ def build_example_gallery(name, identifier, admin_config, options, image, cost=0 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show popular gallery entries", "lud16": dvm_config.LN_ADDRESS, @@ -133,7 +131,7 @@ def build_example_gallery(name, identifier, admin_config, options, image, cost=0 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularGallery(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) @@ -152,7 +150,6 @@ def build_example_nostrband(name, identifier, admin_config, image, about, custom nip89info = { "name": name, - "image": image, "picture": image, "about": about, "amount": "Free", @@ -161,7 +158,7 @@ def build_example_nostrband(name, identifier, admin_config, image, about, custom "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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return TrendingNotesNostrBand(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -191,7 +188,6 @@ def build_longform(name, identifier, admin_config, options, cost=0, update_rate= # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show the latest longform notes.", "lud16": dvm_config.LN_ADDRESS, @@ -209,7 +205,7 @@ def build_longform(name, identifier, admin_config, options, cost=0, update_rate= } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -243,7 +239,6 @@ def build_wiki(name, identifier, admin_config, options, cost=0, update_rate=180, # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show the latest wikifreedia entries.", "lud16": dvm_config.LN_ADDRESS, @@ -261,7 +256,7 @@ def build_wiki(name, identifier, admin_config, options, cost=0, update_rate=180, } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -289,7 +284,6 @@ def build_example_topic(name, identifier, admin_config, options, image, descript # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": description, "lud16": dvm_config.LN_ADDRESS, @@ -307,7 +301,7 @@ def build_example_topic(name, identifier, admin_config, options, image, descript } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularbyTopic(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -331,7 +325,6 @@ def build_example_popular(name, identifier, admin_config, options, image, cost=0 # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular", "lud16": dvm_config.LN_ADDRESS, @@ -349,7 +342,7 @@ def build_example_popular(name, identifier, admin_config, options, image, cost=0 } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopular(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) @@ -372,7 +365,6 @@ def build_example_popular_followers(name, identifier, admin_config, options, ima # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular from people you follow", "lud16": dvm_config.LN_ADDRESS, @@ -390,7 +382,7 @@ def build_example_popular_followers(name, identifier, admin_config, options, ima } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularFollowers(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -421,7 +413,6 @@ def build_example_popular_non_followers(name, identifier, admin_config, options, # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently popular from people you do not follow", "lud16": dvm_config.LN_ADDRESS, @@ -439,14 +430,14 @@ def build_example_popular_non_followers(name, identifier, admin_config, options, } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) nip88config = NIP88Config() - nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["picture"]) nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") nip89config.NAME = name - nip88config.IMAGE = nip89info["image"] + nip88config.IMAGE = nip89info["picture"] nip88config.TITLE = name nip88config.AMOUNT_DAILY = 100 nip88config.AMOUNT_MONTHLY = 2000 @@ -484,7 +475,6 @@ def build_example_top_zapped(name, identifier, admin_config, options, image, cos # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes that are currently zapped the most.", "lud16": dvm_config.LN_ADDRESS, @@ -502,7 +492,7 @@ def build_example_top_zapped(name, identifier, admin_config, options, image, cos } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) # admin_config.UPDATE_PROFILE = False @@ -532,7 +522,6 @@ def build_example_mostr(name, identifier, admin_config, options, image, cost=0, # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show notes from Mostr.pub and Momostr.pink that are currently popular on Nostr", "lud16": dvm_config.LN_ADDRESS, @@ -550,7 +539,7 @@ def build_example_mostr(name, identifier, admin_config, options, image, cost=0, } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DicoverContentCurrentlyPopularMostr(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) @@ -573,7 +562,6 @@ def build_example_oneperfollow(name, identifier, admin_config, options, image, c # Add NIP89 nip89info = { "name": name, - "image": image, "picture": image, "about": "I show the single latest note of people you follow", "lud16": dvm_config.LN_ADDRESS, @@ -591,7 +579,7 @@ def build_example_oneperfollow(name, identifier, admin_config, options, image, c } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return Discoverlatestperfollower(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) diff --git a/tests/generic_dvm.py b/tests/generic_dvm.py index 915f470..5ef2d93 100644 --- a/tests/generic_dvm.py +++ b/tests/generic_dvm.py @@ -24,7 +24,7 @@ def playground(announce=False): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", + "picture": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", "about": "I'm an all purpose DVM'", "encryptionSupported": True, "cashuAccepted": True, @@ -33,7 +33,7 @@ def playground(announce=False): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) options = { diff --git a/tests/generic_dvm_autotopic_feed.py b/tests/generic_dvm_autotopic_feed.py index 5e6585a..ed00723 100644 --- a/tests/generic_dvm_autotopic_feed.py +++ b/tests/generic_dvm_autotopic_feed.py @@ -79,7 +79,7 @@ def playground(announce=False): # Add NIP89 nip89info = { "name": name, - "image": "https://i.nostr.build/I8fJo0n355cbNEbS.png", # "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", + "picture": "https://i.nostr.build/I8fJo0n355cbNEbS.png", # "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", "about": "I create a personalized feed based on topics you were writing about recently", "encryptionSupported": True, "cashuAccepted": True, @@ -89,7 +89,7 @@ def playground(announce=False): nip89config = NIP89Config() nip89config.KIND = Kind(kind) - 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) options = { diff --git a/tests/generic_dvm_duck_chat.py b/tests/generic_dvm_duck_chat.py index 5cbc172..491c92e 100644 --- a/tests/generic_dvm_duck_chat.py +++ b/tests/generic_dvm_duck_chat.py @@ -44,7 +44,7 @@ def playground(announce=False): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", + "picture": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", "about": "I'm briding DuckDuckAI'", "encryptionSupported": True, "cashuAccepted": True, @@ -54,7 +54,7 @@ def playground(announce=False): nip89config = NIP89Config() nip89config.KIND = kind - 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) options = { diff --git a/tests/generic_dvm_flux_hf.py b/tests/generic_dvm_flux_hf.py index e61c5bc..9b71e4f 100644 --- a/tests/generic_dvm_flux_hf.py +++ b/tests/generic_dvm_flux_hf.py @@ -49,7 +49,7 @@ def playground(announce=False): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", + "picture": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", "about": "I produce images with Flux-Schnell'", "encryptionSupported": True, "cashuAccepted": True, @@ -59,7 +59,7 @@ def playground(announce=False): nip89config = NIP89Config() nip89config.KIND = kind - 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) options = { diff --git a/tests/otherstuff.py b/tests/otherstuff.py index 1c7780b..3cb9bfb 100644 --- a/tests/otherstuff.py +++ b/tests/otherstuff.py @@ -58,7 +58,7 @@ def build_sd35(name, identifier, announce): dvm_config.FIX_COST = int(((4.0 / (get_price_per_sat("USD") * 100)) + profit_in_sats)) nip89info = { "name": name, - "image": "https://i.nostr.build/NOXcCIPmOZrDTK35.jpg", + "picture": "https://i.nostr.build/NOXcCIPmOZrDTK35.jpg", "about": "I draw images using Stable diffusion ultra", "encryptionSupported": True, "cashuAccepted": True, @@ -75,7 +75,7 @@ def build_sd35(name, identifier, announce): } nip89config = NIP89Config() nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89info["picture"]) nip89config.CONTENT = json.dumps(nip89info) aconfig = AdminConfig() aconfig.REBROADCAST_NIP89 = announce # We add an optional AdminConfig for this one, and tell the dvm to rebroadcast its NIP89 @@ -107,7 +107,7 @@ def build_dalle(name, identifier, announce): nip89info = { "name": name, - "image": "https://image.nostr.build/22f2267ca9d4ee9d5e8a0c7818a9fa325bbbcdac5573a60a2d163e699bb69923.jpg", + "picture": "https://image.nostr.build/22f2267ca9d4ee9d5e8a0c7818a9fa325bbbcdac5573a60a2d163e699bb69923.jpg", "about": "I create Images bridging OpenAI's DALL·E 3", "encryptionSupported": True, "cashuAccepted": True, @@ -121,7 +121,7 @@ def build_dalle(name, identifier, announce): nip89config = NIP89Config() nip89config.DTAG = nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89info["picture"]) nip89config.CONTENT = json.dumps(nip89info) # We add an optional AdminConfig for this one, and tell the dvm to rebroadcast its NIP89 @@ -143,7 +143,7 @@ def build_svd(name, identifier, announce): nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I use Stable Video Diffusion to create short videos", "encryptionSupported": True, "cashuAccepted": True, @@ -152,7 +152,7 @@ def build_svd(name, identifier, announce): nip89config = NIP89Config() nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89info["picture"]) 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, @@ -170,7 +170,7 @@ def build_media_converter(name, identifier, announce): admin_config.REBROADCAST_NIP65_RELAY_LIST = announce nip89info = { "name": name, - "image": "https://cdn.nostr.build/i/a177be1159da5aad8396a1188f686728d55647d3a7371549584daf2b5e50eec9.jpg", + "picture": "https://cdn.nostr.build/i/a177be1159da5aad8396a1188f686728d55647d3a7371549584daf2b5e50eec9.jpg", "about": "I convert videos from urls to given output format.", "encryptionSupported": True, "cashuAccepted": True, @@ -183,7 +183,7 @@ def build_media_converter(name, identifier, announce): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return MediaConverter(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config) @@ -204,7 +204,7 @@ def build_inactive_follows_finder(name, identifier, announce): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/50621bbf8082c478bc06a06684e1c443b5d37f1362ad56d679cab7328e0481db.jpg", + "picture": "https://image.nostr.build/50621bbf8082c478bc06a06684e1c443b5d37f1362ad56d679cab7328e0481db.jpg", "about": "I discover npubs you follow, but that have been inactive on Nostr for the last 90 days", "action": "unfollow", "cashuAccepted": True, @@ -225,7 +225,7 @@ def build_inactive_follows_finder(name, identifier, announce): nip89config = NIP89Config() nip89config.DTAG = nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89info["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DiscoverInactiveFollows(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -244,7 +244,7 @@ def build_1984(name, identifier, announce): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/19872a2edd866258fa9eab137631efda89310d52b2c6ea8f99ef057325aa1c7b.jpg", + "picture": "https://image.nostr.build/19872a2edd866258fa9eab137631efda89310d52b2c6ea8f99ef057325aa1c7b.jpg", "about": "I show users that have been reported by either your followers or your Web of Trust. Note: Anyone can report, so you might double check and decide for yourself who to mute. Considers spam, illegal and impersonation reports. Notice: This works with NIP51 mute lists. Not all clients support the new mute list format.", "encryptionSupported": True, "cashuAccepted": True, @@ -258,7 +258,7 @@ def build_1984(name, identifier, announce): } } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return DiscoverReports(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -279,7 +279,7 @@ def build_botfarms(name, identifier, announce): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/981b560820bc283c58de7989b7abc6664996b487a531d852e4ef7322586a2122.jpg", + "picture": "https://image.nostr.build/981b560820bc283c58de7989b7abc6664996b487a531d852e4ef7322586a2122.jpg", "about": "I hunt down bot farms.", "encryptionSupported": True, "cashuAccepted": True, @@ -294,7 +294,7 @@ def build_botfarms(name, identifier, announce): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) options = {"relay": "wss://relay.damus.io"} @@ -317,7 +317,7 @@ def build_replicate(name, identifier, model, announce): nip89info = { "name": name, - "image": "https://i.nostr.build/qnoBIN4jSkfF8IHk.png", + "picture": "https://i.nostr.build/qnoBIN4jSkfF8IHk.png", "about": "I use Replicate to run StableDiffusion XL", "encryptionSupported": True, "cashuAccepted": True, @@ -330,7 +330,7 @@ def build_replicate(name, identifier, model, announce): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) opts = {"model": model} @@ -354,7 +354,7 @@ def build_replicate_recraft(name, identifier, announce): nip89info = { "name": name, - "image": "https://i.nostr.build/jSbrXvYglXCzSeAc.jpg", + "picture": "https://i.nostr.build/jSbrXvYglXCzSeAc.jpg", "about": "I use Replicate to run Recraft v3", "encryptionSupported": True, "cashuAccepted": True, @@ -367,7 +367,7 @@ def build_replicate_recraft(name, identifier, announce): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) @@ -389,7 +389,7 @@ def build_replicate_fluxpro(name, identifier, announce): nip89info = { "name": name, - "image": "https://i.nostr.build/AQTujqzVmLxLmG16.jpg", + "picture": "https://i.nostr.build/AQTujqzVmLxLmG16.jpg", "about": "I use Replicate to FluxPro 1.1.", "encryptionSupported": True, "cashuAccepted": True, @@ -402,7 +402,7 @@ def build_replicate_fluxpro(name, identifier, announce): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) diff --git a/tests/sd35_api.py b/tests/sd35_api.py index cef26e9..5d69151 100644 --- a/tests/sd35_api.py +++ b/tests/sd35_api.py @@ -33,7 +33,7 @@ def build_sd35(name, identifier): dvm_config.FIX_COST = int(((4.0 / (get_price_per_sat("USD") * 100)) + profit_in_sats)) nip89info = { "name": name, - "image": "https://i.nostr.build/NOXcCIPmOZrDTK35.jpg", + "picture": "https://i.nostr.build/NOXcCIPmOZrDTK35.jpg", "about": "I draw images using Stable diffusion ultra", "encryptionSupported": True, "cashuAccepted": True, @@ -50,7 +50,7 @@ def build_sd35(name, identifier): } nip89config = NIP89Config() nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89info["picture"]) nip89config.CONTENT = json.dumps(nip89info) aconfig = AdminConfig() aconfig.REBROADCAST_NIP89 = False # We add an optional AdminConfig for this one, and tell the dvm to rebroadcast its NIP89 diff --git a/tests/search.py b/tests/search.py index 178eb5b..4868967 100644 --- a/tests/search.py +++ b/tests/search.py @@ -61,7 +61,7 @@ def build_advanced_search(name, identifier): nip89info = { "name": name, - "image": "https://nostr.band/android-chrome-192x192.png", + "picture": "https://nostr.band/android-chrome-192x192.png", "about": "I search notes on nostr.band", "encryptionSupported": True, "cashuAccepted": True, @@ -90,7 +90,7 @@ def build_advanced_search(name, identifier): } nip89config = NIP89Config() nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89info["picture"]) nip89config.CONTENT = json.dumps(nip89info) return AdvancedSearch(name=name, dvm_config=dvm_config, nip89config=nip89config, @@ -117,7 +117,7 @@ def build_advanced_search_wine(name, identifier): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/d844d6a963724b9f9deb6b3326984fd95352343336718812424d5e99d93a6f2d.jpg", + "picture": "https://image.nostr.build/d844d6a963724b9f9deb6b3326984fd95352343336718812424d5e99d93a6f2d.jpg", "about": "I search notes on nostr.wine using the nostr-wine API", "encryptionSupported": True, "cashuAccepted": True, @@ -147,7 +147,7 @@ def build_advanced_search_wine(name, identifier): nip89config = NIP89Config() nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, - nip89info["image"]) + nip89info["picture"]) nip89config.CONTENT = json.dumps(nip89info) @@ -173,7 +173,7 @@ def build_user_search(name, identifier): # Add NIP89 nip89info = { "name": name, - "image": "https://image.nostr.build/bd0181a3089181f1d92a5da1ef85cffbe37ba80fbcc695b9d85648dc2fa92583.jpg", + "picture": "https://image.nostr.build/bd0181a3089181f1d92a5da1ef85cffbe37ba80fbcc695b9d85648dc2fa92583.jpg", "about": "I search users based on their profile info.", "encryptionSupported": True, "cashuAccepted": True, @@ -187,7 +187,7 @@ def build_user_search(name, identifier): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) return SearchUser(name=name, dvm_config=dvm_config, nip89config=nip89config, diff --git a/tests/summarization_duck.py b/tests/summarization_duck.py index f8a58f9..674ce79 100644 --- a/tests/summarization_duck.py +++ b/tests/summarization_duck.py @@ -22,7 +22,7 @@ def playground(announce=False): nip89info = { "name": name, - "image": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", + "picture": "https://image.nostr.build/28da676a19841dcfa7dcf7124be6816842d14b84f6046462d2a3f1268fe58d03.png", "about": "I summarize Text", "encryptionSupported": True, "cashuAccepted": True, @@ -30,7 +30,7 @@ def playground(announce=False): } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) diff --git a/tests/tts.py b/tests/tts.py index 4c6f7c4..59c5259 100644 --- a/tests/tts.py +++ b/tests/tts.py @@ -32,7 +32,7 @@ if __name__ == '__main__': options = {'input_file': ""} nip89info = { "name": name, - "image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", + "picture": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg", "about": "I Generate Speech from Text", "encryptionSupported": True, "cashuAccepted": True, @@ -45,7 +45,7 @@ if __name__ == '__main__': } 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) tts = TextToSpeech(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config_tts, options=options) diff --git a/tutorials/05_announce_dvm.py b/tutorials/05_announce_dvm.py index 1bbc3ba..18eebf0 100644 --- a/tutorials/05_announce_dvm.py +++ b/tutorials/05_announce_dvm.py @@ -72,7 +72,7 @@ def run_dvm(identifier, announce): # We set a d tag. We need the dtag so if we want to update or delete the announcement, relays know which event is meant # You can choose a dtag you like. Here we build a hash from identiier, name, key and image and store it in the .env file. # So even if you change the name or image, it will now use the dtag from the env file until you delete it. - 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["picture"]) # We dump the nip89info struct from above to the content nip89config.CONTENT = json.dumps(nip89info) diff --git a/tutorials/06_dvm_config.py b/tutorials/06_dvm_config.py index 44229f4..cf61845 100644 --- a/tutorials/06_dvm_config.py +++ b/tutorials/06_dvm_config.py @@ -131,7 +131,7 @@ def run_dvm(identifier, announce): # We now create or Nip89Config object nip89config = NIP89Config() nip89config.KIND = kind - 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["picture"]) nip89config.CONTENT = json.dumps(nip89info) diff --git a/tutorials/07_admin_config.py b/tutorials/07_admin_config.py index 9eee2bd..eff01ba 100644 --- a/tutorials/07_admin_config.py +++ b/tutorials/07_admin_config.py @@ -106,7 +106,7 @@ def run_dvm(identifier, announce): # We now create or Nip89Config object nip89config = NIP89Config() nip89config.KIND = kind - 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["picture"]) nip89config.CONTENT = json.dumps(nip89info)