Wraps over-long lines, sorts imports, drops an unused local, and bumps the agent submodule for its own import-sort fix so make check passes.
This commit is contained in:
1 parent
78033bb830
commit
c492124fe1
12 files changed
+272
-68
No files matched your search
@@ -21,18 +21,18 @@ from gewu.domain.contracts import (
|
||||
EdgeEndpoint,
|
||||
EvidenceReference,
|
||||
Finding,
|
||||
KnowledgeNode,
|
||||
KnowledgeBrowseRequest,
|
||||
KnowledgeBrowseEnvelope,
|
||||
KnowledgeBrowseRequest,
|
||||
KnowledgeGraphEnvelope,
|
||||
KnowledgeGraphRequest,
|
||||
SourceRelatedNode,
|
||||
SourceRelatedNodesEnvelope,
|
||||
KnowledgeNode,
|
||||
NeighborRequest,
|
||||
ReadEnvelope,
|
||||
Scope,
|
||||
SearchRequest,
|
||||
SourceListRequest,
|
||||
SourceRelatedNode,
|
||||
SourceRelatedNodesEnvelope,
|
||||
SourceRevisionRecord,
|
||||
TypedEdge,
|
||||
)
|
||||
@@ -165,7 +165,9 @@ class SearchIndex(Protocol):
|
||||
|
||||
def count_sources(self, *, project_ids: tuple[str, ...], include_shared: bool) -> int: ...
|
||||
|
||||
def graph(self, *, project_ids: tuple[str, ...], include_shared: bool, max_nodes: int, max_edges: int) -> GraphIndexResult: ...
|
||||
def graph(
|
||||
self, *, project_ids: tuple[str, ...], include_shared: bool, max_nodes: int, max_edges: int
|
||||
) -> GraphIndexResult: ...
|
||||
|
||||
def browse(
|
||||
self,
|
||||
@@ -616,8 +618,15 @@ class HybridSearchIndex:
|
||||
def count_sources(self, *, project_ids: tuple[str, ...], include_shared: bool) -> int:
|
||||
return self.lexical.count_sources(project_ids=project_ids, include_shared=include_shared)
|
||||
|
||||
def graph(self, *, project_ids: tuple[str, ...], include_shared: bool, max_nodes: int, max_edges: int) -> GraphIndexResult:
|
||||
return self.lexical.graph(project_ids=project_ids, include_shared=include_shared, max_nodes=max_nodes, max_edges=max_edges)
|
||||
def graph(
|
||||
self, *, project_ids: tuple[str, ...], include_shared: bool, max_nodes: int, max_edges: int
|
||||
) -> GraphIndexResult:
|
||||
return self.lexical.graph(
|
||||
project_ids=project_ids,
|
||||
include_shared=include_shared,
|
||||
max_nodes=max_nodes,
|
||||
max_edges=max_edges,
|
||||
)
|
||||
|
||||
def browse(self, **kwargs: Any) -> BrowseIndexResult:
|
||||
return self.lexical.browse(**kwargs)
|
||||
@@ -709,7 +718,9 @@ class CanonicalSearchService:
|
||||
state = "current" if index_revision == canonical_revision else "lagging"
|
||||
return canonical_revision, index_revision, state, schema_version
|
||||
|
||||
def browse(self, request: KnowledgeBrowseRequest, *, principal: Principal) -> KnowledgeBrowseEnvelope:
|
||||
def browse(
|
||||
self, request: KnowledgeBrowseRequest, *, principal: Principal
|
||||
) -> KnowledgeBrowseEnvelope:
|
||||
project_ids = self._resolve_scope(request.scope, principal)
|
||||
fingerprint = hashlib.sha256(canonical_json({
|
||||
"projects": project_ids,
|
||||
@@ -723,7 +734,9 @@ class CanonicalSearchService:
|
||||
"to": request.as_of_to.isoformat() if request.as_of_to else None,
|
||||
"stale": request.stale_only, "order": request.order, "limit": request.limit,
|
||||
})).hexdigest()
|
||||
offset, expected_revision = self._cursor_offset(request.cursor, fingerprint, max_offset=100_000)
|
||||
offset, expected_revision = self._cursor_offset(
|
||||
request.cursor, fingerprint, max_offset=100_000
|
||||
)
|
||||
lexical = self.index.lexical if isinstance(self.index, HybridSearchIndex) else self.index
|
||||
result = lexical.browse(
|
||||
query=request.query,
|
||||
@@ -761,7 +774,12 @@ class CanonicalSearchService:
|
||||
canonical_revision = self.canonical_head()
|
||||
warnings: tuple[Finding, ...] = ()
|
||||
if result.index_revision != canonical_revision:
|
||||
warnings = (Finding(code="INDEX_LAG", message="Browse data reflects an older accepted revision."),)
|
||||
warnings = (
|
||||
Finding(
|
||||
code="INDEX_LAG",
|
||||
message="Browse data reflects an older accepted revision.",
|
||||
),
|
||||
)
|
||||
return KnowledgeBrowseEnvelope(
|
||||
request_id="browse-" + secrets.token_hex(12),
|
||||
resolved_scope=Scope(projects=project_ids, include_shared=request.scope.include_shared),
|
||||
@@ -824,7 +842,12 @@ class CanonicalSearchService:
|
||||
canonical_revision = self.canonical_head()
|
||||
warnings: tuple[Finding, ...] = ()
|
||||
if result.index_revision != canonical_revision:
|
||||
warnings = (Finding(code="INDEX_LAG", message="Source nodes reflect an older accepted revision."),)
|
||||
warnings = (
|
||||
Finding(
|
||||
code="INDEX_LAG",
|
||||
message="Source nodes reflect an older accepted revision.",
|
||||
),
|
||||
)
|
||||
return SourceRelatedNodesEnvelope(
|
||||
request_id="srcnodes-" + secrets.token_hex(12),
|
||||
resolved_scope=Scope(projects=(project_id,), include_shared=include_shared),
|
||||
@@ -972,7 +995,9 @@ class CanonicalSearchService:
|
||||
),
|
||||
)
|
||||
|
||||
def graph(self, request: KnowledgeGraphRequest, *, principal: Principal) -> KnowledgeGraphEnvelope:
|
||||
def graph(
|
||||
self, request: KnowledgeGraphRequest, *, principal: Principal
|
||||
) -> KnowledgeGraphEnvelope:
|
||||
project_ids = self._resolve_scope(request.scope, principal)
|
||||
if request.center_node_id is None:
|
||||
result = self.index.graph(
|
||||
@@ -995,7 +1020,8 @@ class CanonicalSearchService:
|
||||
if request.max_nodes > 1:
|
||||
neighbors = self.index.neighbors(
|
||||
node_id=origin.node_id, edge_types=(), project_ids=project_ids,
|
||||
include_shared=request.scope.include_shared, limit=min(50, request.max_nodes - 1),
|
||||
include_shared=request.scope.include_shared,
|
||||
limit=min(50, request.max_nodes - 1),
|
||||
)
|
||||
for hit in neighbors.edges:
|
||||
endpoint = hit.neighbor_endpoint
|
||||
@@ -1007,12 +1033,20 @@ class CanonicalSearchService:
|
||||
index_revision=neighbors.index_revision if neighbors else scoped.index_revision,
|
||||
nodes=tuple(nodes_by_id.values()),
|
||||
edges=tuple(edges[:request.max_edges]),
|
||||
truncated=(neighbors.has_more if neighbors else False) or len(edges) > request.max_edges,
|
||||
truncated=(
|
||||
(neighbors.has_more if neighbors else False)
|
||||
or len(edges) > request.max_edges
|
||||
),
|
||||
)
|
||||
canonical_revision = self.canonical_head()
|
||||
warnings: tuple[Finding, ...] = ()
|
||||
if result.index_revision != canonical_revision:
|
||||
warnings = (Finding(code="INDEX_LAG", message="Graph data reflects an older accepted revision."),)
|
||||
warnings = (
|
||||
Finding(
|
||||
code="INDEX_LAG",
|
||||
message="Graph data reflects an older accepted revision.",
|
||||
),
|
||||
)
|
||||
return KnowledgeGraphEnvelope(
|
||||
request_id="graph-" + secrets.token_hex(12),
|
||||
resolved_scope=Scope(projects=project_ids, include_shared=request.scope.include_shared),
|
||||
|
||||
Reference in new issue
Block a user