From b0994998ba94b9c9d701fc5c79f249b130c5d371 Mon Sep 17 00:00:00 2001
From: Believethehype <1097224+believethehype@users.noreply.github.com>
Date: Tue, 19 Nov 2024 10:19:06 +0100
Subject: [PATCH] adapt to sdk

---
 examples/ollama_dvm/test_client.py            |  6 +-
 examples/tts_dvm/test_client.py               |  6 +-
 examples/unleashed_dvm/test_client.py         |  6 +-
 nostr_dvm/subscription.py                     |  2 +-
 nostr_dvm/tasks/advanced_search.py            |  2 +-
 ...ntent_discovery_latest_one_per_follower.py |  2 +-
 nostr_dvm/tasks/discovery_inactive_follows.py |  2 +-
 nostr_dvm/tasks/discovery_nonfollowers.py     |  2 +-
 .../discovery_trending_notes_gleasonator.py   |  2 +-
 nostr_dvm/utils/external_dvm_utils.py         |  2 +-
 nostr_dvm/utils/nostr_utils.py                |  2 +-
 nostr_dvm/utils/nut_wallet_utils.py           |  4 +-
 nostr_dvm/utils/reaction_utils.py             |  4 +-
 tests/ditto.py                                |  2 +-
 tests/simplebot.py                            |  2 +-
 tests/test_dvm_client.py                      | 58 +++++++++----------
 tests/test_events.py                          |  4 +-
 tutorials/03_client.py                        |  6 +-
 tutorials/09_nutzap_client.py                 |  6 +-
 19 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/examples/ollama_dvm/test_client.py b/examples/ollama_dvm/test_client.py
index d591103..b4f3470 100644
--- 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/test_client.py b/examples/tts_dvm/test_client.py
index c62e001..e504dd9 100644
--- 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/test_client.py b/examples/unleashed_dvm/test_client.py
index 3202d9c..736950b 100644
--- 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/nostr_dvm/subscription.py b/nostr_dvm/subscription.py
index a64ec5d..8b45af8 100644
--- a/nostr_dvm/subscription.py
+++ b/nostr_dvm/subscription.py
@@ -39,7 +39,7 @@ class Subscription:
         self.dvm_config.NIP89 = nip89config
         self.admin_config = admin_config
         self.keys = Keys.parse(dvm_config.PRIVATE_KEY)
-        self.client = Client(self.keys)
+        self.client = Client(NostrSigner.keys(self.keys))
 
         pk = self.keys.public_key()
 
diff --git a/nostr_dvm/tasks/advanced_search.py b/nostr_dvm/tasks/advanced_search.py
index 8545265..4bfe692 100644
--- a/nostr_dvm/tasks/advanced_search.py
+++ b/nostr_dvm/tasks/advanced_search.py
@@ -89,7 +89,7 @@ class AdvancedSearch(DVMTaskInterface):
 
         sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
         keys = Keys.parse(sk.to_hex())
-        cli = Client(keys)
+        cli = Client(NostrSigner.keys(keys))
 
         await cli.add_relay(options["relay"])
 
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 5f9fcb6..16a1fdd 100644
--- a/nostr_dvm/tasks/content_discovery_latest_one_per_follower.py
+++ b/nostr_dvm/tasks/content_discovery_latest_one_per_follower.py
@@ -123,7 +123,7 @@ class Discoverlatestperfollower(DVMTaskInterface):
                 from nostr_sdk import Filter
 
                 keys = Keys.parse(self.dvm_config.PRIVATE_KEY)
-                cli = Client(keys)
+                cli = Client(NostrSigner.keys(keys))
                 for relay in self.dvm_config.RELAY_LIST:
                     await cli.add_relay(relay)
                 await cli.connect()
diff --git a/nostr_dvm/tasks/discovery_inactive_follows.py b/nostr_dvm/tasks/discovery_inactive_follows.py
index 6044144..ef48c01 100644
--- a/nostr_dvm/tasks/discovery_inactive_follows.py
+++ b/nostr_dvm/tasks/discovery_inactive_follows.py
@@ -123,7 +123,7 @@ class DiscoverInactiveFollows(DVMTaskInterface):
                 from nostr_sdk import Filter
 
                 keys = Keys.parse(self.dvm_config.PRIVATE_KEY)
-                cli = Client(keys)
+                cli = Client(NostrSigner.keys(keys))
                 for relay in self.dvm_config.RELAY_LIST:
                     await cli.add_relay(relay)
                 await cli.connect()
diff --git a/nostr_dvm/tasks/discovery_nonfollowers.py b/nostr_dvm/tasks/discovery_nonfollowers.py
index b2db15d..b1e6d07 100644
--- a/nostr_dvm/tasks/discovery_nonfollowers.py
+++ b/nostr_dvm/tasks/discovery_nonfollowers.py
@@ -106,7 +106,7 @@ class DiscoverNonFollowers(DVMTaskInterface):
             async def scanList(users, instance, i, st):
                 from nostr_sdk import Filter
                 keys = Keys.parse(self.dvm_config.PRIVATE_KEY)
