Merge pull request #36 from believethehype/sdk037

Sdk037
believethehype · Nov 27, 2024 · 4506831 · 4506831
2 parents 4c2a042 + 704470d
commit 4506831
Show file tree

Hide file tree

Showing 113 changed files with 995 additions and 882 deletions.
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
diff --git a/.idea/dvm.iml b/.idea/dvm.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/examples/ollama_dvm/main.py b/examples/ollama_dvm/main.py
@@ -22,17 +22,17 @@ 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,
+        "supportsEncryption": True,
+        "acceptsNutZaps": dvm_config.ENABLE_NUTZAP,
         "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)
 
     ollama = TextGenerationLLMLite(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config,

diff --git a/examples/ollama_dvm/test_client.py b/examples/ollama_dvm/test_client.py
@@ -20,13 +20,13 @@ async def nostr_client_test_llm(prompt):
     relaysTag = Tag.parse(['relays', "wss://relay.damus.io", "wss://blastr.f7z.xyz", "wss://relayable.org",
                            "wss://nostr-pub.wellorder.net"])
     alttag = Tag.parse(["alt", "This is a NIP90 DVM AI task to generate TTSt"])
-    event = EventBuilder(EventDefinitions.KIND_NIP90_GENERATE_TEXT, str("Generate an Audio File."),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_GENERATE_TEXT, str("Generate an Audio File.")).tags(
                          [iTag, relaysTag, alttag]).sign_with_keys(keys)
 
     relay_list = ["wss://relay.damus.io", "wss://blastr.f7z.xyz", "wss://relayable.org",
                   "wss://nostr-pub.wellorder.net"]
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
 
     for relay in relay_list:
         await client.add_relay(relay)
@@ -40,7 +40,7 @@ async def nostr_client():
     sk = keys.secret_key()
     pk = keys.public_key()
     print(f"Nostr Test Client public key: {pk.to_bech32()}, Hex: {pk.to_hex()} ")
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     dvmconfig = DVMConfig()
     for relay in dvmconfig.RELAY_LIST:
         await client.add_relay(relay)

diff --git a/examples/tts_dvm/main.py b/examples/tts_dvm/main.py
@@ -22,10 +22,10 @@ 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,
+        "supportsEncryption": True,
+        "acceptsNutZaps": dvm_config.ENABLE_NUTZAP,
         "nip90Params": {
             "language": {
                 "required": False,
@@ -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/tts_dvm/test_client.py b/examples/tts_dvm/test_client.py
@@ -24,14 +24,14 @@ async def nostr_client_test_tts(prompt):
     relaysTag = Tag.parse(['relays', "wss://relay.damus.io", "wss://blastr.f7z.xyz", "wss://relayable.org",
                            "wss://nostr-pub.wellorder.net"])
     alttag = Tag.parse(["alt", "This is a NIP90 DVM AI task to generate TTS"])
-    event = EventBuilder(EventDefinitions.KIND_NIP90_TEXT_TO_SPEECH, str("Generate an Audio File."),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_TEXT_TO_SPEECH, str("Generate an Audio File.")).tags(
                          [iTag, paramTag1, bidTag, relaysTag, alttag]).sign_with_keys(keys)
 
     relay_list = ["wss://relay.damus.io", "wss://blastr.f7z.xyz", "wss://relayable.org",
                   "wss://nostr-pub.wellorder.net"]
 
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     await client.connect()
@@ -44,7 +44,7 @@ async def nostr_client():
     sk = keys.secret_key()
     pk = keys.public_key()
     print(f"Nostr Test Client public key: {pk.to_bech32()}, Hex: {pk.to_hex()} ")
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
 
     dvmconfig = DVMConfig()
     for relay in dvmconfig.RELAY_LIST:

diff --git a/examples/unleashed_dvm/main.py b/examples/unleashed_dvm/main.py
@@ -22,15 +22,15 @@ 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,
+        "supportsEncryption": True,
+        "acceptsNutZaps": dvm_config.ENABLE_NUTZAP,
         "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)
 
 

diff --git a/examples/unleashed_dvm/test_client.py b/examples/unleashed_dvm/test_client.py
@@ -23,13 +23,13 @@ async def nostr_client_test(prompt):
     relaysTag = Tag.parse(['relays', "wss://relay.damus.io", "wss://blastr.f7z.xyz", "wss://relayable.org",
                            "wss://nostr-pub.wellorder.net"])
     alttag = Tag.parse(["alt", "This is a NIP90 DVM AI task to generate TTS"])
-    event = EventBuilder(EventDefinitions.KIND_NIP90_GENERATE_TEXT, str("Answer to prompt"),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_GENERATE_TEXT, str("Answer to prompt")).tags(
                          [iTag, relaysTag, alttag]).sign_with_keys(keys)
 
     relay_list = ["wss://relay.damus.io", "wss://blastr.f7z.xyz", "wss://relayable.org",
                   "wss://nostr-pub.wellorder.net"]
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     await client.connect()
@@ -42,7 +42,7 @@ async def nostr_client():
     sk = keys.secret_key()
     pk = keys.public_key()
     print(f"Nostr Test Client public key: {pk.to_bech32()}, Hex: {pk.to_hex()} ")
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
 
     dvmconfig = DVMConfig()
     for relay in dvmconfig.RELAY_LIST:

diff --git a/main.py b/main.py
@@ -24,16 +24,16 @@ 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,
+        "supportsEncryption": True,
+        "acceptsNutZaps": dvm_config.ENABLE_NUTZAP,
         "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)
 
     options = {