KG core upload/download uses query params (#405)

This commit is contained in:
cybermaggedon 2025-05-29 19:56:04 +01:00 committed by GitHub
parent 6f964e478e
commit 2e577e900a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 17 deletions

View file

@ -1,6 +1,5 @@
import asyncio import asyncio
import json
import uuid import uuid
import msgpack import msgpack
from . knowledge import KnowledgeRequestor from . knowledge import KnowledgeRequestor
@ -10,10 +9,10 @@ class CoreExport:
def __init__(self, pulsar_client): def __init__(self, pulsar_client):
self.pulsar_client = pulsar_client self.pulsar_client = pulsar_client
async def process(self, data, error, ok, params): async def process(self, data, error, ok, request):
id = params["id"] id = request.query["id"]
user = params["user"] user = request.query["user"]
response = await ok() response = await ok()

View file

@ -10,10 +10,10 @@ class CoreImport:
def __init__(self, pulsar_client): def __init__(self, pulsar_client):
self.pulsar_client = pulsar_client self.pulsar_client = pulsar_client
async def process(self, data, error, ok, params): async def process(self, data, error, ok, request):
id = params["id"] id = request.query["id"]
user = params["user"] user = request.query["user"]
kr = KnowledgeRequestor( kr = KnowledgeRequestor(
pulsar_client = self.pulsar_client, pulsar_client = self.pulsar_client,

View file

@ -2,8 +2,6 @@
import asyncio import asyncio
from aiohttp import web from aiohttp import web
import uuid import uuid
import json
import msgpack
from . config import ConfigRequestor from . config import ConfigRequestor
from . flow import FlowRequestor from . flow import FlowRequestor
@ -110,15 +108,15 @@ class DispatcherManager:
def dispatch_core_import(self): def dispatch_core_import(self):
return DispatcherWrapper(self.process_core_import) return DispatcherWrapper(self.process_core_import)
async def process_core_import(self, data, error, ok, params): async def process_core_import(self, data, error, ok, request):
ci = CoreImport(self.pulsar_client) ci = CoreImport(self.pulsar_client)
return await ci.process(data, error, ok, params) return await ci.process(data, error, ok, request)
async def process_core_export(self, data, error, ok, params): async def process_core_export(self, data, error, ok, request):
ce = CoreExport(self.pulsar_client) ce = CoreExport(self.pulsar_client)
return await ce.process(data, error, ok, params) return await ce.process(data, error, ok, request)
async def process_global_service(self, data, responder, params): async def process_global_service(self, data, responder, params):

View file

@ -53,12 +53,12 @@ class EndpointManager:
dispatcher = dispatcher_manager.dispatch_flow_export() dispatcher = dispatcher_manager.dispatch_flow_export()
), ),
StreamEndpoint( StreamEndpoint(
endpoint_path = "/api/v1/import-core/{user}/{id:.*}", endpoint_path = "/api/v1/import-core",
auth = auth, auth = auth,
dispatcher = dispatcher_manager.dispatch_core_import(), dispatcher = dispatcher_manager.dispatch_core_import(),
), ),
StreamEndpoint( StreamEndpoint(
endpoint_path = "/api/v1/export-core/{user}/{id:.*}", endpoint_path = "/api/v1/export-core",
auth = auth, auth = auth,
dispatcher = dispatcher_manager.dispatch_core_export(), dispatcher = dispatcher_manager.dispatch_core_export(),
), ),

View file

@ -49,7 +49,9 @@ class StreamEndpoint:
async def error(err): async def error(err):
return web.HTTPInternalServerError(text = err) return web.HTTPInternalServerError(text = err)
async def ok(status=200, reason="OK", type="application/octet-stream"): async def ok(
status=200, reason="OK", type="application/octet-stream"
):
response = web.StreamResponse( response = web.StreamResponse(
status = status, reason = reason, status = status, reason = reason,
headers = {"Content-Type": type} headers = {"Content-Type": type}
@ -58,7 +60,7 @@ class StreamEndpoint:
return response return response
resp = await self.dispatcher.process( resp = await self.dispatcher.process(
data, error, ok, request.match_info data, error, ok, request
) )
return resp return resp