flare-kernel 0.2.6__tar.gz → 0.2.7__tar.gz

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flare-kernel
-Version: 0.2.6
+Version: 0.2.7
 Summary: FLARE kernel runtime package
 License: Proprietary
 Classifier: Development Status :: 3 - Alpha

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flare-kernel"
-version = "0.2.6"
+version = "0.2.7"
 description = "FLARE kernel runtime package"
 readme = "README.md"
 requires-python = ">=3.11"

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/src/flare_kernel/router/kernel_facade/dependency_resolution.py

@@ -156,6 +156,7 @@ def resolve_turn_context_dependencies(
     build_structured_search_results_fn: Any,
     generate_llm_completion_fn: Any,
     resolve_analysis_route_fn: Any,
+    build_project_memory_context_layer_fn: Any,
     kernel_attr_fn: Callable[[str, Any], Any],
     defaults: dict[str, Any],
 ) -> dict[str, Any]:
@@ -202,6 +203,8 @@ def resolve_turn_context_dependencies(
         or kernel_attr_fn("generate_llm_completion", defaults["generate_llm_completion_fn"]),
         "resolve_analysis_route_fn": resolve_analysis_route_fn
         or kernel_attr_fn("resolve_analysis_route_from_runtime", defaults["resolve_analysis_route_fn"]),
+        "build_project_memory_context_layer_fn": build_project_memory_context_layer_fn
+        or kernel_attr_fn("build_project_memory_context_layer", defaults["build_project_memory_context_layer_fn"]),
     }
 
 

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/src/flare_kernel/router/kernel_facade/flow.py

@@ -51,6 +51,7 @@ async def prepare_kernel_turn_context_flow(
     generate_llm_completion_fn: Callable[..., Any] | None = None,
     search_web_sources_fn: Callable[..., list[dict[str, Any]]] | None = None,
     resolve_analysis_route_fn: Callable[..., dict[str, Any]] | None = None,
+    build_project_memory_context_layer_fn: Callable[..., dict[str, Any]] | None = None,
 ) -> dict[str, Any]:
     """Assemble the turn context consumed by kernel run/action/stream handlers."""
     trace_id = resolve_trace_id_fn(req.trace_id)
@@ -143,8 +144,18 @@ async def prepare_kernel_turn_context_flow(
             "confidence": 0.0,
         }
 
+    project_memory_recall = {}
+    if callable(build_project_memory_context_layer_fn):
+        project_memory_recall = build_project_memory_context_layer_fn(
+            project_id=project_id,
+            user_id=user_id,
+            query=raw_message,
+        )
+
     enriched_payload = enrich_payload_fn(req, resolved_mode=resolved_mode, retrieved_knowledge=retrieved_knowledge)
     if isinstance(enriched_payload, dict):
