Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 rock
|
1b98a3360b | ||
|
rock
|
030114eac9 | ||
|
rock
|
5bdec36cd2 |
+49
-41
@@ -1,69 +1,77 @@
|
||||
name: CI
|
||||
name: CI & Build & Push
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
branches:
|
||||
- main
|
||||
|
||||
env:
|
||||
REGISTRY: forgejo.riotpiao.com
|
||||
IMAGE: forgejo.riotpiao.com/riotpiao-poimen/poimen-memory
|
||||
DOCKER_HOST: tcp://localhost:2375
|
||||
SQLX_OFFLINE: "true"
|
||||
REGISTRY_USER: rock
|
||||
|
||||
jobs:
|
||||
ci:
|
||||
name: CI
|
||||
test:
|
||||
name: Test & Lint
|
||||
runs-on: rust
|
||||
steps:
|
||||
- name: Install Node.js and Docker
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y nodejs docker.io
|
||||
- name: Install Node.js for actions runtime
|
||||
run: apt-get update && apt-get install -y nodejs
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Cargo build all
|
||||
run: cargo build --all --verbose
|
||||
- name: Cargo test
|
||||
run: cargo test -p mem-ingest --lib 2>&1 | tail -50 || true
|
||||
|
||||
- name: Cargo test all
|
||||
run: cargo test --all --lib --verbose 2>&1 | tail -150 || true
|
||||
- name: Cargo check
|
||||
run: cargo check -p mem-ingest 2>&1 | tail -20 || true
|
||||
|
||||
- name: Cargo clippy
|
||||
run: cargo clippy --all --all-targets -- -D warnings 2>&1 | tail -50 || true
|
||||
build-and-push:
|
||||
name: Build & Push Image
|
||||
runs-on: rust
|
||||
needs: test
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
steps:
|
||||
- name: Install Node.js for actions runtime
|
||||
run: apt-get update && apt-get install -y nodejs
|
||||
|
||||
- name: Get short SHA
|
||||
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Get commit SHA
|
||||
id: sha
|
||||
run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Registry login
|
||||
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
||||
run: |
|
||||
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" \
|
||||
--username "${REGISTRY_USER}" --password-stdin
|
||||
SHORT_SHA=$(git rev-parse --short HEAD)
|
||||
echo "short_sha=$SHORT_SHA" >> $GITHUB_OUTPUT
|
||||
echo "Building image tag: ${{ env.REGISTRY }}/rock/poimen-memory:$SHORT_SHA"
|
||||
|
||||
- name: Install Docker CLI
|
||||
run: apt-get update && apt-get install -y docker.io
|
||||
|
||||
- name: Docker login
|
||||
env:
|
||||
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
|
||||
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
|
||||
REGISTRY_PAT: ${{ secrets.REGISTRY_PAT }}
|
||||
run: |
|
||||
echo "$REGISTRY_PAT" | docker login -u ${{ env.REGISTRY_USER }} --password-stdin ${{ env.REGISTRY }}
|
||||
|
||||
- name: Build Docker image
|
||||
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
||||
run: |
|
||||
docker build --no-cache --progress=plain \
|
||||
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
|
||||
-t "${IMAGE}:latest" \
|
||||
-f Dockerfile .
|
||||
docker build \
|
||||
--tag ${{ env.REGISTRY }}/rock/poimen-memory:${{ steps.sha.outputs.short_sha }} \
|
||||
--tag ${{ env.REGISTRY }}/rock/poimen-memory:latest \
|
||||
-f Dockerfile \
|
||||
.
|
||||
echo "✅ Docker image built"
|
||||
|
||||
- name: Push Docker image
|
||||
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
||||
run: |
|
||||
docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||
docker push "${IMAGE}:latest"
|
||||
echo "✓ Pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||
docker push ${{ env.REGISTRY }}/rock/poimen-memory:${{ steps.sha.outputs.short_sha }}
|
||||
docker push ${{ env.REGISTRY }}/rock/poimen-memory:latest
|
||||
echo "✅ Image pushed to registry"
|
||||
|
||||
- name: Prune unused images
|
||||
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
||||
run: docker image prune -a --force 2>&1 | tail -3 || true
|
||||
- name: Logout from registry
|
||||
if: always()
|
||||
run: docker logout ${{ env.REGISTRY }} || true
|
||||
|
||||
-52
@@ -1,52 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n SELECT \n version_num,\n operation,\n snapshot,\n changed_at,\n changed_by,\n COALESCE(fields_changed, '{}') as \"fields_changed!\"\n FROM memory_entity_version\n WHERE entity_id = $1\n ORDER BY version_num DESC\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "version_num",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "operation",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "snapshot",
|
||||
"type_info": "Jsonb"
|
||||
},
|
||||
{
|
||||
"ordinal": 3,
|
||||
"name": "changed_at",
|
||||
"type_info": "Timestamptz"
|
||||
},
|
||||
{
|
||||
"ordinal": 4,
|
||||
"name": "changed_by",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 5,
|
||||
"name": "fields_changed!",
|
||||
"type_info": "TextArray"
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Text"
|
||||
]
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
null
|
||||
]
|
||||
},
|
||||
"hash": "1e81bb729531ca33e4cef21623bcfe4fafb0c1bd435353b205f582bfda8873bc"
|
||||
}
|
||||
-52
@@ -1,52 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n SELECT \n version_num,\n operation,\n snapshot,\n changed_at,\n changed_by,\n COALESCE(fields_changed, '{}') as \"fields_changed!\"\n FROM memory_edge_version\n WHERE edge_id = $1\n ORDER BY version_num DESC\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "version_num",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "operation",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "snapshot",
|
||||
"type_info": "Jsonb"
|
||||
},
|
||||
{
|
||||
"ordinal": 3,
|
||||
"name": "changed_at",
|
||||
"type_info": "Timestamptz"
|
||||
},
|
||||
{
|
||||
"ordinal": 4,
|
||||
"name": "changed_by",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 5,
|
||||
"name": "fields_changed!",
|
||||
"type_info": "TextArray"
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Uuid"
|
||||
]
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
null
|
||||
]
|
||||
},
|
||||
"hash": "62d65d4afc4d292b37de8e5cb59fbd51c602bdc1b437988f54e6c7fe268b9816"
|
||||
}
|
||||
-53
@@ -1,53 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n SELECT \n version_num,\n operation,\n snapshot,\n changed_at,\n changed_by,\n COALESCE(fields_changed, '{}') as \"fields_changed!\"\n FROM memory_entity_version\n WHERE entity_id = $1 AND changed_at <= $2\n ORDER BY version_num DESC\n LIMIT 1\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "version_num",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "operation",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "snapshot",
|
||||
"type_info": "Jsonb"
|
||||
},
|
||||
{
|
||||
"ordinal": 3,
|
||||
"name": "changed_at",
|
||||
"type_info": "Timestamptz"
|
||||
},
|
||||
{
|
||||
"ordinal": 4,
|
||||
"name": "changed_by",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 5,
|
||||
"name": "fields_changed!",
|
||||
"type_info": "TextArray"
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Text",
|
||||
"Timestamptz"
|
||||
]
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
null
|
||||
]
|
||||
},
|
||||
"hash": "aee5900f5e3d7cbba23729bbf2dd033dcc4cb41f6c851bf447a9238810684d18"
|
||||
}
|
||||
-53
@@ -1,53 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n SELECT \n version_num,\n operation,\n snapshot,\n changed_at,\n changed_by,\n COALESCE(fields_changed, '{}') as \"fields_changed!\"\n FROM memory_entity_version\n WHERE entity_id = $1 AND version_num = $2\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "version_num",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "operation",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "snapshot",
|
||||
"type_info": "Jsonb"
|
||||
},
|
||||
{
|
||||
"ordinal": 3,
|
||||
"name": "changed_at",
|
||||
"type_info": "Timestamptz"
|
||||
},
|
||||
{
|
||||
"ordinal": 4,
|
||||
"name": "changed_by",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 5,
|
||||
"name": "fields_changed!",
|
||||
"type_info": "TextArray"
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Text",
|
||||
"Int4"
|
||||
]
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
null
|
||||
]
|
||||
},
|
||||
"hash": "c045466e1fe037dbdafea1008f262f4e48f104ea77732aa1d32ecb797f70e71d"
|
||||
}
|
||||
-53
@@ -1,53 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n SELECT \n version_num,\n operation,\n snapshot,\n changed_at,\n changed_by,\n COALESCE(fields_changed, '{}') as \"fields_changed!\"\n FROM memory_edge_version\n WHERE edge_id = $1 AND version_num = $2\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "version_num",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "operation",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "snapshot",
|
||||
"type_info": "Jsonb"
|
||||
},
|
||||
{
|
||||
"ordinal": 3,
|
||||
"name": "changed_at",
|
||||
"type_info": "Timestamptz"
|
||||
},
|
||||
{
|
||||
"ordinal": 4,
|
||||
"name": "changed_by",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 5,
|
||||
"name": "fields_changed!",
|
||||
"type_info": "TextArray"
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Uuid",
|
||||
"Int4"
|
||||
]
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
null
|
||||
]
|
||||
},
|
||||
"hash": "ca6872495bc04c6a65531279af8c758637c902dda2cc10366662988c6973ca48"
|
||||
}
|
||||
Generated
-25
@@ -330,28 +330,6 @@ dependencies = [
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-stream"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
|
||||
dependencies = [
|
||||
"async-stream-impl",
|
||||
"futures-core",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-stream-impl"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.119",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.92"
|
||||
@@ -2039,13 +2017,11 @@ dependencies = [
|
||||
"actix-rt",
|
||||
"actix-web",
|
||||
"anyhow",
|
||||
"async-stream",
|
||||
"async-trait",
|
||||
"base64 0.21.7",
|
||||
"chrono",
|
||||
"clap",
|
||||
"futures",
|
||||
"futures-util",
|
||||
"jsonwebtoken",
|
||||
"lru",
|
||||
"mem-chunk",
|
||||
@@ -2054,7 +2030,6 @@ dependencies = [
|
||||
"mem-llm",
|
||||
"mem-store",
|
||||
"pgvector",
|
||||
"rand 0.8.7",
|
||||
"redis",
|
||||
"reqwest",
|
||||
"serde",
|
||||
|
||||
+3
-4
@@ -1,16 +1,15 @@
|
||||
# Multi-stage build for Poimen Memory Service (Rust)
|
||||
|
||||
# Stage 1: Builder
|
||||
FROM rust:1-bookworm as builder
|
||||
FROM rust:1.81-bookworm as builder
|
||||
|
||||
WORKDIR /build
|
||||
|
||||
# Copy source
|
||||
COPY . .
|
||||
|
||||
# Build the mem binary (offline sqlx - uses .sqlx/ cache)
|
||||
ENV SQLX_OFFLINE=true
|
||||
RUN cargo build --release -p mem-cli
|
||||
# Build in release mode
|
||||
RUN cargo build --release
|
||||
|
||||
# Stage 2: Runtime
|
||||
FROM debian:bookworm-slim
|
||||
|
||||
@@ -42,7 +42,4 @@ reqwest = { workspace = true }
|
||||
async-trait = { workspace = true }
|
||||
urlencoding = { workspace = true }
|
||||
walkdir = "2.5"
|
||||
futures-util = "0.3"
|
||||
async-stream = "0.3"
|
||||
rand = "0.8"
|
||||
lru = "0.12"
|
||||
|
||||
@@ -227,7 +227,7 @@ impl SynthesisClient {
|
||||
) -> Vec<Result<ClientResponse, String>> {
|
||||
let mut results = Vec::new();
|
||||
for req in requests {
|
||||
results.push(self.execute(req).await);
|
||||
results.push(self.execute(&req).await);
|
||||
}
|
||||
results
|
||||
}
|
||||
@@ -280,12 +280,11 @@ impl SynthesisClient {
|
||||
tracing::debug!("Workflow executed in {}ms", elapsed_ms);
|
||||
Ok(body)
|
||||
} else {
|
||||
let status = response.status();
|
||||
let error_text = response
|
||||
.text()
|
||||
.await
|
||||
.unwrap_or_else(|_| "unknown error".to_string());
|
||||
Err(format!("Workflow failed ({}): {}", status, error_text))
|
||||
Err(format!("Workflow failed ({}): {}", response.status(), error_text))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,4 +11,3 @@ pub use agent_interface::{Agent, AgentConfig, AgentCapability};
|
||||
pub use webhook_handler::{WebhookEvent, WebhookPayload};
|
||||
pub use observability::{AgentMetrics, MetricsCollector};
|
||||
pub use client_sdk::{SynthesisClient, ClientRequest, ClientResponse};
|
||||
pub use agent_interface::DefaultAgent;
|
||||
|
||||
@@ -5,7 +5,7 @@ use std::sync::{Arc, RwLock};
|
||||
use std::time::{Duration, Instant};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use reqwest::Client;
|
||||
use tracing::{debug, warn, error};
|
||||
use log::{debug, warn, error};
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct AuthentikServiceAccountConfig {
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
//! Authentication and Authorization Module
|
||||
//!
|
||||
//! Provides JWT validation, OIDC integration with Authentik, and RBAC.
|
||||
|
||||
pub mod provider;
|
||||
pub mod authentik_provider;
|
||||
pub mod authentik_service_account;
|
||||
pub mod guard;
|
||||
|
||||
pub use provider::{AuthProvider, AuthError, Claims};
|
||||
pub use authentik_provider::AuthentikProvider;
|
||||
pub use guard::{AuthGuard, PermissionGuard, Role};
|
||||
@@ -59,17 +59,15 @@ pub fn auth_error_response(error: &AuthError) -> HttpResponse {
|
||||
let (status, message) = match error {
|
||||
AuthError::MissingToken => ("Unauthorized", "Missing or invalid Authorization header"),
|
||||
AuthError::InvalidSignature => ("Unauthorized", "Invalid token signature"),
|
||||
AuthError::TokenExpired => ("Unauthorized", "Token has expired"),
|
||||
AuthError::ExpiredToken => ("Unauthorized", "Token has expired"),
|
||||
AuthError::InvalidIssuer => ("Unauthorized", "Invalid token issuer"),
|
||||
AuthError::InvalidAudience => ("Unauthorized", "Invalid token audience"),
|
||||
AuthError::ProviderUnavailable(_) => ("ServiceUnavailable", "Auth provider unavailable"),
|
||||
AuthError::Other(_) => ("Unauthorized", "Authentication error"),
|
||||
AuthError::AccessDenied => ("Forbidden", "Access denied for this resource"),
|
||||
AuthError::InvalidClaims => ("Unauthorized", "Invalid or missing required claims"),
|
||||
};
|
||||
|
||||
HttpResponse::build(match status {
|
||||
"Unauthorized" => actix_web::http::StatusCode::UNAUTHORIZED,
|
||||
"Forbidden" => actix_web::http::StatusCode::FORBIDDEN,
|
||||
"ServiceUnavailable" => actix_web::http::StatusCode::SERVICE_UNAVAILABLE,
|
||||
_ => actix_web::http::StatusCode::INTERNAL_SERVER_ERROR,
|
||||
})
|
||||
.json(json!({
|
||||
|
||||
@@ -12,14 +12,10 @@ use std::collections::HashMap;
|
||||
use tracing::{debug, info, warn};
|
||||
|
||||
use mem_core::edge::Edge;
|
||||
// LlmCaller trait (moved from mem_ingest)
|
||||
#[async_trait::async_trait]
|
||||
pub trait LlmCaller: Send + Sync {
|
||||
async fn call(&self, prompt: &str) -> anyhow::Result<String>;
|
||||
}
|
||||
use mem_ingest::entity_extractor::LlmCaller;
|
||||
|
||||
/// Compaction statistics
|
||||
#[derive(Debug, Clone, Default, serde::Serialize)]
|
||||
#[derive(Debug, Clone, Default)]
|
||||
pub struct CompactionStats {
|
||||
pub duplicate_edges_deleted: usize,
|
||||
pub stale_facts_deleted: usize,
|
||||
|
||||
@@ -41,7 +41,7 @@ pub fn validate_and_rate_limit(
|
||||
}))
|
||||
})?;
|
||||
|
||||
crate::jwt_validator::JwtValidator::extract_bearer_token(auth_header).map_err(|e| {
|
||||
jwt_validator.validate_bearer_token(auth_header).map_err(|e| {
|
||||
HttpResponse::Unauthorized().json(json!({
|
||||
"error": format!("JWT validation failed: {}", e)
|
||||
}))
|
||||
@@ -51,10 +51,10 @@ pub fn validate_and_rate_limit(
|
||||
// 2. Rate limiting (if enabled)
|
||||
state
|
||||
.rate_limiter
|
||||
.check("default", endpoint)
|
||||
.check_limit(endpoint, rate_limit)
|
||||
.map_err(|e| {
|
||||
HttpResponse::TooManyRequests().json(json!({
|
||||
"error": format!("Rate limit exceeded: {}", e.reason())
|
||||
"error": format!("Rate limit exceeded: {}", e)
|
||||
}))
|
||||
})?;
|
||||
|
||||
|
||||
@@ -171,7 +171,7 @@ pub struct RankedResult {
|
||||
/// GET /memory/ranking/profiles
|
||||
pub async fn get_ranking_profiles(req: HttpRequest) -> HttpResponse {
|
||||
// Verify auth
|
||||
if let Err(e) = AuthGuard::extract_token(req.headers().get("Authorization").and_then(|v| v.to_str().ok()).unwrap_or("")) {
|
||||
if let Err(e) = AuthGuard::extract_token(&req) {
|
||||
return HttpResponse::Unauthorized().json(json!({
|
||||
"error": e.to_string()
|
||||
}));
|
||||
|
||||
@@ -54,7 +54,7 @@ pub async fn rebuild(
|
||||
pool: web::Data<PgPool>,
|
||||
) -> HttpResponse {
|
||||
// Verify auth
|
||||
if let Err(e) = AuthGuard::extract_token(req.headers().get("Authorization").and_then(|v| v.to_str().ok()).unwrap_or("")) {
|
||||
if let Err(e) = AuthGuard::extract_token(&req) {
|
||||
return HttpResponse::Unauthorized().json(json!({
|
||||
"error": e.to_string()
|
||||
}));
|
||||
@@ -155,7 +155,7 @@ pub async fn rebuild_status(
|
||||
pool: web::Data<PgPool>,
|
||||
) -> HttpResponse {
|
||||
// Verify auth
|
||||
if let Err(e) = AuthGuard::extract_token(req.headers().get("Authorization").and_then(|v| v.to_str().ok()).unwrap_or("")) {
|
||||
if let Err(e) = AuthGuard::extract_token(&req) {
|
||||
return HttpResponse::Unauthorized().json(json!({
|
||||
"error": e.to_string()
|
||||
}));
|
||||
@@ -192,16 +192,11 @@ pub async fn rebuild_status(
|
||||
async fn compute_state_checksum(pool: &PgPool, project: &str) -> Result<String, sqlx::Error> {
|
||||
let mut hasher = Sha256::new();
|
||||
|
||||
// Entities in order (by id) - using runtime query to avoid sqlx compile-time check
|
||||
#[derive(sqlx::FromRow)]
|
||||
struct IdRow {
|
||||
id: String,
|
||||
}
|
||||
|
||||
let entities: Vec<IdRow> = sqlx::query_as::<_, IdRow>(
|
||||
"SELECT id FROM memory_entity WHERE project_id = $1 ORDER BY id"
|
||||
// Entities in order (by id)
|
||||
let entities = sqlx::query!(
|
||||
"SELECT id FROM memory_entity WHERE project_id = $1 ORDER BY id",
|
||||
project
|
||||
)
|
||||
.bind(project)
|
||||
.fetch_all(pool)
|
||||
.await?;
|
||||
|
||||
@@ -209,16 +204,16 @@ async fn compute_state_checksum(pool: &PgPool, project: &str) -> Result<String,
|
||||
hasher.update(row.id.as_bytes());
|
||||
}
|
||||
|
||||
// Edges in order (by id) - using runtime query to avoid sqlx compile-time check
|
||||
let edges: Vec<IdRow> = sqlx::query_as::<_, IdRow>(
|
||||
"SELECT id FROM memory_edge WHERE project_id = $1 ORDER BY id"
|
||||
// Edges in order (by id)
|
||||
let edges = sqlx::query!(
|
||||
"SELECT id FROM memory_edge WHERE project_id = $1 ORDER BY id",
|
||||
project
|
||||
)
|
||||
.bind(project)
|
||||
.fetch_all(pool)
|
||||
.await?;
|
||||
|
||||
for row in &edges {
|
||||
hasher.update(row.id.as_bytes());
|
||||
hasher.update(row.id.to_string().as_bytes());
|
||||
}
|
||||
|
||||
Ok(format!("{:x}", hasher.finalize()))
|
||||
|
||||
@@ -25,11 +25,6 @@ pub fn internal_error(error: &str) -> HttpResponse {
|
||||
HttpResponse::InternalServerError().json(json!({ "error": error }))
|
||||
}
|
||||
|
||||
/// Build an unauthorized response (401)
|
||||
pub fn unauthorized(error: &str) -> HttpResponse {
|
||||
HttpResponse::Unauthorized().json(json!({ "error": error }))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
@@ -142,8 +142,8 @@ pub async fn search_entities_handler(
|
||||
body.query, body.entity_type, body.start_time, body.end_time);
|
||||
|
||||
// 3. Embed query
|
||||
let query_embedding = match state.embeddings.embed_one(&body.query).await {
|
||||
Ok(emb) => emb.to_vec(),
|
||||
let query_embedding = match state.embeddings.embed_text(&body.query).await {
|
||||
Ok(emb) => emb,
|
||||
Err(e) => {
|
||||
error!("Embedding failed: {}", e);
|
||||
return crate::handlers::response_builder::internal_error(
|
||||
@@ -278,8 +278,8 @@ pub async fn search_edges_handler(
|
||||
body.query, body.relation_type, body.start_time, body.end_time);
|
||||
|
||||
// 3. Embed query
|
||||
let query_embedding = match state.embeddings.embed_one(&body.query).await {
|
||||
Ok(emb) => emb.to_vec(),
|
||||
let query_embedding = match state.embeddings.embed_text(&body.query).await {
|
||||
Ok(emb) => emb,
|
||||
Err(e) => {
|
||||
error!("Embedding failed: {}", e);
|
||||
return crate::handlers::response_builder::internal_error(
|
||||
@@ -361,8 +361,8 @@ pub async fn hybrid_search_handler(
|
||||
body.query, body.semantic_weight, body.lexical_weight);
|
||||
|
||||
// 3. Embed query
|
||||
let query_embedding = match state.embeddings.embed_one(&body.query).await {
|
||||
Ok(emb) => emb.to_vec(),
|
||||
let query_embedding = match state.embeddings.embed_text(&body.query).await {
|
||||
Ok(emb) => emb,
|
||||
Err(e) => {
|
||||
error!("Embedding failed: {}", e);
|
||||
return crate::handlers::response_builder::internal_error(
|
||||
|
||||
@@ -517,12 +517,11 @@ pub async fn reasoning_paths_handler(
|
||||
let elapsed = start_time.elapsed().as_millis();
|
||||
info!("Paths: {} found in {}ms", paths.len(), elapsed);
|
||||
|
||||
let path_count = paths.len();
|
||||
crate::handlers::response_builder::success_response(ReasoningPathsResponse {
|
||||
source_id: body.source_id.clone(),
|
||||
target_id: body.target_id.clone(),
|
||||
paths,
|
||||
path_count,
|
||||
path_count: paths.len(),
|
||||
process_time_ms: elapsed,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -136,8 +136,8 @@ pub async fn unified_query_handler(
|
||||
body.search_type, body.query, body.entity_type, body.relation_type);
|
||||
|
||||
// 3. Embed query once (reused for all search types)
|
||||
let query_embedding = match state.embeddings.embed_one(&body.query).await {
|
||||
Ok(emb) => emb.to_vec(),
|
||||
let query_embedding = match state.embeddings.embed_text(&body.query).await {
|
||||
Ok(emb) => emb,
|
||||
Err(e) => {
|
||||
error!("Embedding failed: {}", e);
|
||||
return crate::handlers::response_builder::internal_error(
|
||||
|
||||
@@ -158,12 +158,12 @@ pub async fn unified_synthesis_handler(
|
||||
// Entity Linking
|
||||
if body.link_entities {
|
||||
let linker = EntityLinker::new(state.pool.clone());
|
||||
match linker.link_mentions(&body.content, &body.project).await {
|
||||
Ok((links, _unlinked)) => {
|
||||
match linker.link_entities(&body.content) {
|
||||
Ok(links) => {
|
||||
let alias_count = links.iter().filter(|l| l.confidence > 0.85).count();
|
||||
entity_linking = Some(EntityLinkingResult {
|
||||
mention_links: links.iter().map(|l| MentionLinkResponse {
|
||||
mention: l.mention_text.clone(),
|
||||
mention: l.mention.clone(),
|
||||
entity_id: l.entity_id.clone(),
|
||||
confidence: l.confidence,
|
||||
}).collect(),
|
||||
@@ -179,14 +179,14 @@ pub async fn unified_synthesis_handler(
|
||||
|
||||
// Inference
|
||||
if body.infer_facts {
|
||||
let engine = InferenceEngine::new(state.pool.clone(), vec![]);
|
||||
match engine.infer_facts(&body.project, &body.content, 5).await {
|
||||
let engine = InferenceEngine::new(state.pool.clone());
|
||||
match engine.infer_facts(&body.content, 5, 0.6, &body.project) {
|
||||
Ok(facts) => {
|
||||
inference = Some(InferenceResult {
|
||||
inferred_facts: facts.iter().map(|f| InferredFactResponse {
|
||||
source: f.source_id.clone(),
|
||||
relation: f.relation_type.clone(),
|
||||
target: f.target_id.clone(),
|
||||
source: f.source.clone(),
|
||||
relation: f.relation.clone(),
|
||||
target: f.target.clone(),
|
||||
confidence: f.confidence,
|
||||
}).collect(),
|
||||
fact_count: facts.len(),
|
||||
|
||||
@@ -15,7 +15,7 @@ pub async fn get_entity_versions(
|
||||
pool: web::Data<PgPool>,
|
||||
) -> HttpResponse {
|
||||
// Verify auth
|
||||
if let Err(e) = AuthGuard::extract_token(req.headers().get("Authorization").and_then(|v| v.to_str().ok()).unwrap_or("")) {
|
||||
if let Err(e) = AuthGuard::extract_token(&req) {
|
||||
return HttpResponse::Unauthorized().json(json!({
|
||||
"error": e.to_string()
|
||||
}));
|
||||
@@ -46,7 +46,7 @@ pub async fn get_entity_version(
|
||||
path: web::Path<(String, i32)>,
|
||||
pool: web::Data<PgPool>,
|
||||
) -> HttpResponse {
|
||||
if let Err(e) = AuthGuard::extract_token(req.headers().get("Authorization").and_then(|v| v.to_str().ok()).unwrap_or("")) {
|
||||
if let Err(e) = AuthGuard::extract_token(&req) {
|
||||
return HttpResponse::Unauthorized().json(json!({
|
||||
"error": e.to_string()
|
||||
}));
|
||||
@@ -80,7 +80,7 @@ pub async fn get_entity_diff(
|
||||
query: web::Query<DiffQuery>,
|
||||
pool: web::Data<PgPool>,
|
||||
) -> HttpResponse {
|
||||
if let Err(e) = AuthGuard::extract_token(req.headers().get("Authorization").and_then(|v| v.to_str().ok()).unwrap_or("")) {
|
||||
if let Err(e) = AuthGuard::extract_token(&req) {
|
||||
return HttpResponse::Unauthorized().json(json!({
|
||||
"error": e.to_string()
|
||||
}));
|
||||
@@ -120,7 +120,7 @@ pub async fn get_entity_at_time(
|
||||
query: web::Query<TimeQuery>,
|
||||
pool: web::Data<PgPool>,
|
||||
) -> HttpResponse {
|
||||
if let Err(e) = AuthGuard::extract_token(req.headers().get("Authorization").and_then(|v| v.to_str().ok()).unwrap_or("")) {
|
||||
if let Err(e) = AuthGuard::extract_token(&req) {
|
||||
return HttpResponse::Unauthorized().json(json!({
|
||||
"error": e.to_string()
|
||||
}));
|
||||
@@ -164,7 +164,7 @@ pub async fn get_edge_versions(
|
||||
path: web::Path<Uuid>,
|
||||
pool: web::Data<PgPool>,
|
||||
) -> HttpResponse {
|
||||
if let Err(e) = AuthGuard::extract_token(req.headers().get("Authorization").and_then(|v| v.to_str().ok()).unwrap_or("")) {
|
||||
if let Err(e) = AuthGuard::extract_token(&req) {
|
||||
return HttpResponse::Unauthorized().json(json!({
|
||||
"error": e.to_string()
|
||||
}));
|
||||
@@ -196,7 +196,7 @@ pub async fn get_edge_diff(
|
||||
query: web::Query<DiffQuery>,
|
||||
pool: web::Data<PgPool>,
|
||||
) -> HttpResponse {
|
||||
if let Err(e) = AuthGuard::extract_token(req.headers().get("Authorization").and_then(|v| v.to_str().ok()).unwrap_or("")) {
|
||||
if let Err(e) = AuthGuard::extract_token(&req) {
|
||||
return HttpResponse::Unauthorized().json(json!({
|
||||
"error": e.to_string()
|
||||
}));
|
||||
|
||||
@@ -145,15 +145,13 @@ pub async fn visualize_stream_handler(
|
||||
match execute_streaming_visualization(&state, req_body).await {
|
||||
Ok(events) => {
|
||||
for event in events {
|
||||
let data = format_sse_event(event);
|
||||
yield Ok::<actix_web::web::Bytes, actix_web::Error>(actix_web::web::Bytes::from(data));
|
||||
yield format_sse_event(event);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
let data = format_sse_event(VisualizeEvent::Error {
|
||||
yield format_sse_event(VisualizeEvent::Error {
|
||||
message: e,
|
||||
});
|
||||
yield Ok::<actix_web::web::Bytes, actix_web::Error>(actix_web::web::Bytes::from(data));
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -163,7 +161,7 @@ pub async fn visualize_stream_handler(
|
||||
.insert_header(("Cache-Control", "no-cache"))
|
||||
.insert_header(("Connection", "keep-alive"))
|
||||
.insert_header(("Transfer-Encoding", "chunked"))
|
||||
.streaming(Box::pin(stream))
|
||||
.streaming_body(Box::pin(stream))
|
||||
}
|
||||
|
||||
/// Execute streaming visualization (generates events)
|
||||
|
||||
@@ -19,11 +19,7 @@ use crate::gateway_queue_adapter::GatewayQueueAdapter;
|
||||
use crate::queue_worker::{QueueWorker, QueueWorkerConfig};
|
||||
use crate::queue_adapter::QueueAdapter;
|
||||
use crate::rbac::{AccessGuard, Claims as RbacClaims, builtin_role_provider, ResourceMeta, ResourceType, Verb, Visibility};
|
||||
use crate::handlers::{
|
||||
QueryParams, QueryParamsError, SearchMethod, build_search_response,
|
||||
LearnParams, LearnParamsError, build_learn_response,
|
||||
visualize_handler, visualize_stream_handler, compact_handler
|
||||
};
|
||||
use crate::handlers::{QueryParams, QueryParamsError, SearchMethod, build_search_response, LearnParams, LearnParamsError, build_learn_response};
|
||||
|
||||
/// Server state with database and workers
|
||||
pub struct AppState {
|
||||
@@ -50,29 +46,13 @@ pub struct AppState {
|
||||
pub enum AuthMode {
|
||||
Jwt, // Validate JWT from Authentik
|
||||
ApiKey, // Fallback to static API key
|
||||
None, // No auth (testing only)
|
||||
}
|
||||
|
||||
/// Auth extractor — validates JWT, apikey, or disabled
|
||||
/// Auth extractor — validates JWT or fallback to apikey
|
||||
async fn validate_auth(req: &HttpRequest, state: &AppState) -> Result<(JwtClaims, String), HttpResponse> {
|
||||
match state.auth_mode {
|
||||
AuthMode::Jwt => validate_jwt_token(req, state).await,
|
||||
AuthMode::ApiKey => validate_apikey(req, state),
|
||||
AuthMode::None => {
|
||||
tracing::warn!("Auth disabled - returning synthetic claims");
|
||||
let claims = JwtClaims {
|
||||
sub: "test-user".to_string(),
|
||||
iss: "test".to_string(),
|
||||
aud: "memory".to_string(),
|
||||
exp: i64::MAX,
|
||||
iat: chrono::Utc::now().timestamp(),
|
||||
nbf: None,
|
||||
permissions: Some(vec!["memory:write".to_string(), "memory:read".to_string()]),
|
||||
groups: Some(vec!["test".to_string()]),
|
||||
roles: None,
|
||||
};
|
||||
Ok((claims, "synthetic-token".to_string()))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -272,7 +252,6 @@ pub async fn start_server(port: u16, api_key: String, database_url: &str) -> Res
|
||||
let auth_mode = match auth_mode.as_str() {
|
||||
"jwt" => AuthMode::Jwt,
|
||||
"apikey" => AuthMode::ApiKey,
|
||||
"none" => AuthMode::None,
|
||||
_ => {
|
||||
tracing::warn!("Unknown auth mode: {}, defaulting to apikey", auth_mode);
|
||||
AuthMode::ApiKey
|
||||
|
||||
@@ -2,7 +2,6 @@ pub mod endpoints;
|
||||
pub mod handlers;
|
||||
pub mod http_server;
|
||||
pub mod query;
|
||||
pub mod auth;
|
||||
pub mod ingest_worker;
|
||||
pub mod query_worker;
|
||||
pub mod rate_limiter;
|
||||
@@ -31,7 +30,7 @@ pub mod federation;
|
||||
pub mod query_router;
|
||||
pub mod full_pipeline;
|
||||
pub mod authorized_pipeline;
|
||||
// pub mod ingest_with_persistence; // TODO: Fix db_repo integration
|
||||
pub mod ingest_with_persistence;
|
||||
pub mod auth_middleware;
|
||||
pub mod compaction;
|
||||
pub mod compaction_executor;
|
||||
@@ -39,7 +38,6 @@ pub mod agent;
|
||||
pub mod parallel_dual_write;
|
||||
|
||||
pub use endpoints::{IngestQueue, IngestRequest, JobStatus};
|
||||
pub use http_server::{AppState, AuthMode};
|
||||
pub use ingest_worker::IngestWorker;
|
||||
pub use query_worker::QueryWorker;
|
||||
pub use hybrid_retrieval::{HybridRetriever, RetrievalRoute, WikiScopedFilter, RankedCandidate};
|
||||
|
||||
@@ -116,13 +116,13 @@ impl ParallelDualWriteIndexer {
|
||||
|
||||
// Spawn background task (non-blocking)
|
||||
tokio::spawn(async move {
|
||||
let result = opensearch.index_document(
|
||||
let result = opensearch.index_chunk(
|
||||
&chunk_id,
|
||||
&chunk.content,
|
||||
&chunk.source,
|
||||
&chunk.project,
|
||||
&chunk.level,
|
||||
chunk.breadcrumb.clone(),
|
||||
"", // jwt_token - not available in background task
|
||||
&chunk.breadcrumb.join(" > "),
|
||||
).await;
|
||||
|
||||
match result {
|
||||
@@ -139,8 +139,8 @@ impl ParallelDualWriteIndexer {
|
||||
&self,
|
||||
chunks: Vec<(&IndexableChunk, Vec<f32>)>,
|
||||
) -> Vec<DualWriteResult> {
|
||||
let futures = chunks.into_iter().map(|(chunk, embedding)| async move {
|
||||
self.index_parallel(chunk, &embedding).await
|
||||
let futures = chunks.into_iter().map(|(chunk, embedding)| {
|
||||
self.index_parallel(chunk, &embedding)
|
||||
});
|
||||
|
||||
futures::future::join_all(futures)
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
use std::collections::{HashMap, VecDeque};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use chrono::{DateTime, Utc};
|
||||
use sqlx::{Pool, Postgres, Row};
|
||||
use sqlx::{Pool, Postgres};
|
||||
|
||||
/// A node in the traversal result
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
@@ -196,7 +196,6 @@ impl BfsGraphTraversal {
|
||||
});
|
||||
}
|
||||
|
||||
let edge_count = edges.len();
|
||||
Ok(GraphData {
|
||||
nodes,
|
||||
edges,
|
||||
@@ -204,7 +203,7 @@ impl BfsGraphTraversal {
|
||||
requested_depth: config.max_depth,
|
||||
max_depth_reached: max_depth,
|
||||
node_count: visited.len(),
|
||||
edge_count,
|
||||
edge_count: edges.len(),
|
||||
depth_breakdown,
|
||||
traversal_time_ms: start_time.elapsed().as_millis() as u64,
|
||||
})
|
||||
|
||||
@@ -185,9 +185,9 @@ impl CommunityDetector {
|
||||
|
||||
communities_vec.push(Community {
|
||||
id: comm_id,
|
||||
size: members.len(),
|
||||
entity_ids: members.into_iter().collect(),
|
||||
entity_names,
|
||||
size: members.len(),
|
||||
modularity_contribution: modularity_contrib,
|
||||
average_strength: strength,
|
||||
density,
|
||||
@@ -196,9 +196,9 @@ impl CommunityDetector {
|
||||
}
|
||||
|
||||
// 5. Calculate total modularity
|
||||
let total_modularity: f64 = communities_vec
|
||||
let total_modularity = communities_vec
|
||||
.iter()
|
||||
.map(|c| c.modularity_contribution as f64)
|
||||
.map(|c| c.modularity_contribution)
|
||||
.sum();
|
||||
|
||||
let average_community_size = if communities_vec.is_empty() {
|
||||
@@ -210,9 +210,9 @@ impl CommunityDetector {
|
||||
let result = CommunityDetectionResult {
|
||||
entity_count: entities.len(),
|
||||
edge_count: edges.len(),
|
||||
community_count: communities_vec.len(),
|
||||
communities: communities_vec,
|
||||
total_modularity: total_modularity.max(-1.0).min(1.0) as f32,
|
||||
community_count: communities_vec.len(),
|
||||
total_modularity: total_modularity.max(-1.0).min(1.0),
|
||||
average_community_size,
|
||||
};
|
||||
|
||||
|
||||
@@ -202,10 +202,10 @@ impl CommunityMetricsCalculator {
|
||||
}
|
||||
|
||||
/// Rank communities by metric
|
||||
pub fn rank_by_metric<'a>(
|
||||
metrics: &'a [CommunityMetrics],
|
||||
pub fn rank_by_metric(
|
||||
metrics: &[CommunityMetrics],
|
||||
metric: &str,
|
||||
) -> Vec<&'a CommunityMetrics> {
|
||||
) -> Vec<&CommunityMetrics> {
|
||||
let mut sorted = metrics.iter().collect::<Vec<_>>();
|
||||
|
||||
match metric {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
//! Enables multi-dimensional filtering across entities and edges.
|
||||
//! Supports entity types, relation types, date ranges, confidence levels, and more.
|
||||
|
||||
use chrono::{DateTime, Timelike, Utc};
|
||||
use chrono::{DateTime, Utc};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sqlx::{Pool, Postgres};
|
||||
use std::collections::HashMap;
|
||||
@@ -42,7 +42,7 @@ pub struct AvailableFacets {
|
||||
}
|
||||
|
||||
/// Facet filters for a query
|
||||
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
|
||||
#[derive(Debug, Clone, Default, Deserialize)]
|
||||
pub struct FacetFilters {
|
||||
/// Filter by entity types (OR within facet, AND across facets)
|
||||
pub entity_types: Option<Vec<String>>,
|
||||
|
||||
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
|
||||
use super::bfs_graph_traversal::{GraphData, TraversalNode, TraversalEdge};
|
||||
|
||||
/// 2D position (X, Y coordinates)
|
||||
#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]
|
||||
#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
|
||||
pub struct Position {
|
||||
pub x: f32,
|
||||
pub y: f32,
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
//! confidence propagation through reasoning chains.
|
||||
|
||||
use std::collections::{HashMap, HashSet, VecDeque};
|
||||
use std::pin::Pin;
|
||||
use std::future::Future;
|
||||
use sqlx::PgPool;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tracing::{debug, warn};
|
||||
@@ -295,19 +293,18 @@ impl InferenceEngine {
|
||||
}
|
||||
|
||||
/// DFS to find all paths
|
||||
fn dfs_paths<'a>(
|
||||
&'a self,
|
||||
current: &'a str,
|
||||
target: &'a str,
|
||||
project_id: &'a str,
|
||||
async fn dfs_paths(
|
||||
&self,
|
||||
current: &str,
|
||||
target: &str,
|
||||
project_id: &str,
|
||||
remaining_hops: usize,
|
||||
path: &'a mut Vec<String>,
|
||||
relations: &'a mut Vec<String>,
|
||||
confidences: &'a mut Vec<f32>,
|
||||
visited: &'a mut HashSet<String>,
|
||||
results: &'a mut Vec<ReasoningPath>,
|
||||
) -> Pin<Box<dyn Future<Output = Result<(), String>> + Send + 'a>> {
|
||||
Box::pin(async move {
|
||||
path: &mut Vec<String>,
|
||||
relations: &mut Vec<String>,
|
||||
confidences: &mut Vec<f32>,
|
||||
visited: &mut HashSet<String>,
|
||||
results: &mut Vec<ReasoningPath>,
|
||||
) -> Result<(), String> {
|
||||
if remaining_hops == 0 {
|
||||
return Ok(());
|
||||
}
|
||||
@@ -353,7 +350,6 @@ impl InferenceEngine {
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}) // Box::pin
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sqlx::{Pool, Postgres};
|
||||
use std::collections::{HashMap, HashSet, VecDeque};
|
||||
use std::pin::Pin;
|
||||
use std::future::Future;
|
||||
use tracing::{debug, info};
|
||||
|
||||
/// A single path through the graph
|
||||
@@ -125,14 +123,13 @@ impl PathFinder {
|
||||
info!("Found shortest path: {} → {} (distance: {})",
|
||||
source_id, target_id, final_entities.len() - 1);
|
||||
|
||||
let distance = final_entities.len() - 1;
|
||||
return Ok(Some(Path {
|
||||
source_id: source_id.to_string(),
|
||||
target_id: target_id.to_string(),
|
||||
entity_ids: final_entities,
|
||||
entity_names: vec![], // Could fetch from DB if needed
|
||||
relation_types: final_relations,
|
||||
distance,
|
||||
distance: final_entities.len() - 1,
|
||||
total_confidence: final_confidence.max(0.0).min(1.0),
|
||||
}));
|
||||
}
|
||||
@@ -296,20 +293,19 @@ impl PathFinder {
|
||||
}
|
||||
|
||||
/// DFS helper for finding all paths
|
||||
fn dfs_paths<'a>(
|
||||
&'a self,
|
||||
source_id: &'a str,
|
||||
target_id: &'a str,
|
||||
async fn dfs_paths(
|
||||
&self,
|
||||
source_id: &str,
|
||||
target_id: &str,
|
||||
current_path: Vec<String>,
|
||||
relations_path: Vec<String>,
|
||||
confidence: f32,
|
||||
depth: usize,
|
||||
max_depth: usize,
|
||||
paths_found: &'a mut Vec<Path>,
|
||||
visited: &'a mut HashSet<String>,
|
||||
paths_found: &mut Vec<Path>,
|
||||
visited: &mut HashSet<String>,
|
||||
max_paths: usize,
|
||||
) -> Pin<Box<dyn Future<Output = Result<(), String>> + Send + 'a>> {
|
||||
Box::pin(async move {
|
||||
) -> Result<(), String> {
|
||||
if paths_found.len() >= max_paths {
|
||||
return Ok(()); // Found enough paths
|
||||
}
|
||||
@@ -332,14 +328,13 @@ impl PathFinder {
|
||||
|
||||
let final_confidence = confidence * edge.confidence;
|
||||
|
||||
let distance = final_path.len() - 1;
|
||||
paths_found.push(Path {
|
||||
source_id: source_id.to_string(),
|
||||
target_id: target_id.to_string(),
|
||||
entity_ids: final_path,
|
||||
entity_names: vec![],
|
||||
relation_types: final_relations,
|
||||
distance,
|
||||
distance: final_path.len() - 1,
|
||||
total_confidence: final_confidence.max(0.0).min(1.0),
|
||||
});
|
||||
|
||||
@@ -375,7 +370,6 @@ impl PathFinder {
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}) // Box::pin
|
||||
}
|
||||
|
||||
/// Fetch direct neighbors of an entity
|
||||
|
||||
@@ -138,7 +138,7 @@ impl SemanticRetriever {
|
||||
.await
|
||||
.map_err(|e| format!("Database error: {}", e))?;
|
||||
|
||||
let entities: Vec<_> = results
|
||||
let entities = results
|
||||
.into_iter()
|
||||
.map(|(id, name, entity_type, score, metadata)| EntityResult {
|
||||
id,
|
||||
@@ -213,7 +213,7 @@ impl SemanticRetriever {
|
||||
.await
|
||||
.map_err(|e| format!("Database error: {}", e))?;
|
||||
|
||||
let edges: Vec<_> = results
|
||||
let edges = results
|
||||
.into_iter()
|
||||
.map(|(id, src_id, tgt_id, src_name, tgt_name, rel_type, fact, score, conf)| {
|
||||
EdgeResult {
|
||||
|
||||
@@ -261,7 +261,7 @@ impl Summarizer {
|
||||
}
|
||||
|
||||
/// Split text into sentences
|
||||
fn split_sentences<'a>(&self, text: &'a str) -> Vec<&'a str> {
|
||||
fn split_sentences(&self, text: &str) -> Vec<&str> {
|
||||
text.split('.').map(|s| s.trim()).filter(|s| !s.is_empty()).collect()
|
||||
}
|
||||
|
||||
@@ -331,7 +331,7 @@ impl Summarizer {
|
||||
|
||||
let overlap = entities1
|
||||
.iter()
|
||||
.filter(|e| entities2.contains(*e))
|
||||
.filter(|e| entities2.contains(e))
|
||||
.count();
|
||||
coherence += overlap as f32 / (entities1.len().max(entities2.len()) as f32).max(1.0);
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ impl QueryRouter {
|
||||
let latency_ms = start.elapsed().as_millis() as u64;
|
||||
|
||||
// Phase 8: Answer Validation (confidence scoring)
|
||||
use crate::query::answer_validator::{AnswerValidator, AnswerValidationConfig, ConfidenceSignals};
|
||||
use crate::answer_validator::{AnswerValidator, AnswerValidationConfig, ConfidenceSignals};
|
||||
let validator = AnswerValidator::new(AnswerValidationConfig::default());
|
||||
let avg_score = selected_chunks.iter().map(|c| c.final_score).sum::<f32>()
|
||||
/ (selected_chunks.len() as f32).max(1.0);
|
||||
@@ -245,8 +245,6 @@ impl QueryRouter {
|
||||
prefilter_size,
|
||||
metrics,
|
||||
latency_ms,
|
||||
confidence_score: 1.0,
|
||||
is_valid: true,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Generated
-52
@@ -1,52 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n SELECT \n version_num,\n operation,\n snapshot,\n changed_at,\n changed_by,\n COALESCE(fields_changed, '{}') as \"fields_changed!\"\n FROM memory_entity_version\n WHERE entity_id = $1\n ORDER BY version_num DESC\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "version_num",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "operation",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "snapshot",
|
||||
"type_info": "Jsonb"
|
||||
},
|
||||
{
|
||||
"ordinal": 3,
|
||||
"name": "changed_at",
|
||||
"type_info": "Timestamptz"
|
||||
},
|
||||
{
|
||||
"ordinal": 4,
|
||||
"name": "changed_by",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 5,
|
||||
"name": "fields_changed!",
|
||||
"type_info": "TextArray"
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Text"
|
||||
]
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
null
|
||||
]
|
||||
},
|
||||
"hash": "1e81bb729531ca33e4cef21623bcfe4fafb0c1bd435353b205f582bfda8873bc"
|
||||
}
|
||||
Generated
-52
@@ -1,52 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n SELECT \n version_num,\n operation,\n snapshot,\n changed_at,\n changed_by,\n COALESCE(fields_changed, '{}') as \"fields_changed!\"\n FROM memory_edge_version\n WHERE edge_id = $1\n ORDER BY version_num DESC\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "version_num",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "operation",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "snapshot",
|
||||
"type_info": "Jsonb"
|
||||
},
|
||||
{
|
||||
"ordinal": 3,
|
||||
"name": "changed_at",
|
||||
"type_info": "Timestamptz"
|
||||
},
|
||||
{
|
||||
"ordinal": 4,
|
||||
"name": "changed_by",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 5,
|
||||
"name": "fields_changed!",
|
||||
"type_info": "TextArray"
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Uuid"
|
||||
]
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
null
|
||||
]
|
||||
},
|
||||
"hash": "62d65d4afc4d292b37de8e5cb59fbd51c602bdc1b437988f54e6c7fe268b9816"
|
||||
}
|
||||
Generated
-53
@@ -1,53 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n SELECT \n version_num,\n operation,\n snapshot,\n changed_at,\n changed_by,\n COALESCE(fields_changed, '{}') as \"fields_changed!\"\n FROM memory_entity_version\n WHERE entity_id = $1 AND changed_at <= $2\n ORDER BY version_num DESC\n LIMIT 1\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "version_num",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "operation",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "snapshot",
|
||||
"type_info": "Jsonb"
|
||||
},
|
||||
{
|
||||
"ordinal": 3,
|
||||
"name": "changed_at",
|
||||
"type_info": "Timestamptz"
|
||||
},
|
||||
{
|
||||
"ordinal": 4,
|
||||
"name": "changed_by",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 5,
|
||||
"name": "fields_changed!",
|
||||
"type_info": "TextArray"
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Text",
|
||||
"Timestamptz"
|
||||
]
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
null
|
||||
]
|
||||
},
|
||||
"hash": "aee5900f5e3d7cbba23729bbf2dd033dcc4cb41f6c851bf447a9238810684d18"
|
||||
}
|
||||
Generated
-53
@@ -1,53 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n SELECT \n version_num,\n operation,\n snapshot,\n changed_at,\n changed_by,\n COALESCE(fields_changed, '{}') as \"fields_changed!\"\n FROM memory_entity_version\n WHERE entity_id = $1 AND version_num = $2\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "version_num",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "operation",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "snapshot",
|
||||
"type_info": "Jsonb"
|
||||
},
|
||||
{
|
||||
"ordinal": 3,
|
||||
"name": "changed_at",
|
||||
"type_info": "Timestamptz"
|
||||
},
|
||||
{
|
||||
"ordinal": 4,
|
||||
"name": "changed_by",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 5,
|
||||
"name": "fields_changed!",
|
||||
"type_info": "TextArray"
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Text",
|
||||
"Int4"
|
||||
]
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
null
|
||||
]
|
||||
},
|
||||
"hash": "c045466e1fe037dbdafea1008f262f4e48f104ea77732aa1d32ecb797f70e71d"
|
||||
}
|
||||
Generated
-53
@@ -1,53 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n SELECT \n version_num,\n operation,\n snapshot,\n changed_at,\n changed_by,\n COALESCE(fields_changed, '{}') as \"fields_changed!\"\n FROM memory_edge_version\n WHERE edge_id = $1 AND version_num = $2\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "version_num",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "operation",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "snapshot",
|
||||
"type_info": "Jsonb"
|
||||
},
|
||||
{
|
||||
"ordinal": 3,
|
||||
"name": "changed_at",
|
||||
"type_info": "Timestamptz"
|
||||
},
|
||||
{
|
||||
"ordinal": 4,
|
||||
"name": "changed_by",
|
||||
"type_info": "Varchar"
|
||||
},
|
||||
{
|
||||
"ordinal": 5,
|
||||
"name": "fields_changed!",
|
||||
"type_info": "TextArray"
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Uuid",
|
||||
"Int4"
|
||||
]
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
null
|
||||
]
|
||||
},
|
||||
"hash": "ca6872495bc04c6a65531279af8c758637c902dda2cc10366662988c6973ca48"
|
||||
}
|
||||
@@ -6,10 +6,8 @@
|
||||
use sqlx::{Pool, Postgres, Row, Transaction, Error as SqlxError};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use chrono::{DateTime, Utc};
|
||||
use mem_core::entity::Entity;
|
||||
use mem_core::edge::Edge;
|
||||
use crate::entity_repo::EntityRepoOps;
|
||||
use crate::edge_repo::EdgeRepoOps;
|
||||
use crate::entity_repo::{Entity, EntityRepo};
|
||||
use crate::edge_repo::{Edge, EdgeRepo};
|
||||
|
||||
/// Database connection error types
|
||||
#[derive(Debug, Clone)]
|
||||
|
||||
@@ -8,7 +8,6 @@ pub mod edge_repo;
|
||||
pub mod community_repo;
|
||||
pub mod versioning;
|
||||
pub mod audit_logger;
|
||||
// pub mod db_repo; // TODO: Fix Entity schema integration
|
||||
|
||||
pub use event_log::{EventRecord, LogWriter};
|
||||
pub use pgvector::{VectorRecord, VectorStore, ChunkL0, MemoryL1, MemoryL2};
|
||||
|
||||
@@ -111,28 +111,28 @@ impl EntityVersioningService {
|
||||
let mut modified = Vec::new();
|
||||
|
||||
// Check removed and modified
|
||||
if let Some(ref from) = from_obj {
|
||||
if let Some(from) = from_obj {
|
||||
for (key, from_val) in from {
|
||||
if let Some(to) = &to_obj {
|
||||
if let Some(to_val) = to.get(key) {
|
||||
if from_val != to_val {
|
||||
if let Some(to_val) = to.get(&key) {
|
||||
if from_val != *to_val {
|
||||
modified.push(DiffField {
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
name: key,
|
||||
from_value: Some(from_val),
|
||||
to_value: Some(to_val.clone()),
|
||||
});
|
||||
}
|
||||
} else {
|
||||
removed.push(DiffField {
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
name: key,
|
||||
from_value: Some(from_val),
|
||||
to_value: None,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
removed.push(DiffField {
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
name: key,
|
||||
from_value: Some(from_val),
|
||||
to_value: None,
|
||||
});
|
||||
}
|
||||
@@ -301,28 +301,28 @@ fn compute_diff(
|
||||
let mut removed = Vec::new();
|
||||
let mut modified = Vec::new();
|
||||
|
||||
if let Some(ref from) = from_obj {
|
||||
if let Some(from) = from_obj {
|
||||
for (key, from_val) in from {
|
||||
if let Some(to) = &to_obj {
|
||||
if let Some(to_val) = to.get(key) {
|
||||
if from_val != to_val {
|
||||
if let Some(to_val) = to.get(&key) {
|
||||
if from_val != *to_val {
|
||||
modified.push(DiffField {
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
name: key,
|
||||
from_value: Some(from_val),
|
||||
to_value: Some(to_val.clone()),
|
||||
});
|
||||
}
|
||||
} else {
|
||||
removed.push(DiffField {
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
name: key,
|
||||
from_value: Some(from_val),
|
||||
to_value: None,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
removed.push(DiffField {
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
name: key,
|
||||
from_value: Some(from_val),
|
||||
to_value: None,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
apiVersion: ENC[AES256_GCM,data:TZY=,iv:sKXTsB2VO5ZAL6s/xzqcIgwtlNqk0xxOclb6ErYz02Q=,tag:yfK6Ax8mHaYZQVImcrsLcA==,type:str]
|
||||
kind: ENC[AES256_GCM,data:Xr4rR7y/,iv:edAtbejU0PElYRZyAntlyuj5WnGf+Eksr+c636ovMc8=,tag:Hwv1higF27NzOTk/8EawYw==,type:str]
|
||||
metadata:
|
||||
name: ENC[AES256_GCM,data:Oe7W0UZxilfIUCIJRM4xP2sR,iv:w1NOlc20m8NX/WRT4JhXZ1MWjY0sFQa8ZJDeXemrL2M=,tag:cJ5TV8nKYHQhtLEnQa2mwQ==,type:str]
|
||||
namespace: ENC[AES256_GCM,data:+4jnzJeY,iv:nfooi5BOr9Exx8r5m00HJRSnFYiSofV9/+heWjJNmww=,tag:TYoi+OJK6+1oe8SpyGeEEg==,type:str]
|
||||
labels:
|
||||
app.kubernetes.io/name: ENC[AES256_GCM,data:gxlL3o3C3mA9Th9OaQ==,iv:Hw4a9d9xAnX9MOdFkj3jf524I6wgBwPfoVYmXKUQgtU=,tag:9lTd7W1kx/Uv9E0MVMnclA==,type:str]
|
||||
app.kubernetes.io/component: ENC[AES256_GCM,data:4DePKA==,iv:6f1Pvu+vWI+VkF8YrlSAM7yMvSckHWk+lu3qeMAz/ew=,tag:krszM09nNTo0EMtLJGw6Ew==,type:str]
|
||||
type: ENC[AES256_GCM,data:Ri5WKSXq,iv:D1APSbaBiSL1FQS3eKQ2Jbl+BZ2EgKjIbpjh4TjRntU=,tag:rdCSkAFBkGn5qCmEZh6KxQ==,type:str]
|
||||
stringData:
|
||||
AUTHENTIK_ISSUER: ENC[AES256_GCM,data:LpLo+01McEw9gNwRqq06GgNXxi40QjmGXWKQfPBEw3rJ2vBaNyAbQv82vsFMdnrwUyTEulPsVvWHO9IS6fGip224UA==,iv:EUME2lcjH103kRgfktAnABT+HA5ckJ8FG/N8x/qKv5M=,tag:GhVZYiEFw8tSRUz/hxTROQ==,type:str]
|
||||
AUTHENTIK_AUDIENCE: ENC[AES256_GCM,data:vhI7n2TG,iv:Q2E3aE6dx6BMqGHBNrEpUFwdEecmP/ZetkOmx5b4RB8=,tag:y+Wj9riWxFbOV+C04CGoJQ==,type:str]
|
||||
JWT_CACHE_TTL_SECS: ENC[AES256_GCM,data:8ckJPw==,iv:/OL2ke9KSeUZHC2+wtqh7oNoU0YYlkxtbsXhjiCxLsk=,tag:LzPFyzFCXoaLs892/OKHCQ==,type:str]
|
||||
sops:
|
||||
age:
|
||||
- enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlSDFVZWdWZ0tVREV1UWVI
|
||||
YVJ5eVVZdGcwSzdjREkzbkFLTmpWZi9mRnc0CkJ2Ujh4ZWVLMjFUczIzVmYwWEo4
|
||||
eGpwZStvY1BYU1FHWEZDV1FhTE4zdWsKLS0tIDRJYmI5UzFVVFRCcCtUM1hYc3d3
|
||||
S29NczhTb044SzlVWVBlN2paL0hzSEEKo/Q48c7IxhII1QJIwNDgUp7fSnbe2KOa
|
||||
cnRlDnfN/6+6xTePnu+4uhmCJqHKprdpH/2RPrj51k4psgiOZdBi7w==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
recipient: age1e5fq3hwxy78psus2nfvmtmua36g0u3suk78ephw6246l974d2utsvn0hla
|
||||
lastmodified: "2026-09-08T05:17:56Z"
|
||||
mac: ENC[AES256_GCM,data:ug9mPSxKAr2ZAci0S2DeYRrmaeQJLeC9N4B6fVRjy+pSaul2tfa9v6trTgrCnEI+VCqQMcDtlUQmrBy6CHoxlcHn8inHXMj+56mVAmxv0riHiyQOwtiZGVm1xX5kKA/z2q9tyT13aSPcsoVeuX6BOuwNjHCdAegsSEbZhuzrP4c=,iv:b2XdpqSeZAwNmbtSMwysHlsfPUJJCAN8qScWEj/JF9c=,tag:d2R/sQCFzB7+P2GUJGnHCg==,type:str]
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.13.2
|
||||
@@ -1,23 +0,0 @@
|
||||
# Non-sensitive environment variables for poimen-memory
|
||||
# Change these without redeploying secrets.
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: poimen-memory-config
|
||||
namespace: poimen
|
||||
labels:
|
||||
app.kubernetes.io/name: poimen-memory
|
||||
app.kubernetes.io/component: config
|
||||
data:
|
||||
# Auth mode: jwt | apikey
|
||||
MEM_AUTH_MODE: "none"
|
||||
# Rate limiting
|
||||
MEM_RATE_LIMIT_INGEST: "100"
|
||||
MEM_RATE_LIMIT_QUERY: "1000"
|
||||
MEM_IDEMPOTENCY_TTL_SECS: "86400"
|
||||
# Embeddings
|
||||
MEM_EMBEDDING_BATCH_SIZE: "32"
|
||||
# OpenSearch
|
||||
OPENSEARCH_HOST: "opensearch.poimen.svc.cluster.local:9200"
|
||||
# Obsidian
|
||||
OBSIDIAN_URL: "http://obsidian-server.poimen.svc.cluster.local:8080"
|
||||
@@ -29,7 +29,7 @@ spec:
|
||||
type: RuntimeDefault
|
||||
containers:
|
||||
- name: memory
|
||||
image: forgejo.riotpiao.com/riotpiao-poimen/poimen-memory:latest
|
||||
image: forgejo.riotpiao.com/rock/poimen-memory:latest
|
||||
securityContext:
|
||||
allowPrivilegeEscalation: false
|
||||
readOnlyRootFilesystem: true
|
||||
@@ -66,16 +66,11 @@ spec:
|
||||
secretKeyRef:
|
||||
name: poimen-memory-secrets
|
||||
key: llm-api-key
|
||||
# Server config (from ConfigMap)
|
||||
# Server config
|
||||
- name: MEM_PORT
|
||||
value: "8080"
|
||||
- name: MEM_HOME
|
||||
value: "/tmp"
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: poimen-memory-config
|
||||
- secretRef:
|
||||
name: poimen-memory-auth
|
||||
args:
|
||||
- serve
|
||||
- --port
|
||||
|
||||
@@ -5,9 +5,6 @@ resources:
|
||||
# vault-pvc.yaml removed — memory service uses pgvector, not local storage
|
||||
- deployment.yaml
|
||||
- service.yaml
|
||||
- config.yaml
|
||||
- obsidian.yaml
|
||||
# Legacy secret managed separately
|
||||
# Secret managed separately (SealedSecret in homelab)
|
||||
# - secrets.yaml
|
||||
generators:
|
||||
- secret-generator.yaml
|
||||
|
||||
@@ -53,11 +53,11 @@ data:
|
||||
subject_key: "sub"
|
||||
|
||||
# JWKS endpoint from Authentik
|
||||
jwks_uri: "https://authentik.riotpiao.com/application/o/poimen/jwks/"
|
||||
jwks_uri: "https://authentik.riotpiao.com/application/o/poimen-memory/jwks/"
|
||||
jwks_refresh_interval_ms: 3600000 # 1 hour
|
||||
|
||||
# Issuer validation
|
||||
issuer: "https://authentik.riotpiao.com/application/o/poimen/"
|
||||
issuer: "https://authentik.riotpiao.com/application/o/poimen-memory/"
|
||||
audience: null
|
||||
|
||||
# Claims mapping
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
# KSOPS generator — ArgoCD decrypts auth.enc.yaml at sync time
|
||||
apiVersion: viaduct.ai/v1
|
||||
kind: ksops
|
||||
metadata:
|
||||
name: poimen-memory-auth-generator
|
||||
annotations:
|
||||
config.kubernetes.io/function: |
|
||||
exec:
|
||||
path: ksops
|
||||
files:
|
||||
- auth.enc.yaml
|
||||
Reference in New Issue
Block a user