-                cli = Client(keys)
+                cli = Client(NostrSigner.keys(keys))
                 for relay in self.dvm_config.RELAY_LIST:
                     await cli.add_relay(relay)
                 await cli.connect()
diff --git a/nostr_dvm/tasks/discovery_trending_notes_gleasonator.py b/nostr_dvm/tasks/discovery_trending_notes_gleasonator.py
index 75cf909..ad60f5f 100644
--- a/nostr_dvm/tasks/discovery_trending_notes_gleasonator.py
+++ b/nostr_dvm/tasks/discovery_trending_notes_gleasonator.py
@@ -72,7 +72,7 @@ class TrendingNotesGleasonator(DVMTaskInterface):
 
         sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
         keys = Keys.parse(sk.to_hex())
-        cli = Client(keys)
+        cli = Client(NostrSigner.keys(keys))
 
         await cli.add_relay(options["relay"])
         await cli.connect()
diff --git a/nostr_dvm/utils/external_dvm_utils.py b/nostr_dvm/utils/external_dvm_utils.py
index 6cdc961..04456f1 100644
--- a/nostr_dvm/utils/external_dvm_utils.py
+++ b/nostr_dvm/utils/external_dvm_utils.py
@@ -12,7 +12,7 @@ from nostr_dvm.utils.output_utils import PostProcessFunctionType
 
 async def build_client(config):
     keys = Keys.parse(config.PRIVATE_KEY)
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
 
     for relay in config.RELAY_LIST:
         await client.add_relay(relay)
diff --git a/nostr_dvm/utils/nostr_utils.py b/nostr_dvm/utils/nostr_utils.py
index 3a744bf..33d24b9 100644
--- a/nostr_dvm/utils/nostr_utils.py
+++ b/nostr_dvm/utils/nostr_utils.py
@@ -361,7 +361,7 @@ def check_and_decrypt_own_tags(event, dvm_config):
 
 async def update_profile_lnaddress(private_key, dvm_config, lud16="", ):
     keys = Keys.parse(private_key)
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in dvm_config.RELAY_LIST:
         await client.add_relay(relay)
     await client.connect()
diff --git a/nostr_dvm/utils/nut_wallet_utils.py b/nostr_dvm/utils/nut_wallet_utils.py
index 3c2fe76..450c42b 100644
--- a/nostr_dvm/utils/nut_wallet_utils.py
+++ b/nostr_dvm/utils/nut_wallet_utils.py
@@ -6,7 +6,7 @@ from datetime import timedelta
 
 import requests
 from nostr_sdk import Tag, Keys, nip44_encrypt, nip44_decrypt, Nip44Version, EventBuilder, Client, Filter, Kind, \
-    EventId, nip04_decrypt, nip04_encrypt, PublicKey, Metadata
+    EventId, nip04_decrypt, nip04_encrypt, PublicKey, Metadata, NostrSigner
 
 from nostr_dvm.utils.database_utils import fetch_user_metadata
 from nostr_dvm.utils.definitions import EventDefinitions
@@ -52,7 +52,7 @@ class NutZapWallet:
 
     async def client_connect(self, relay_list, keys):
 
-        client = Client(keys)
+        client = Client(NostrSigner.keys(keys))
         for relay in relay_list:
             await client.add_relay(relay)
         await client.connect()
diff --git a/nostr_dvm/utils/reaction_utils.py b/nostr_dvm/utils/reaction_utils.py
index 52af6fb..5d5798f 100644
--- a/nostr_dvm/utils/reaction_utils.py
+++ b/nostr_dvm/utils/reaction_utils.py
@@ -23,7 +23,7 @@ async def create_reaction(keys, title, dtag):
     content = ""
     event = EventBuilder(Kind(30030), content).tags([d_tag, title_tag] + emoji_tags).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     # We add the relays we defined above and told our DVM we would want to receive events to.
     for relay in DVMConfig().RELAY_LIST:
         await client.add_relay(relay)
@@ -44,7 +44,7 @@ async def delete_reaction(keys, eid: str, dtag: str):
         ["a", "30030:" + keys.public_key().to_hex() + ":" + dtag])
     event = EventBuilder(Kind(5), "").tags([e_tag, a_tag]).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     # We add the relays we defined above and told our DVM we would want to receive events to.
     for relay in DVMConfig().RELAY_LIST:
         await client.add_relay(relay)
diff --git a/tests/ditto.py b/tests/ditto.py
index dd80ba2..f9dbc31 100644
--- a/tests/ditto.py
+++ b/tests/ditto.py
@@ -17,7 +17,7 @@ async def main():
     }
 
     keys = Keys.parse(check_and_set_private_key("test_client"))
