From cb7802c509b8b8f8dc350d099d2ed40af31a37ff Mon Sep 17 00:00:00 2001 From: Believethehype <1097224+believethehype@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:06:46 +0200 Subject: [PATCH] adaptions to sdk 0.11.0 --- nostr_dvm/bot.py | 10 +++++----- nostr_dvm/dvm.py | 6 +++--- nostr_dvm/subscription.py | 4 ++-- nostr_dvm/tasks/summarization_huggingchat.py | 2 +- nostr_dvm/tasks/summarization_unleashed_chat.py | 2 +- nostr_dvm/utils/backend_utils.py | 6 +++--- setup.py | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nostr_dvm/bot.py b/nostr_dvm/bot.py index c9d330d..44b5446 100644 --- a/nostr_dvm/bot.py +++ b/nostr_dvm/bot.py @@ -74,22 +74,22 @@ class Bot: if (EventDefinitions.KIND_NIP90_EXTRACT_TEXT.as_u64() + 1000 <= nostr_event.kind().as_u64() <= EventDefinitions.KIND_NIP90_GENERIC.as_u64() + 1000): handle_nip90_response_event(nostr_event) - elif nostr_event.kind().as_u64() == EventDefinitions.KIND_FEEDBACK.as_u64(): + elif nostr_event.kind() == EventDefinitions.KIND_FEEDBACK: handle_nip90_feedback(nostr_event) - elif nostr_event.kind().as_u64() == EventDefinitions.KIND_ZAP.as_u64(): + elif nostr_event.kind() == EventDefinitions.KIND_ZAP: handle_zap(nostr_event) - elif nostr_event.kind().match_enum(KindEnum.ENCRYPTED_DIRECT_MESSAGE()): + elif nostr_event.kind() == EventDefinitions.KIND_DM: try: handle_dm(nostr_event) except Exception as e: print(f"Error during content NIP04 decryption: {e}") - elif nostr_event.kind().match_enum(KindEnum.GIFT_WRAP()): + elif nostr_event.kind() == KindEnum.GIFT_WRAP(): print("Decrypting NIP59 event") try: rumor: UnsignedEvent = nip59_extract_rumor(self.keys, nostr_event) - if rumor.kind().match_enum(KindEnum.SEALED_DIRECT()): + if rumor.kind() == KindEnum.SEALED_DIRECT(): msg = rumor.content() print(f"Received new msg [sealed]: {msg}") self.client.send_sealed_msg(rumor.author(), "Nip44 is not supported yet, but coming soon", None) diff --git a/nostr_dvm/dvm.py b/nostr_dvm/dvm.py index b8ab756..88ed935 100644 --- a/nostr_dvm/dvm.py +++ b/nostr_dvm/dvm.py @@ -272,7 +272,7 @@ class DVM: user = get_or_add_user(db=self.dvm_config.DB, npub=sender, client=self.client, config=self.dvm_config) if zapped_event is not None: - if zapped_event.kind().as_u64() == EventDefinitions.KIND_FEEDBACK.as_u64(): + if zapped_event.kind() == EventDefinitions.KIND_FEEDBACK: amount = 0 job_event = None @@ -295,7 +295,7 @@ class DVM: # if a reaction by us got zapped print(status) - if job_event.kind().as_u64() == EventDefinitions.KIND_NIP88_SUBSCRIBE_EVENT.as_u64(): + if job_event.kind() == EventDefinitions.KIND_NIP88_SUBSCRIBE_EVENT: send_job_status_reaction(job_event, "subscription-success", client=self.client, dvm_config=self.dvm_config, user=user) @@ -334,7 +334,7 @@ class DVM: False, invoice_amount, client=self.client, dvm_config=self.dvm_config) print("[" + self.dvm_config.NIP89.NAME + "] Invoice was not paid sufficiently") - elif zapped_event.kind().as_u64() == EventDefinitions.KIND_NIP88_SUBSCRIBE_EVENT.as_u64(): + elif zapped_event.kind() == EventDefinitions.KIND_NIP88_SUBSCRIBE_EVENT: print("new subscription, doing nothing") elif zapped_event.kind() in EventDefinitions.ANY_RESULT: diff --git a/nostr_dvm/subscription.py b/nostr_dvm/subscription.py index 6fcded6..a593060 100644 --- a/nostr_dvm/subscription.py +++ b/nostr_dvm/subscription.py @@ -78,9 +78,9 @@ class Subscription: keys = self.keys def handle(self, relay_url, subscription_id, nostr_event: Event): - if nostr_event.kind().as_u64() == EventDefinitions.KIND_NIP90_DVM_SUBSCRIPTION.as_u64(): + if nostr_event.kind() == EventDefinitions.KIND_NIP90_DVM_SUBSCRIPTION: handle_nwc_request(nostr_event) - elif nostr_event.kind().as_u64() == EventDefinitions.KIND_NIP88_STOP_SUBSCRIPTION_EVENT.as_u64(): + elif nostr_event.kind() == EventDefinitions.KIND_NIP88_STOP_SUBSCRIPTION_EVENT: handle_cancel(nostr_event) def handle_msg(self, relay_url, msg): diff --git a/nostr_dvm/tasks/summarization_huggingchat.py b/nostr_dvm/tasks/summarization_huggingchat.py index 3a81c47..45c8dd0 100644 --- a/nostr_dvm/tasks/summarization_huggingchat.py +++ b/nostr_dvm/tasks/summarization_huggingchat.py @@ -67,7 +67,7 @@ class TextSummarizationHuggingChat(DVMTaskInterface): print("Event not found") raise Exception - if evt.kind().as_u64() == EventDefinitions.KIND_NIP90_RESULT_CONTENT_DISCOVERY: + if evt.kind() == EventDefinitions.KIND_NIP90_RESULT_CONTENT_DISCOVERY: result_list = json.loads(evt.content()) prompt = "" for tag in result_list: diff --git a/nostr_dvm/tasks/summarization_unleashed_chat.py b/nostr_dvm/tasks/summarization_unleashed_chat.py index 66247f5..2b56330 100644 --- a/nostr_dvm/tasks/summarization_unleashed_chat.py +++ b/nostr_dvm/tasks/summarization_unleashed_chat.py @@ -68,7 +68,7 @@ class SummarizationUnleashedChat(DVMTaskInterface): print("Event not found") raise Exception - if evt.kind().as_u64() == EventDefinitions.KIND_NIP90_RESULT_CONTENT_DISCOVERY: + if evt.kind() == EventDefinitions.KIND_NIP90_RESULT_CONTENT_DISCOVERY: result_list = json.loads(evt.content()) prompt = "" for tag in result_list: diff --git a/nostr_dvm/utils/backend_utils.py b/nostr_dvm/utils/backend_utils.py index 2398453..ac28697 100644 --- a/nostr_dvm/utils/backend_utils.py +++ b/nostr_dvm/utils/backend_utils.py @@ -12,7 +12,7 @@ from nostr_dvm.utils.nostr_utils import get_event_by_id, get_referenced_event_by def get_task(event, client, dvm_config): try: - if event.kind().as_u64() == EventDefinitions.KIND_NIP90_GENERIC.as_u64(): # use this for events that have no id yet, inclufr j tag + if event.kind() == EventDefinitions.KIND_NIP90_GENERIC: # use this for events that have no id yet, inclufr j tag for tag in event.tags(): if tag.as_vec()[0] == 'j': return tag.as_vec()[1] @@ -26,7 +26,7 @@ def get_task(event, client, dvm_config): return "unknown job: " + event.as_json() # This looks a bit more complicated, but we do several tasks for text-extraction in the future - elif event.kind().as_u64() == EventDefinitions.KIND_NIP90_EXTRACT_TEXT.as_u64(): + elif event.kind() == EventDefinitions.KIND_NIP90_EXTRACT_TEXT: for tag in event.tags(): if tag.as_vec()[0] == "i": if tag.as_vec()[2] == "url": @@ -57,7 +57,7 @@ def get_task(event, client, dvm_config): return "unknown type" else: return "unknown job" - elif event.kind().as_u64() == EventDefinitions.KIND_NIP90_GENERATE_IMAGE.as_u64(): + elif event.kind() == EventDefinitions.KIND_NIP90_GENERATE_IMAGE: has_image_tag = False has_text_tag = False for tag in event.tags(): diff --git a/setup.py b/setup.py index 5c87d61..b4ab367 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup( long_description=LONG_DESCRIPTION, packages=find_packages(include=['nostr_dvm', 'nostr_dvm.*']), - install_requires=["nostr-sdk==0.10.0", + install_requires=["nostr-sdk==0.11.0", "bech32", "pycryptodome==3.20.0", "python-dotenv==1.0.0",