bump version

.idea/dataSources.xml

@@ -60,7 +60,7 @@
       <driver-ref>sqlite.xerial</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/db/Bot.db</jdbc-url>
+      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/db/nostr_mostr.db</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
       <libraries>
         <library>

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '0.7.4'
+VERSION = '0.7.5'
 DESCRIPTION = 'A framework to build and run Nostr NIP90 Data Vending Machines'
 LONG_DESCRIPTION = ('A framework to build and run Nostr NIP90 Data Vending Machines. See the github repository for more information')
 

tests/discovery_mostr.py

@@ -0,0 +1,139 @@
+import json
+import os
+import threading
+from pathlib import Path
+
+import dotenv
+from nostr_sdk import init_logger, LogLevel, Keys, NostrLibrary
+
+from nostr_dvm.tasks.content_discovery_currently_popular_gallery import DicoverContentCurrentlyPopularGallery
+from nostr_dvm.tasks.content_discovery_currently_popular_mostr import DicoverContentCurrentlyPopularMostr
+from nostr_dvm.tasks.people_discovery_wot import DiscoverPeopleWOT
+from nostr_dvm.utils.admin_utils import AdminConfig
+from nostr_dvm.utils.dvmconfig import build_default_config
+from nostr_dvm.utils.nip89_utils import create_amount_tag, NIP89Config, check_and_set_d_tag
+
+rebroadcast_NIP89 = False  # Announce NIP89 on startup
+rebroadcast_NIP65_Relay_List = True
+update_profile = True
+
+global_update_rate = 1200  # set this high on first sync so db can fully sync before another process trys to.
+use_logger = True
+# these do not support nengentropy
+RECONCILE_DB_RELAY_LIST = ["wss://relay.momostr.pink", "wss://relay.mostr.pub/", "wss://relay.noswhere.com", "wss://relay.nostr.band"]  # , "wss://relay.snort.social"]
+
+if use_logger:
+    init_logger(LogLevel.DEBUG)
+
+
+def build_example_mostr(name, identifier, admin_config, options, image, cost=0, update_rate=180, processing_msg=None,
+                      update_db=True):
+    dvm_config = build_default_config(identifier)
+    dvm_config.USE_OWN_VENV = False
+    dvm_config.LOGLEVEL = LogLevel.INFO
+    # dvm_config.SHOWLOG = True
+    dvm_config.SCHEDULE_UPDATES_SECONDS = update_rate  # Every 10 minutes
+    dvm_config.UPDATE_DATABASE = update_db
+    dvm_config.RECONCILE_DB_RELAY_LIST = RECONCILE_DB_RELAY_LIST
+    dvm_config.LOGLEVEL = LogLevel.DEBUG
+    dvm_config.FIX_COST = cost
+    # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg",
+    # "wss://relay.nostr.net"]
+    dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg
+    # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io",
+    #                         "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg"
+    #                         ]
+    admin_config.LUD16 = dvm_config.LN_ADDRESS
+
+    # Add NIP89
+    nip89info = {
+        "name": name,
+        "image": image,
+        "picture": image,
+        "about": "I show popular gallery entries",
+        "lud16": dvm_config.LN_ADDRESS,
+        "encryptionSupported": True,
+        "cashuAccepted": True,
+        "personalized": False,
+        "amount": create_amount_tag(cost),
+        "nip90Params": {
+            "max_results": {
+                "required": False,
+                "values": [],
+                "description": "The number of maximum results to return (default currently 200)"
+            }
+        }
+    }
+
+    nip89config = NIP89Config()
+    nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"])
+    nip89config.CONTENT = json.dumps(nip89info)
+    return DicoverContentCurrentlyPopularMostr(name=name, dvm_config=dvm_config, nip89config=nip89config,
+                                                 admin_config=admin_config, options=options)
+
+
+def playground():
+    # Popular Global
+    admin_config_global_wot = AdminConfig()
+    admin_config_global_wot.REBROADCAST_NIP89 = rebroadcast_NIP89
+    admin_config_global_wot.REBROADCAST_NIP65_RELAY_LIST = rebroadcast_NIP65_Relay_List
+    admin_config_global_wot.UPDATE_PROFILE = update_profile
+    #admin_config_global_wot.DELETE_NIP89 = True
+    #admin_config_global_wot.PRIVKEY = ""
+    #admin_config_global_wot.EVENTID = "23306aa72cff48ec98bab7533883ffb7a378ec6b1c09b79ef45907d06550e2a8"
+    #admin_config_global_wot.POW = True
+    custom_processing_msg = ["Looking for popular Content on Mostr"]
+    update_db = True
+
+
+
+    options_mostr = {
+        "db_name": "db/nostr_mostr.db",
+        "db_since": 60 * 60 * 24 * 365,  # 1h since gmt,
+    }
+    cost = 0
+    image = "https://i.nostr.build/4Rw6lrsH5O0P5zjT.jpg"
+    discovery_wot = build_example_mostr("Trending on Mostr",
+                                      "discovery_mostr",
+                                      admin_config=admin_config_global_wot,
+                                      options=options_mostr,
+                                      image=image,
+                                      cost=cost,
+                                      update_rate=global_update_rate,
+                                      processing_msg=custom_processing_msg,
+                                      update_db=update_db)
+    discovery_wot.run()
+
+    # discovery_test_sub = content_discovery_currently_popular.build_example_subscription("Currently Popular Notes DVM (with Subscriptions)", "discovery_content_test", admin_config)
+    # discovery_test_sub.run()
+
+    # Subscription Manager DVM
+    # subscription_config = DVMConfig()
+    # subscription_config.PRIVATE_KEY = check_and_set_private_key("dvm_subscription")
+    # npub = Keys.parse(subscription_config.PRIVATE_KEY).public_key().to_bech32()
+    # invoice_key, admin_key, wallet_id, user_id, lnaddress = check_and_set_ln_bits_keys("dvm_subscription", npub)
+    # subscription_config.LNBITS_INVOICE_KEY = invoice_key
+    # subscription_config.LNBITS_ADMIN_KEY = admin_key  # The dvm might pay failed jobs back
+    # subscription_config.LNBITS_URL = os.getenv("LNBITS_HOST")
+    # sub_admin_config = AdminConfig()
+    # sub_admin_config.USERNPUBS = ["7782f93c5762538e1f7ccc5af83cd8018a528b9cd965048386ca1b75335f24c6"] #Add npubs of services that can contact the subscription handler
+
+    # currently there is none, but add this once subscriptions are live.
+    # x = threading.Thread(target=Subscription, args=(Subscription(subscription_config, sub_admin_config),))
+    # x.start()
+
+    # keep_alive()
+
+
+if __name__ == '__main__':
+    env_path = Path('.env')
+    if not env_path.is_file():
+        with open('.env', 'w') as f:
+            print("Writing new .env file")
+            f.write('')
+    if env_path.is_file():
+        print(f'loading environment from {env_path.resolve()}')
+        dotenv.load_dotenv(env_path, verbose=True, override=True)
+    else:
+        raise FileNotFoundError(f'.env file not found at {env_path} ')
+    playground()