+        if isinstance(project_memory_recall, dict) and project_memory_recall:
+            enriched_payload["project_memory_recall"] = project_memory_recall
         enriched_payload["analysis_route"] = analysis_route
         if not _has_question_answer(enriched_payload):
             structured_reasoning = await generate_structured_reasoning(
@@ -244,6 +255,7 @@ async def prepare_kernel_turn_context_flow(
         "effective_command": effective_command,
         "structured_retrieved_knowledge": structured_retrieved_knowledge,
         "analysis_route": analysis_route,
+        "project_memory_recall": project_memory_recall,
     }
 
 

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/src/flare_kernel/router/kernel_facade/turn_context.py

@@ -57,6 +57,7 @@ from flare_kernel.router.text_safety import (
 from flare_kernel.runtime.orchestration.analysis_router_runtime import (
     resolve_analysis_route as resolve_analysis_route_from_runtime,
 )
+from flare_kernel.runtime.project_memory import build_project_memory_context_layer
 
 
 async def _prepare_kernel_turn_context(
@@ -86,6 +87,7 @@ async def _prepare_kernel_turn_context(
     generate_llm_completion_fn=None,
     search_web_sources_fn=None,
     resolve_analysis_route_fn=None,
+    build_project_memory_context_layer_fn=None,
 ) -> dict[str, Any]:
     turn_context_deps = resolve_turn_context_dependencies(
         resolve_trace_id_fn=resolve_trace_id_fn,
@@ -111,6 +113,7 @@ async def _prepare_kernel_turn_context(
         build_structured_search_results_fn=build_structured_search_results_fn,
         generate_llm_completion_fn=generate_llm_completion_fn,
         resolve_analysis_route_fn=resolve_analysis_route_fn,
+        build_project_memory_context_layer_fn=build_project_memory_context_layer_fn,
         kernel_attr_fn=_kernel_attr,
         defaults={
             "resolve_trace_id_fn": resolve_trace_id,
@@ -136,6 +139,7 @@ async def _prepare_kernel_turn_context(
             "build_structured_search_results_fn": build_structured_search_results_from_intake_status,
             "generate_llm_completion_fn": generate_llm_completion,
             "resolve_analysis_route_fn": resolve_analysis_route_from_runtime,
+            "build_project_memory_context_layer_fn": build_project_memory_context_layer,
         },
     )
     return await prepare_kernel_turn_context_flow(
@@ -164,6 +168,7 @@ async def _prepare_kernel_turn_context(
         generate_llm_completion_fn=turn_context_deps["generate_llm_completion_fn"],
         search_web_sources_fn=search_web_sources_fn,
         resolve_analysis_route_fn=turn_context_deps["resolve_analysis_route_fn"],
+        build_project_memory_context_layer_fn=turn_context_deps["build_project_memory_context_layer_fn"],
     )
 
 

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/src/flare_kernel/router/kernel_route/run.py

@@ -6,6 +6,7 @@ from typing import Any
 
 from flare_kernel.contracts import KernelRequest, KernelResponse
 from flare_kernel.runtime import generate_llm_completion, get_logger, persist_memory_record
+from flare_kernel.runtime.project_memory import persist_project_memory_from_runtime
 from flare_kernel.router.completion.response_builder import (
     apply_completion_content_policy as apply_completion_content_policy_from_router,
     build_kernel_success_response as build_kernel_success_response_from_router,
@@ -117,6 +118,14 @@ async def build_kernel_run_response(
             model=completion.model,
             provider_status=completion.status,
         )
+    project_memory_record = persist_project_memory_from_runtime(
+        project_id=project_id,
+        user_id=user_id,
+        source_session_id=session_id,
+        runtime_snapshot=runtime_snapshot,
+    )
+    if project_memory_record:
+        memory_record.update(project_memory_record)
     has_llm_content = bool(str(content_text or "").strip())
     apply_completion_content_policy_from_router(
         orchestration_status=orchestration_status,

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/src/flare_kernel/router/prompting/context_blocks.py

@@ -69,6 +69,31 @@ def _format_recent_turns(turns: Any, *, limit: int) -> str:
     return " || ".join(parts)
 
 
+def _format_project_memories(memories: Any, *, limit: int) -> str:
+    """Format recalled Project Memory records for prompt context.
+
+    Args:
+        memories: Recalled memory records.
+        limit: Maximum number of memory records to include.
+
+    Returns:
+        Compact Project Memory text block.
+    """
+
+    if not isinstance(memories, list):
+        return ""
+    parts: list[str] = []
+    for item in memories[:limit]:
+        if not isinstance(item, dict):
+            continue
+        memory_type = _clean_context_text(item.get("memory_type"))
+        content = _clean_context_text(item.get("content"))
+        if not content:
+            continue
+        parts.append(f"{memory_type}: {content}" if memory_type else content)
+    return "; ".join(parts)
+
+
 def _append_session_context_prompt_parts(prompt_parts: list[str], payload: dict[str, Any]) -> None:
     session_context = payload.get("session_context")
     if not isinstance(session_context, dict) or not session_context:
@@ -93,6 +118,25 @@ def _append_session_context_prompt_parts(prompt_parts: list[str], payload: dict[
         prompt_parts.append(f"session_context_recent_turns: {recent_turns}")
 
 
+def _append_project_memory_prompt_parts(prompt_parts: list[str], payload: dict[str, Any]) -> None:
+    """Append project-level recalled memory to prompt parts.
+
+    Args:
+        prompt_parts: Mutable prompt line list.
+        payload: Enriched kernel payload.
+
+    Returns:
+        None.
+    """
+
+    recall = payload.get("project_memory_recall")
+    if not isinstance(recall, dict) or not recall:
+        return
+    memories = _format_project_memories(recall.get("memories"), limit=5)
+    if memories:
+        prompt_parts.append(f"project_memory: {memories}")
+
+
 def _append_track_prompt_parts(prompt_parts: list[str], payload: dict[str, Any]) -> None:
     track = payload.get("track_result")
     if not isinstance(track, dict) or not track:
@@ -123,6 +167,7 @@ def _append_understanding_summary_prompt_part(prompt_parts: list[str], payload:
 
 
 __all__ = [
+    "_append_project_memory_prompt_parts",
     "_append_session_context_prompt_parts",
     "_append_track_prompt_parts",
     "_append_understanding_summary_prompt_part",

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/src/flare_kernel/router/prompting/core.py

@@ -7,6 +7,7 @@ from typing import Any, Callable
 
 from flare_kernel.contracts import KernelRequest
 from flare_kernel.router.prompting.context_blocks import (
+    _append_project_memory_prompt_parts,
     _append_session_context_prompt_parts,
     _append_track_prompt_parts,
     _append_understanding_summary_prompt_part,
@@ -100,6 +101,7 @@ def build_prompt(
     if product_name:
         prompt_parts.append(f"product_name: {product_name}")
     _append_session_context_prompt_parts(prompt_parts, payload)
+    _append_project_memory_prompt_parts(prompt_parts, payload)
     _append_track_prompt_parts(prompt_parts, payload)
     append_response_strategy_prompt_parts(prompt_parts, payload)
     _append_understanding_summary_prompt_part(prompt_parts, payload)

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/src/flare_kernel/router/streaming/draft/completion.py

@@ -7,6 +7,7 @@ from typing import Any, Callable
 
 from flare_kernel.contracts import KernelRequest
 from flare_kernel.runtime.llm.llm_provider import LLMCompletion
+from flare_kernel.runtime.project_memory import persist_project_memory_from_runtime
 
 
 _PLAN_MODE_FINALIZE_COMMANDS = {"implement", "apply"}
@@ -100,6 +101,14 @@ async def resolve_draft_completion_artifacts(
             model=completion.model,
             provider_status=completion.status,
         )
+    project_memory_record = persist_project_memory_from_runtime(
+        project_id=project_id,
+        user_id=user_id,
+        source_session_id=session_id,
+        runtime_snapshot=runtime_snapshot,
+    )
+    if project_memory_record:
+        memory_record.update(project_memory_record)
 
     observation_runtime_event = {
         "trace_id": trace_id,

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/src/flare_kernel/runtime/project_memory/__init__.py

@@ -2,9 +2,15 @@
 
 from flare_kernel.runtime.project_memory.extraction import extract_project_memory_candidates
 from flare_kernel.runtime.project_memory.recall import build_project_memory_recall, recall_project_memory
+from flare_kernel.runtime.project_memory.runtime import (
+    build_project_memory_context_layer,
+    persist_project_memory_from_runtime,
+)
 
 __all__ = [
     "build_project_memory_recall",
+    "build_project_memory_context_layer",
     "extract_project_memory_candidates",
+    "persist_project_memory_from_runtime",
     "recall_project_memory",
 ]

flare_kernel-0.2.7/src/flare_kernel/runtime/project_memory/runtime.py

@@ -0,0 +1,144 @@
+"""Project Memory runtime orchestration helpers."""
+
+from __future__ import annotations
+
+from typing import Any, Callable
+
+from flare_kernel.runtime.infrastructure.project_memory_store import (
+    search_project_memory_records,
+    upsert_project_memory_record,
+)
+from flare_kernel.runtime.project_memory.extraction import extract_project_memory_candidates
+from flare_kernel.runtime.project_memory.recall import recall_project_memory
+
+
+def _as_dict(value: Any) -> dict[str, Any]:
+    """Return dict-shaped values only.
+
+    Args:
+        value: Candidate runtime value.
+
+    Returns:
+        Original dict or an empty dict.
+    """
+
+    return value if isinstance(value, dict) else {}
+
+
+def _clean_text(value: Any) -> str:
+    """Normalize text-like values.
+
+    Args:
+        value: Raw value.
+
+    Returns:
+        Whitespace-normalized string.
+    """
+
+    return " ".join(str(value or "").split()).strip()
+
+
+def build_project_memory_context_layer(
+    *,
+    project_id: str | None,
+    user_id: str | None,
+    query: str | None,
+    top_k: int = 5,
+    search_project_memory_records_fn: Callable[..., list[dict[str, Any]]] = search_project_memory_records,
+) -> dict[str, Any]:
+    """Build the Project Memory recall layer for one turn.
+
+    Args:
+        project_id: Project scope used for recall.
+        user_id: User scope used for recall.
+        query: User/query text used to recall memory.
+        top_k: Maximum number of records to request.
+        search_project_memory_records_fn: Persistence search boundary.
+
+    Returns:
+        ProjectMemoryRecall dict, or empty dict when scope/query is missing.
+    """
+
+    resolved_project_id = _clean_text(project_id)
+    resolved_user_id = _clean_text(user_id)
+    resolved_query = _clean_text(query)
+    if not resolved_project_id or not resolved_user_id or not resolved_query:
+        return {}
+    return recall_project_memory(
+        project_id=resolved_project_id,
+        user_id=resolved_user_id,
+        query=resolved_query,
+        top_k=top_k,
+        search_project_memory_records_fn=search_project_memory_records_fn,
+    )
+
+
+def persist_project_memory_from_runtime(
+    *,
+    project_id: str | None,
+    user_id: str | None,
+    source_session_id: str | None,
+    runtime_snapshot: dict[str, Any],
+    upsert_project_memory_record_fn: Callable[..., dict[str, Any]] = upsert_project_memory_record,
+) -> dict[str, Any]:
+    """Persist Project Memory candidates extracted from runtime outputs.
+
+    Args:
+        project_id: Project scope used for persistence.
+        user_id: User scope used for persistence.
+        source_session_id: Session that produced the runtime outputs.
+        runtime_snapshot: Kernel runtime snapshot containing context outputs.
+        upsert_project_memory_record_fn: Persistence upsert boundary.
+
+    Returns:
+        Project Memory persistence status dict, or empty dict when skipped.
+    """
+
+    resolved_project_id = _clean_text(project_id)
+    resolved_user_id = _clean_text(user_id)
+    if not resolved_project_id or not resolved_user_id:
+        return {}
+
+    candidates = extract_project_memory_candidates(
+        context=_as_dict(runtime_snapshot.get("session_context")),
+        reasoning_result=_as_dict(runtime_snapshot.get("reasoning_result")),
+        document_result=_as_dict(runtime_snapshot.get("document_result")),
+        track_result=_as_dict(runtime_snapshot.get("track_result")),
+        source_session_id=source_session_id,
+    )
+    if not candidates:
+        return {}
+
+    memory_ids: list[str] = []
+    try:
+        for candidate in candidates:
+            stored = upsert_project_memory_record_fn(
+                project_id=resolved_project_id,
+                user_id=resolved_user_id,
+                content=str(candidate.get("content") or ""),
+                memory_type=str(candidate.get("memory_type") or "fact"),
+                source_session_id=str(candidate.get("source_session_id") or ""),
+                source_message_id=str(candidate.get("source_message_id") or ""),
+                source_id=str(candidate.get("source_id") or ""),
+                evidence=candidate.get("evidence") if isinstance(candidate.get("evidence"), list) else [],
+                confidence=candidate.get("confidence"),
+                status="active",
+            )
+            memory_id = _clean_text(stored.get("memory_id") if isinstance(stored, dict) else "")
+            if memory_id:
+                memory_ids.append(memory_id)
+    except Exception as exc:
+        return {
+            "project_memory_stored": False,
+            "project_memory_status": "failed",
+            "project_memory_error": str(exc),
+            "project_memory_count": len(memory_ids),
+            "project_memory_ids": memory_ids,
+        }
+
+    return {
+        "project_memory_stored": bool(memory_ids),
+        "project_memory_status": "stored" if memory_ids else "skipped",
+        "project_memory_count": len(memory_ids),
+        "project_memory_ids": memory_ids,
+    }

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/src/flare_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flare-kernel
-Version: 0.2.6
+Version: 0.2.7
 Summary: FLARE kernel runtime package
 License: Proprietary
 Classifier: Development Status :: 3 - Alpha

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/src/flare_kernel.egg-info/SOURCES.txt

@@ -289,6 +289,7 @@ src/flare_kernel/runtime/orchestration/sourcing/search_runtime.py
 src/flare_kernel/runtime/project_memory/__init__.py
 src/flare_kernel/runtime/project_memory/extraction.py
 src/flare_kernel/runtime/project_memory/recall.py
+src/flare_kernel/runtime/project_memory/runtime.py
 src/flare_kernel/runtime/reasoning/__init__.py
 src/flare_kernel/runtime/reasoning/intake/__init__.py
 src/flare_kernel/runtime/reasoning/intake/api.py

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/tests/test_kernel_facade_turn_context.py

@@ -72,6 +72,57 @@ def test_prepare_kernel_turn_context_flow_builds_expected_shape() -> None:
     assert isinstance(result["structured_retrieved_knowledge"], list)
 
 
+def test_prepare_kernel_turn_context_flow_injects_project_memory_recall() -> None:
+    req = KernelRequest(payload={"message": "预算", "project_id": "p1", "user_id": "u1"})
+
+    async def _run() -> dict:
+        return await prepare_kernel_turn_context_flow(
+            req=req,
+            resolve_trace_id_fn=lambda _t: "trace-memory",
+            resolve_command_fn=lambda _r: "send_message",
+            safe_session_id_fn=lambda _s: "session-memory",
+            load_instance_profile_fn=lambda _i: None,
+            resolve_intent_escalation_policy_with_source_fn=lambda **_kwargs: ({}, "default"),
+            resolve_request_intent_with_ai_fn=lambda _r, _t: _async_tuple(("default", "fallback", 0.2, "none")),
+            extract_user_message_fn=lambda payload: str((payload or {}).get("message") or ""),
+            build_intent_and_escalation_signal_fn=lambda **_kwargs: {"signal": "ok"},
+            resolve_request_mode_fn=lambda _r, _i: ("default", "fallback"),
+            apply_escalation_mode_override_fn=lambda **kwargs: (
+                kwargs["resolved_intent"],
+                kwargs["intent_source"],
+                kwargs["intent_confidence"],
+                kwargs["intent_reason"],
+                kwargs["resolved_mode"],
+                kwargs["mode_source"],
+            ),
+            resolve_project_id_fn=lambda _r, payload: str(payload.get("project_id") or ""),
+            resolve_user_id_fn=lambda _r, payload: str(payload.get("user_id") or ""),
+            resolve_retrieval_config_fn=lambda _r, _p: {"enabled": False, "top_k": 3, "min_score": 0.1},
+            build_retrieval_queries_fn=lambda _r, **_kwargs: [],
+            search_knowledge_by_queries_fn=lambda **_kwargs: [],
+            enrich_payload_fn=lambda _r, **_kwargs: {"message": "预算"},
+            build_project_memory_context_layer_fn=lambda **_kwargs: {
+                "project_id": "p1",
+                "user_id": "u1",
+                "query": "预算",
+                "hit_count": 1,
+                "memory_ids": ["pmem-1"],
+                "memories": [{"memory_id": "pmem-1", "memory_type": "fact", "content": "预算上限为 20 万。"}],
+                "degraded": False,
+            },
+            build_kernel_runtime_fn=lambda **kwargs: {"payload": kwargs["payload"], "open_fields": []},
+            build_orchestration_status_fn=lambda **_kwargs: {"open_fields": [], "status": "ok"},
+            merge_intent_and_escalation_signal_fn=lambda **kwargs: kwargs["orchestration_status"],
+            resolve_effective_command_fn=lambda **_kwargs: "send_message",
+            build_structured_search_results_fn=lambda **_kwargs: [],
+        )
+
+    result = asyncio.run(_run())
+    recall = result["enriched_payload"]["project_memory_recall"]
+    assert recall["hit_count"] == 1
+    assert result["runtime_snapshot"]["payload"]["project_memory_recall"] == recall
+
+
 def test_prepare_kernel_turn_context_flow_injects_structured_reasoning_before_runtime() -> None:
     req = KernelRequest(payload={"message": "我要举办展厅"})
     captured_runtime_payload = {}

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/tests/test_project_memory_runtime.py

@@ -1,7 +1,9 @@
 from flare_kernel.contracts import ProjectMemoryCandidate, ProjectMemoryRecall
 from flare_kernel.runtime.project_memory import (
+    build_project_memory_context_layer,
     build_project_memory_recall,
     extract_project_memory_candidates,
+    persist_project_memory_from_runtime,
     recall_project_memory,
 )
 
@@ -100,3 +102,48 @@ def test_recall_project_memory_returns_degraded_payload_on_search_failure() -> N
     assert payload["hit_count"] == 0
     assert payload["memory_ids"] == []
     assert payload["degraded"] is True
+
+
+def test_build_project_memory_context_layer_uses_recall_boundary() -> None:
+    def _search(**kwargs):
+        assert kwargs["project_id"] == "project-1"
+        assert kwargs["user_id"] == "user-1"
+        assert kwargs["query"] == "预算"
+        return [{"memory_id": "pmem-1", "memory_type": "fact", "content": "预算上限为 20 万。"}]
+
+    payload = build_project_memory_context_layer(
+        project_id="project-1",
+        user_id="user-1",
+        query="预算",
+        search_project_memory_records_fn=_search,
+    )
+
+    assert payload["hit_count"] == 1
+    assert payload["memory_ids"] == ["pmem-1"]
+
+
+def test_persist_project_memory_from_runtime_upserts_extracted_candidates() -> None:
+    stored = []
+
+    def _upsert(**kwargs):
+        stored.append(kwargs)
+        return {"memory_id": f"pmem-{len(stored)}"}
+
+    result = persist_project_memory_from_runtime(
+        project_id="project-1",
+        user_id="user-1",
+        source_session_id="session-1",
+        runtime_snapshot={
+            "session_context": {
+                "facts": [{"text": "预算上限为 20 万。"}],
+                "unknowns": [{"text": "交付周期待确认。"}],
+            }
+        },
+        upsert_project_memory_record_fn=_upsert,
+    )
+
+    assert result["project_memory_stored"] is True
+    assert result["project_memory_count"] == 2
+    assert result["project_memory_ids"] == ["pmem-1", "pmem-2"]
+    assert stored[0]["project_id"] == "project-1"
+    assert stored[0]["source_session_id"] == "session-1"

{flare_kernel-0.2.6 → flare_kernel-0.2.7}/tests/test_prompting_analysis_instruction.py

@@ -74,6 +74,27 @@ def test_prompt_includes_session_context_for_model_grounding() -> None:
     assert "session_context_artifacts: 分析报告模板(template): 用于输出分析报告" in prompt
 
 
+def test_prompt_includes_project_memory_for_project_grounding() -> None:
+    prompt = _build_prompt_for_test(
+        intent="requirement_canvas",
+        payload={
+            "message": "继续分析预算",
+            "project_memory_recall": {
+                "hit_count": 1,
+                "memories": [
+                    {
+                        "memory_id": "pmem-1",
+                        "memory_type": "fact",
+                        "content": "预算上限为 20 万。",
+                    }
+                ],
+            },
+        },
+    )
+
+    assert "project_memory: fact: 预算上限为 20 万。" in prompt
+
+
 def test_prompt_includes_confirmed_fields_and_recent_turns_for_followup_grounding() -> None:
     prompt = _build_prompt_for_test(
         intent="requirement_canvas",