-    cli = Client(keys)
+    cli = Client(NostrSigner.keys(keys))
 
     await cli.add_relay(options["relay"])
     await cli.connect()
diff --git a/tests/simplebot.py b/tests/simplebot.py
index 59ffe8d..edcd7ab 100644
--- a/tests/simplebot.py
+++ b/tests/simplebot.py
@@ -20,7 +20,7 @@ async def test():
     pk = keys.public_key()
     print(f"Bot public key: {pk.to_bech32()}")
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
 
     await client.add_relay("wss://relay.damus.io")
     await client.add_relay("wss://nostr.mom")
diff --git a/tests/test_dvm_client.py b/tests/test_dvm_client.py
index 92acf9e..3b707ee 100644
--- a/tests/test_dvm_client.py
+++ b/tests/test_dvm_client.py
@@ -27,13 +27,13 @@ async def nostr_client_test_translation(input, kind, lang, sats, satsmax):
     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 translate a given Input"])
-    event = EventBuilder(EventDefinitions.KIND_NIP90_TRANSLATE_TEXT, str("Translate the given input."),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_TRANSLATE_TEXT, str("Translate the given input.")).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)
@@ -48,13 +48,13 @@ async def nostr_client_test_search_profile(input):
 
     iTag = Tag.parse(["i", input, "text"])
     alttag = Tag.parse(["alt", "This is a NIP90 DVM AI task to translate a given Input"])
-    event = EventBuilder(EventDefinitions.KIND_NIP90_USER_SEARCH, str("Search for user"),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_USER_SEARCH, str("Search for user")).tags(
                          [iTag, 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)
@@ -74,10 +74,10 @@ async def nostr_client_test_image(prompt):
     bidTag = Tag.parse(['bid', str(1000 * 1000), str(1000 * 1000)])
     relaysTag = Tag.parse(['relays', "wss://relay.primal.net", "wss://nostr.oxtr.dev"])
     alttag = Tag.parse(["alt", "This is a NIP90 DVM AI task to generate an Image from a given Input"])
-    event = EventBuilder(EventDefinitions.KIND_NIP90_GENERATE_IMAGE, str("Generate an Image."),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_GENERATE_IMAGE, str("Generate an Image.")).tags(
                          [iTag, outTag, paramTag1, bidTag, relaysTag, alttag]).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in DVMConfig().RELAY_LIST:
         await client.add_relay(relay)
     await client.connect()
@@ -102,10 +102,10 @@ async def nostr_client_test_censor_filter(users):
         iTag = Tag.parse(["i", user, "text"])
         tags.append(iTag)
 
-    event = EventBuilder(EventDefinitions.KIND_NIP90_PEOPLE_DISCOVERY, str("Give me bad actors"),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_PEOPLE_DISCOVERY, str("Give me bad actors")).tags(
                          tags).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     await client.connect()
@@ -127,10 +127,10 @@ async def nostr_client_test_inactive_filter(user):
 
     tags = [relaysTag, alttag, paramTag, paramTag2]
 
-    event = EventBuilder(EventDefinitions.KIND_NIP90_PEOPLE_DISCOVERY, str("Give me inactive users"),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_PEOPLE_DISCOVERY, str("Give me inactive users")).tags(
                          tags).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     await client.add_relay("wss://nostr.band")
@@ -150,13 +150,13 @@ 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 TTSt"])
-    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://dvms.f7z.io",
                   ]
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     await client.connect()
@@ -178,10 +178,10 @@ async def nostr_client_test_discovery(user, ptag):
 
     tags = [relaysTag, alttag, paramTag, pTag]
 
-    event = EventBuilder(EventDefinitions.KIND_NIP90_CONTENT_DISCOVERY, str("Give me content"),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_CONTENT_DISCOVERY, str("Give me content")).tags(
                          tags).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
 
@@ -215,10 +215,10 @@ async def nostr_client_custom_discovery(user, ptag):
 
     tags = [relaysTag, alttag, paramTag, pTag]# paramTagSearch, paramTagMust, paramTagAvoid]
 
-    event = EventBuilder(EventDefinitions.KIND_NIP90_CONTENT_DISCOVERY, str("Give me content"),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_CONTENT_DISCOVERY, str("Give me content")).tags(
                          tags).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
 
@@ -241,10 +241,10 @@ async def nostr_client_generic_test(ptag):
 
     tags = [relaysTag, alttag, pTag]
 
