PowerOn/platform-core
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: unresolved merge conflicts
Some checks failed
Deploy Plattform-Core INT / test (push) Failing after 3s
Details
Deploy Plattform-Core INT / deploy (push) Has been skipped
Details
Deploy Plattform-Core (Int) / test (push) Successful in 1m2s
Details
Deploy Plattform-Core (Int) / deploy (push) Successful in 10s
Details

Browse source
This commit is contained in:
Ida 2026-05-27 09:23:51 +02:00
parent 7f7b21a384
commit 0f3c54d91d
2 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/features/graphicalEditor/nodeDefinitions/context.py
View file

@ -40,15 +40,9 @@ CONTEXT_NODES = [
), ),
"injectRunContext": True, "injectRunContext": True,
"parameters": [ "parameters": [
<<<<<<< HEAD
{"name": "context", "type": "Any", "required": False, "frontendType": "contextBuilder", {"name": "context", "type": "Any", "required": False, "frontendType": "contextBuilder",
"description": CONTEXT_BUILDER_PARAM_DESCRIPTION, "default": "", "description": CONTEXT_BUILDER_PARAM_DESCRIPTION, "default": "",
"graphInherit": {"port": 0, "kind": "primaryTextRef"}}, "graphInherit": {"port": 0, "kind": "primaryTextRef"}},
=======
{"name": "documentList", "type": "str", "required": True, "frontendType": "hidden",
"description": t("Dokumentenliste (via Wire oder DataRef)"), "default": "",
"graphInherit": {"port": 0, "kind": "documentListWire"}},
>>>>>>> 513ded84d529502d07a04d199df3f873f263cff0
{ {
"name": "contentFilter", "name": "contentFilter",
"type": "str", "type": "str",

18
modules/workflows/methods/methodContext/actions/extractContent.py
View file

@ -1751,7 +1751,6 @@ def presentation_envelopes_to_document_json(
} }
<<<<<<< HEAD
def _document_list_from_context(raw: Any, *, _depth: int = 0) -> DocumentReferenceList: def _document_list_from_context(raw: Any, *, _depth: int = 0) -> DocumentReferenceList:
"""Best-effort extraction of document/file references from ``context`` payloads. """Best-effort extraction of document/file references from ``context`` payloads.
@ -1808,8 +1807,6 @@ def _document_list_from_context(raw: Any, *, _depth: int = 0) -> DocumentReferen
return DocumentReferenceList(references=deduped) return DocumentReferenceList(references=deduped)
=======
>>>>>>> 513ded84d529502d07a04d199df3f873f263cff0
async def extractContent(self, parameters: Dict[str, Any]) -> ActionResult: async def extractContent(self, parameters: Dict[str, Any]) -> ActionResult:
operation_id = None operation_id = None
try: try:
@ -1817,7 +1814,6 @@ async def extractContent(self, parameters: Dict[str, Any]) -> ActionResult:
operation_id = f"context_extract_{wf}_{int(time.time())}" operation_id = f"context_extract_{wf}_{int(time.time())}"
document_list_param = parameters.get("documentList") document_list_param = parameters.get("documentList")
<<<<<<< HEAD
if document_list_param: if document_list_param:
dl = coerceDocumentReferenceList(document_list_param) dl = coerceDocumentReferenceList(document_list_param)
source = "documentList" source = "documentList"
@ -1836,20 +1832,6 @@ async def extractContent(self, parameters: Dict[str, Any]) -> ActionResult:
), ),
) )
logger.info("extractContent resolved %d document reference(s) from %s", len(dl.references), source) logger.info("extractContent resolved %d document reference(s) from %s", len(dl.references), source)
=======
if not document_list_param:
return ActionResult.isFailure(error="documentList is required")
dl = coerceDocumentReferenceList(document_list_param)
if not dl.references:
return ActionResult.isFailure(
error=(
f"documentList could not be parsed (type={type(document_list_param).__name__}); "
"expected DocumentReferenceList, list of strings/dicts, or "
"a wrapper dict like {'documents': [...]}"
),
)
>>>>>>> 513ded84d529502d07a04d199df3f873f263cff0
parent_operation_id = parameters.get("parentOperationId") parent_operation_id = parameters.get("parentOperationId")
self.services.chat.progressLogStart( self.services.chat.progressLogStart(