mirror of
https://github.com/believethehype/nostrdvm.git
synced 2025-04-09 20:29:15 +02:00
noogle: parse and render links and npubs, update some icons
This commit is contained in:
Believethehype
parent
b28773291c
commit
64be752170
@ -123,7 +123,7 @@ def build_example(name, identifier, admin_config):
|
||||
|
||||
nip89info = {
|
||||
"name": name,
|
||||
"image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg",
|
||||
"image": "https://image.nostr.build/720eadc9af89084bb09de659af43ad17fec1f4b0887084e83ac0ae708dfa83a6.png",
|
||||
"about": "I use a LLM connected via Huggingchat to summarize Inputs",
|
||||
"encryptionSupported": True,
|
||||
"cashuAccepted": True,
|
||||
|
||||
169
nostr_dvm/tasks/summarization_unleasehed_chat.py
Normal file
169
nostr_dvm/tasks/summarization_unleasehed_chat.py
Normal file
@ -0,0 +1,169 @@
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
from nostr_sdk import Tag
|
||||
from nostr_dvm.interfaces.dvmtaskinterface import DVMTaskInterface, process_venv
|
||||
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
|
||||
from nostr_dvm.utils.nip89_utils import NIP89Config, check_and_set_d_tag
|
||||
from nostr_dvm.utils.nostr_utils import get_referenced_event_by_id, get_events_by_ids, get_event_by_id
|
||||
|
||||
"""
|
||||
This File contains a Module to generate Text, based on a prompt using the Unleashed.chat API.
|
||||
|
||||
Accepted Inputs: Prompt (text)
|
||||
Outputs: Generated text
|
||||
"""
|
||||
|
||||
|
||||
class SummarizationUnleashedChat(DVMTaskInterface):
|
||||
KIND: int = EventDefinitions.KIND_NIP90_SUMMARIZE_TEXT
|
||||
TASK: str = "text-to-text"
|
||||
FIX_COST: float = 10
|
||||
dependencies = [("nostr-dvm", "nostr-dvm"),
|
||||
("openai", "openai")]
|
||||
|
||||
def __init__(self, name, dvm_config: DVMConfig, nip89config: NIP89Config,
|
||||
admin_config: AdminConfig = None, options=None):
|
||||
dvm_config.SCRIPT = os.path.abspath(__file__)
|
||||
super().__init__(name, dvm_config, nip89config, admin_config, options)
|
||||
|
||||
def is_input_supported(self, tags, client=None, dvm_config=None):
|
||||
for tag in tags:
|
||||
if tag.as_vec()[0] == 'i':
|
||||
print(tag.as_vec())
|
||||
input_value = tag.as_vec()[1]
|
||||
input_type = tag.as_vec()[2]
|
||||
if input_type != "event" and input_type != "job" and input_type != "text":
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
def create_request_from_nostr_event(self, event, client=None, dvm_config=None):
|
||||
request_form = {"jobID": event.id().to_hex() + "_" + self.NAME.replace(" ", "")}
|
||||
prompt = ""
|
||||
collect_events = []
|
||||
nostr_mode = True
|
||||
|
||||
for tag in event.tags():
|
||||
if tag.as_vec()[0] == 'i':
|
||||
input_type = tag.as_vec()[2]
|
||||
if input_type == "text":
|
||||
prompt += tag.as_vec()[1] + "\n"
|
||||
elif input_type == "event":
|
||||
collect_events.append(tag.as_vec()[1])
|
||||
# evt = get_event_by_id(tag.as_vec()[1], client=client, config=dvm_config)
|
||||
# prompt += evt.content() + "\n"
|
||||
elif input_type == "job":
|
||||
evt = get_referenced_event_by_id(event_id=tag.as_vec()[1], client=client,
|
||||
kinds=[EventDefinitions.KIND_NIP90_RESULT_EXTRACT_TEXT,
|
||||
EventDefinitions.KIND_NIP90_RESULT_SUMMARIZE_TEXT,
|
||||
EventDefinitions.KIND_NIP90_RESULT_TRANSLATE_TEXT,
|
||||
EventDefinitions.KIND_NIP90_RESULT_CONTENT_DISCOVERY],
|
||||
dvm_config=dvm_config)
|
||||
if evt is None:
|
||||
print("Event not found")
|
||||
raise Exception
|
||||
|
||||
if evt.kind() == EventDefinitions.KIND_NIP90_RESULT_CONTENT_DISCOVERY:
|
||||
result_list = json.loads(evt.content())
|
||||
prompt = ""
|
||||
for tag in result_list:
|
||||
e_tag = Tag.parse(tag)
|
||||
evt = get_event_by_id(e_tag.as_vec()[1], client=client, config=dvm_config)
|
||||
prompt += evt.content() + "\n"
|
||||
|
||||
else:
|
||||
prompt = evt.content()
|
||||
|
||||
evts = get_events_by_ids(collect_events, client=client, config=dvm_config)
|
||||
if evts is not None:
|
||||
for evt in evts:
|
||||
prompt += evt.content() + "\n"
|
||||
|
||||
prompt = re.sub(r'http\S+', '', prompt)
|
||||
options = {
|
||||
"prompt": prompt,
|
||||
"nostr": nostr_mode,
|
||||
}
|
||||
request_form['options'] = json.dumps(options)
|
||||
|
||||
return request_form
|
||||
|
||||
def process(self, request_form):
|
||||
from openai import OpenAI
|
||||
temp_open_ai_api_key = os.environ["OPENAI_API_KEY"]
|
||||
os.environ["OPENAI_API_KEY"] = os.getenv("UNLEASHED_API_KEY")
|
||||
options = DVMTaskInterface.set_options(request_form)
|
||||
|
||||
try:
|
||||
client = OpenAI(
|
||||
base_url='https://unleashed.chat/api/v1',
|
||||
)
|
||||
|
||||
print('Models:\n')
|
||||
|
||||
for model in client.models.list():
|
||||
print('- ' + model.id)
|
||||
|
||||
content = "Summarize the following notes: " + str(options["prompt"])[:4000]
|
||||
normal_stream = client.chat.completions.create(
|
||||
messages=[
|
||||
{
|
||||
'role': 'user',
|
||||
'content':content,
|
||||
}
|
||||
],
|
||||
model='dolphin-2.2.1-mistral-7b',
|
||||
stream=True,
|
||||
extra_body={
|
||||
'nostr_mode': options["nostr"],
|
||||
},
|
||||
)
|
||||
|
||||
print('\nChat response: ', end='')
|
||||
|
||||
result = ""
|
||||
for chunk in normal_stream:
|
||||
result += chunk.choices[0].delta.content
|
||||
print(chunk.choices[0].delta.content, end='')
|
||||
|
||||
os.environ["OPENAI_API_KEY"] = temp_open_ai_api_key
|
||||
return result
|
||||
|
||||
except Exception as e:
|
||||
print("Error in Module: " + str(e))
|
||||
raise Exception(e)
|
||||
|
||||
|
||||
# We build an example here that we can call by either calling this file directly from the main directory,
|
||||
# or by adding it to our playground. You can call the example and adjust it to your needs or redefine it in the
|
||||
# playground or elsewhere
|
||||
def build_example(name, identifier, admin_config):
|
||||
dvm_config = build_default_config(identifier)
|
||||
dvm_config.SEND_FEEDBACK_EVENTS = True
|
||||
admin_config.LUD16 = dvm_config.LN_ADDRESS
|
||||
|
||||
|
||||
nip89info = {
|
||||
"name": name,
|
||||
"image": "https://unleashed.chat/_app/immutable/assets/hero.pehsu4x_.jpeg",
|
||||
"about": "I summarize Text with https://unleashed.chat",
|
||||
"encryptionSupported": True,
|
||||
"cashuAccepted": True,
|
||||
"nip90Params": {}
|
||||
}
|
||||
|
||||
nip89config = NIP89Config()
|
||||
nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"])
|
||||
nip89config.CONTENT = json.dumps(nip89info)
|
||||
admin_config2 = AdminConfig()
|
||||
admin_config2.REBROADCAST_NIP89 = False
|
||||
|
||||
return SummarizationUnleashedChat(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config2)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
process_venv(SummarizationUnleashedChat)
|
||||
|
||||
@ -89,7 +89,7 @@ def build_example(name, identifier, admin_config):
|
||||
|
||||
nip89info = {
|
||||
"name": name,
|
||||
"image": "https://image.nostr.build/c33ca6fc4cc038ca4adb46fdfdfda34951656f87ee364ef59095bae1495ce669.jpg",
|
||||
"image": "https://image.nostr.build/720eadc9af89084bb09de659af43ad17fec1f4b0887084e83ac0ae708dfa83a6.png",
|
||||
"about": "I use a LLM connected via Huggingchat",
|
||||
"encryptionSupported": True,
|
||||
"cashuAccepted": True,
|
||||
|
||||
@ -27,6 +27,7 @@ import ModalComponent from "../components/Newnote.vue";
|
||||
import VueDatePicker from "@vuepic/vue-datepicker";
|
||||
import {timestamp} from "@vueuse/core";
|
||||
import {post_note, schedule, copyinvoice, copyurl, sleep, nextInput, get_user_infos, createBolt11Lud16} from "../components/helper/Helper.vue"
|
||||
import StringUtil from "@/components/helper/string.ts";
|
||||
|
||||
|
||||
|
||||
@ -391,7 +392,7 @@ const submitHandler = async () => {
|
||||
|
||||
<h2 className="card-title">{{ dvm.name }}</h2>
|
||||
</div>
|
||||
<h3 class="fa-cut" >{{ dvm.about }}</h3>
|
||||
<h3 class="fa-cut" v-html="StringUtil.parseHyperlinks(dvm.about)"></h3>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -93,7 +93,7 @@ import nip49, {decryptwrapper} from "./android-signer/helpers/nip49";
|
||||
import { init as initNostrLogin } from "nostr-login"
|
||||
import { launch as launchNostrLoginDialog } from "nostr-login"
|
||||
import { logout as logoutNostrLogin } from "nostr-login"
|
||||
|
||||
import {parseandreplacenpubs} from "@/components/helper/Helper.vue"
|
||||
|
||||
import {useDark, useToggle} from "@vueuse/core";
|
||||
import {ref} from "vue";
|
||||
@ -571,6 +571,8 @@ export default {
|
||||
if (jsonentry.picture){
|
||||
jsonentry.image = jsonentry.picture
|
||||
}
|
||||
|
||||
jsonentry.about = await parseandreplacenpubs(jsonentry.about)
|
||||
jsonentry.event = entry.asJson()
|
||||
jsonentry.kind = entry.tags[tag].asVec()[1]
|
||||
nip89dvms.push(jsonentry);
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
</div>
|
||||
<br>
|
||||
<h3 class="fa-cut" >Kind: {{ dvm.kind }}</h3>
|
||||
<h3 class="fa-cut" >{{ dvm.about }}</h3>
|
||||
<h3 class="fa-cut" v-html="StringUtil.parseHyperlinks(dvm.about)"></h3>
|
||||
<div className="card-actions justify-end mt-auto" >
|
||||
<div className="card-actions justify-end">
|
||||
<button className="btn" @click="copyDoiToClipboard(dvm.event);">Copy Event Json</button>
|
||||
@ -30,11 +30,15 @@ import store from "@/store.js";
|
||||
import {Alphabet, ClientBuilder, NostrSigner, Filter, Keys, NostrDatabase, Tag} from "@rust-nostr/nostr-sdk";
|
||||
import miniToastr from "mini-toastr";
|
||||
import VueNotifications from "vue-notifications";
|
||||
import StringUtil from "@/components/helper/string.ts";
|
||||
|
||||
import deadnip89s from './data/deadnip89s.json'
|
||||
|
||||
export default {
|
||||
computed: {
|
||||
StringUtil() {
|
||||
return StringUtil
|
||||
},
|
||||
Keys() {
|
||||
return Keys
|
||||
},
|
||||
@ -59,4 +63,8 @@ async mounted(){
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
<style scoped>
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
@ -24,6 +24,8 @@ import Newnote from "@/components/Newnote.vue";
|
||||
import SummarizationGeneration from "@/components/SummarizationGeneration.vue"
|
||||
import {post_note, schedule, copyurl, copyinvoice, sleep, getEvents, get_user_infos, nextInput} from "../components/helper/Helper.vue"
|
||||
import amberSignerService from "./android-signer/AndroidSigner";
|
||||
import StringUtil from "@/components/helper/string.ts";
|
||||
|
||||
|
||||
let dvms =[]
|
||||
|
||||
@ -427,7 +429,7 @@ const submitHandler = async () => {
|
||||
|
||||
<h2 className="card-title">{{ dvm.name }}</h2>
|
||||
</div>
|
||||
<h3 class="fa-cut" >{{ dvm.about }}</h3>
|
||||
<h3 class="fa-cut" v-html="StringUtil.parseHyperlinks(dvm.about)"></h3>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -29,6 +29,7 @@ import amberSignerService from "./android-signer/AndroidSigner";
|
||||
import VueDatePicker from '@vuepic/vue-datepicker';
|
||||
import '@vuepic/vue-datepicker/dist/main.css'
|
||||
import {post_note, schedule, copyurl, copyinvoice, sleep, getEvents, get_user_infos, nextInput} from "../components/helper/Helper.vue"
|
||||
import StringUtil from "@/components/helper/string.ts";
|
||||
|
||||
|
||||
let items = []
|
||||
@ -488,7 +489,8 @@ defineProps({
|
||||
</div>
|
||||
|
||||
<div className="col-end-2 w-auto card-body">
|
||||
<p>{{ dvm.about }}</p>
|
||||
<h3 class="fa-cut" v-html="StringUtil.parseHyperlinks(dvm.about)"></h3>
|
||||
|
||||
<div><br>
|
||||
<span className="loading loading-dots loading-lg" ></span>
|
||||
</div>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
import {defineComponent} from 'vue'
|
||||
import store from "@/store";
|
||||
import amberSignerService from "@/components/android-signer/AndroidSigner";
|
||||
import {Duration, Event, EventBuilder, Filter, PublicKey, Tag, Timestamp} from "@rust-nostr/nostr-sdk";
|
||||
import {Duration, Event, EventBuilder, Filter, Keys, PublicKey, Tag, Timestamp} from "@rust-nostr/nostr-sdk";
|
||||
import miniToastr from "mini-toastr/mini-toastr";
|
||||
import VueNotifications from "vue-notifications";
|
||||
|
||||
@ -130,6 +130,29 @@ export const sleep = (ms) => {
|
||||
}
|
||||
|
||||
|
||||
|
||||
export async function parseandreplacenpubs(note){
|
||||
|
||||
const myArray = note.split(" ");
|
||||
let finalnote = ""
|
||||
for (let word in myArray){
|
||||
if(myArray[word].startsWith("nostr:npub")){
|
||||
console.log(myArray[word])
|
||||
let pk = PublicKey.parse(myArray[word].replace("nostr:", ""))
|
||||
console.log(pk.toBech32())
|
||||
let profiles = await get_user_infos([pk])
|
||||
console.log(profiles[0].profile.nip05)
|
||||
myArray[word] = profiles[0].profile.nip05 // replace with nip05 for now
|
||||
|
||||
// <href>='https://njump.com/'>test[0].profile.nip05</href>test[0].profile.nip05
|
||||
}
|
||||
finalnote = finalnote + myArray[word] + " "
|
||||
|
||||
}
|
||||
|
||||
return finalnote.trimEnd()
|
||||
}
|
||||
|
||||
export async function createBolt11Lud16(lud16, amount) {
|
||||
let url;
|
||||
if (lud16.includes('@')) { // LNaddress
|
||||
|
||||
13
ui/noogle/src/components/helper/string.ts
Normal file
13
ui/noogle/src/components/helper/string.ts
Normal file
@ -0,0 +1,13 @@
|
||||
const Regex_Url_Str = "(https:\\/\\/)"+ "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,})+[\\/]{0,1}" // domain name
|
||||
|
||||
|
||||
;
|
||||
|
||||
const Regex_Nip05_Str= "(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\\\[\x01-\x09\x0b\x0c\x0e-\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\\])"
|
||||
|
||||
const StringUtil = {
|
||||
isValidUrl: (str: string): boolean => new RegExp(Regex_Url_Str, "i").test(str),
|
||||
parseHyperlinks: (str: string): string => str.replace(new RegExp(Regex_Url_Str, "gim"), "<a class='purple' target=\"_blank\" rel=\"noreferrer\" href=\"$&\">$&</a>").replace(new RegExp(Regex_Nip05_Str, "gim"), "<a class='purple' target=\"_blank\" rel=\"noreferrer\" href=\"https://njump.me/$&\">$&</a>"),
|
||||
};
|
||||
|
||||
export default StringUtil;
|
||||
Loading…
x
Reference in New Issue
Block a user