-    event = EventBuilder(Kind(5050), str("Give me content"),
+    event = EventBuilder(Kind(5050), str("Give me content")).tags(
                          tags).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     await client.connect()
@@ -267,10 +267,10 @@ async def nostr_client_duckduck_test(ptag, query):
 
     tags = [relaysTag, alttag, pTag, iTag]
 
-    event = EventBuilder(Kind(5050), str("Give me content"),
+    event = EventBuilder(Kind(5050), str("Give me content")).tags(
                          tags).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     await client.connect()
@@ -291,10 +291,10 @@ async def nostr_client_flux_schnell(ptag, query):
 
     tags = [relaysTag, alttag, pTag, iTag]
 
-    event = EventBuilder(Kind(5100), str("Give me image"),
+    event = EventBuilder(Kind(5100), str("Give me image")).tags(
                          tags).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     ropts = RelayOptions().ping(False)
@@ -319,10 +319,10 @@ async def nostr_client_test_discovery_user(user, ptag):
 
     tags = [relaysTag, alttag, paramTag, pTag]
 
-    event = EventBuilder(EventDefinitions.KIND_NIP90_PEOPLE_DISCOVERY, str("Give me people"),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_PEOPLE_DISCOVERY, str("Give me people")).tags(
                          tags).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     await client.connect()
@@ -344,10 +344,10 @@ async def nostr_client_test_discovery_gallery(user, ptag):
 
     tags = [relaysTag, alttag, paramTag, pTag]
 
-    event = EventBuilder(EventDefinitions.KIND_NIP90_VISUAL_DISCOVERY, str("Give me visuals"),
+    event = EventBuilder(EventDefinitions.KIND_NIP90_VISUAL_DISCOVERY, str("Give me visuals")).tags(
                          tags).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     await client.connect()
@@ -381,10 +381,10 @@ async def nostr_client_test_image_private(prompt, cashutoken):
                                      encrypted_params_string)
 
     encrypted_tag = Tag.parse(['encrypted'])
-    nip90request = EventBuilder(EventDefinitions.KIND_NIP90_GENERATE_IMAGE, encrypted_params,
+    nip90request = EventBuilder(EventDefinitions.KIND_NIP90_GENERATE_IMAGE, encrypted_params).tags(
                                 [pTag, encrypted_tag]).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     await client.connect()
@@ -398,7 +398,7 @@ async def nostr_client():
     sk = keys.secret_key()
     pk = keys.public_key()
     print(f"Nostr 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/tests/test_events.py b/tests/test_events.py
index 77fd4a4..260780e 100644
--- a/tests/test_events.py
+++ b/tests/test_events.py
@@ -17,7 +17,7 @@ from nostr_dvm.utils.nostr_utils import check_and_set_private_key
 async def test():
     relay_list = dvmconfig.DVMConfig.RELAY_LIST
     keys = Keys.parse(check_and_set_private_key("test_client"))
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
 
     for relay in relay_list:
         await client.add_relay(relay)
@@ -71,7 +71,7 @@ async def test_gallery():
     relay_list = dvmconfig.DVMConfig.RELAY_LIST
     keys = Keys.parse(check_and_set_private_key("test_client"))
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
 
     for relay in relay_list:
         await client.add_relay(relay)
diff --git a/tutorials/03_client.py b/tutorials/03_client.py
index d8951a5..671da81 100644
--- a/tutorials/03_client.py
+++ b/tutorials/03_client.py
@@ -36,10 +36,10 @@ async def nostr_client_generic_test(ptag):
 
     # We now send a 5050 Request (for Text Generation) with our tags. The content is optional.
     event = EventBuilder(Kind(5050), "This is a test",
-                         tags).sign_with_keys(keys)
+                         ).tags(tags).sign_with_keys(keys)
 
     # We create a signer with some random keys
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     # We add the relays we defined above and told our DVM we would want to receive events to.
     for relay in relay_list:
         await client.add_relay(relay)
@@ -57,7 +57,7 @@ async def nostr_client(target_dvm_npub):
     sk = keys.secret_key()
     pk = keys.public_key()
     print(f"Nostr 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/tutorials/09_nutzap_client.py b/tutorials/09_nutzap_client.py
index 69ec6f8..0bbbd38 100644
--- a/tutorials/09_nutzap_client.py
+++ b/tutorials/09_nutzap_client.py
@@ -31,9 +31,9 @@ async def nostr_client_generic_test(ptag):
     pTag = Tag.parse(["p", PublicKey.parse(ptag).to_hex()])
     tags = [relaysTag, alttag, pTag, paramTag]
     event = EventBuilder(Kind(5050), "This is a test",
-                         tags).sign_with_keys(keys)
+                         ).tags(tags).sign_with_keys(keys)
 
-    client = Client(keys)
+    client = Client(NostrSigner.keys(keys))
     for relay in relay_list:
         await client.add_relay(relay)
     await client.connect()
@@ -46,7 +46,7 @@ async def nostr_client(target_dvm_npub):
     keys = Keys.parse(check_and_set_private_key("test_client"))
     pk = keys.public_key()
     print(f"Nostr 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: