highperfocused/nostrdvm
1
0
Fork 0
mirror of https://github.com/believethehype/nostrdvm.git synced 2025-08-02 23:52:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

noogle: improve recommendation search

Browse Source
This commit is contained in:
Believethehype
2024-04-09 11:20:40 +02:00
parent 71dc7c2361
commit ef057d637d
6 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ui/noogle/src/components/ImageGeneration.vue
View File

@@ -88,8 +88,10 @@ async function generate_image(message) {
}; };
res = await amberSignerService.signEvent(draft) res = await amberSignerService.signEvent(draft)
await client.sendEvent(Event.fromJson(JSON.stringify(res))) requestid = res.id
requestid = res.id; store.commit('set_current_request_id_image', requestid)
await client.sendEvent(Event.fromJson(JSON.stringify(res)))
} }
else { else {
@@ -97,13 +99,19 @@ async function generate_image(message) {
for (let tag of tags){ for (let tag of tags){
tags_t.push(Tag.parse(tag)) tags_t.push(Tag.parse(tag))
} }
let evt = new EventBuilder(kind, content, tags_t)
res = await client.sendEventBuilder(evt);
requestid = res.toHex(); let evt = new EventBuilder(kind, content, tags_t)
let unsigned = evt.toUnsignedEvent(store.state.pubkey)
let signedEvent = await (await client.signer()).signEvent(unsigned)
console.log(signedEvent.id.toHex())
requestid = signedEvent.id.toHex()
store.commit('set_current_request_id_image', requestid)
await client.sendEvent(signedEvent)
} }
store.commit('set_current_request_id_image', requestid)
} catch (error) { } catch (error) {

3
ui/noogle/src/components/Login.vue
View File

@@ -864,8 +864,9 @@ export default {
dbclient = new ClientBuilder().signer(signer).database(await db).build() dbclient = new ClientBuilder().signer(signer).database(await db).build()
await dbclient.addRelay("wss://relay.damus.io"); await dbclient.addRelay("wss://relay.damus.io");
await dbclient.addRelay( "wss://purplepag.es"); //await dbclient.addRelay( "wss://purplepag.es");
await dbclient.connect() await dbclient.connect()
store.commit('set_dbclient', dbclient) store.commit('set_dbclient', dbclient)
let direction = NegentropyDirection.Down; let direction = NegentropyDirection.Down;
let opts = new NegentropyOptions().direction(direction); let opts = new NegentropyOptions().direction(direction);

58
ui/noogle/src/components/RecommendationGeneration.vue
View File

@@ -45,6 +45,7 @@ import StringUtil from "@/components/helper/string.ts";
let dvms =[] let dvms =[]
let requestids = []
onMounted(async () => { onMounted(async () => {
@@ -73,17 +74,19 @@ function set_subscription_props(amount, cadence, dvm) {
async function generate_feed(id) { async function generate_feed(id) {
// if (!store.state.recommendationehasEventListener){
// store.commit('set_recommendationEventListener', true)
listen()
// }
// else{
// console.log("Already has event listener")
// }
try { try {
if (!store.state.recommendationehasEventListener){
store.commit('set_recommendationEventListener', true)
listen()
}
else{
console.log("Already has event listener")
}
let client = store.state.client let client = store.state.client
//console.log(dvms.find(i => i.id === id).encryptionSupported) //console.log(dvms.find(i => i.id === id).encryptionSupported)
@@ -134,6 +137,9 @@ async function generate_feed(id) {
res = await amberSignerService.signEvent(draft) res = await amberSignerService.signEvent(draft)
await client.sendEvent(Event.fromJson(JSON.stringify(res))) await client.sendEvent(Event.fromJson(JSON.stringify(res)))
requestid = res.id; requestid = res.id;
requestids.push(requestid)
store.commit('set_current_request_id_recommendation', requestids)
await client.sendEvent(Event.fromJson(JSON.stringify(res)))
} }
else{ else{
@@ -146,9 +152,14 @@ async function generate_feed(id) {
tags_t.push(Tag.parse(["client", "noogle"])) tags_t.push(Tag.parse(["client", "noogle"]))
let evt = new EventBuilder(kind, content, tags_t)
res = await client.sendEventBuilder(evt); let evt = new EventBuilder(kind, content, tags_t)
requestid = res.toHex(); let unsigned = evt.toUnsignedEvent(store.state.pubkey)
let signedEvent = await (await client.signer()).signEvent(unsigned)
console.log(signedEvent.id.toHex())
requestids.push(signedEvent.id.toHex())
store.commit('set_current_request_id_recommendation', requestids)
res = await client.sendEvent(signedEvent)
} }
@@ -170,8 +181,12 @@ async function generate_feed(id) {
}; };
res = await amberSignerService.signEvent(draft) res = await amberSignerService.signEvent(draft)
requestid = res.id;
requestids.push(requestid)
store.commit('set_current_request_id_recommendation', requestids)
await client.sendEvent(Event.fromJson(JSON.stringify(res))) await client.sendEvent(Event.fromJson(JSON.stringify(res)))
requestid = res.id;
} }
else { else {
@@ -181,10 +196,13 @@ async function generate_feed(id) {
tags_t.push(Tag.parse(tag)) tags_t.push(Tag.parse(tag))
} }
let evt = new EventBuilder(kind, content, tags_t) let evt = new EventBuilder(kind, content, tags_t)
res = await client.sendEventBuilder(evt); let unsigned = evt.toUnsignedEvent(store.state.pubkey)
let signedEvent = await (await client.signer()).signEvent(unsigned)
console.log(signedEvent.id.toHex())
requestids.push(signedEvent.id.toHex())
store.commit('set_current_request_id_recommendation', requestids)
res = await client.sendEvent(signedEvent)
requestid = res.toHex();
} }
} }
@@ -193,10 +211,6 @@ async function generate_feed(id) {
store.commit('set_current_request_id_recommendation', requestid)
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
@@ -213,10 +227,10 @@ async function listen() {
// Handle event // Handle event
handleEvent: async (relayUrl, subscriptionId, event) => { handleEvent: async (relayUrl, subscriptionId, event) => {
let resonsetorequest = false let resonsetorequest = false
sleep(1200).then(async () => { //sleep(1200).then(async () => {
for (let tag in event.tags) { for (let tag in event.tags) {
if (event.tags[tag].asVec()[0] === "e") { if (event.tags[tag].asVec()[0] === "e") {
if (event.tags[tag].asVec()[1] === store.state.requestidRecommendation) { if (store.state.requestidRecommendation.includes(event.tags[tag].asVec()[1])){
resonsetorequest = true resonsetorequest = true
} }
@@ -500,7 +514,7 @@ async function listen() {
} }
} }
}) // })
}, },
// Handle relay message // Handle relay message
handleMsg: async (relayUrl, message) => { handleMsg: async (relayUrl, message) => {

8
ui/noogle/src/components/Search.vue
View File

@@ -137,9 +137,9 @@ async function send_search_request(msg) {
}; };
res = await amberSignerService.signEvent(draft) res = await amberSignerService.signEvent(draft)
await client.sendEvent(Event.fromJson(JSON.stringify(res))) let result = await client.sendEvent(Event.fromJson(JSON.stringify(res)))
requestid = res.id; requestid = result.toHex()
res = res.id;
} }
else { else {
@@ -164,7 +164,7 @@ async function send_search_request(msg) {
store.commit('set_current_request_profile_id_search', requestid_profile) store.commit('set_current_request_profile_id_search', requestid_profile)
console.log(res)
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }

4
ui/noogle/src/components/SummarizationGeneration.vue
View File

@@ -78,8 +78,8 @@ let sortedIds = eventids.sort(function(a,b) {return (a.index > b.index) ? 1 : ((
}; };
res = await amberSignerService.signEvent(draft) res = await amberSignerService.signEvent(draft)
await client.sendEvent(Event.fromJson(JSON.stringify(res))) let result = await client.sendEvent(Event.fromJson(JSON.stringify(res)))
requestid = res.id; requestid = result.toHex()
} }
else { else {

6
ui/noogle/src/store.js
View File

@@ -16,7 +16,7 @@ const store = createStore({
requestidSearch: String, requestidSearch: String,
requestidSearchProfile: String, requestidSearchProfile: String,
requestidImage: String, requestidImage: String,
requestidRecommendation: String, requestidRecommendation: [],
requestidSummarization: String, requestidSummarization: String,
hasEventListener: false, hasEventListener: false,
imagehasEventListener: false, imagehasEventListener: false,
@@ -118,7 +118,9 @@ const store = createStore({
state.requestidImage = requestid state.requestidImage = requestid
}, },
set_current_request_id_recommendation(state, requestid){ set_current_request_id_recommendation(state, requestid){
state.requestidRecommendation = requestid state.requestidRecommendation.length = 0
state.requestidRecommendation.push.apply(state.requestidRecommendation, requestid)
//state.requestidRecommendation = requestid
}, },
set_search_results(state, results){ set_search_results(state, results){