Skip to content

fix(oracle): add project_id to conversation_items and resolve PR #576 feedback #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
key4ng merged 2 commits into from
Mar 3, 2026
Merged

fix(oracle): add project_id to conversation_items and resolve PR #576 feedback #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0187049
feat(sql): add GENERATIVE_AI_PROJECT_ID column and index to CONVERSAT…
key4ng Mar 3, 2026
d65d7b4
refactor(gateway): update schema config path handling and simplify ba…
key4ng Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion e2e_test/infra/gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import subprocess
from dataclasses import dataclass, field
from pathlib import Path
from typing import TYPE_CHECKING, Any

import httpx
Expand Down Expand Up @@ -305,10 +306,16 @@ def start(
]

if history_backend == "oracle-custom":
schema_config_path = (
Path(__file__).resolve().parents[2]
/ "scripts"
/ "oracle_flyway"
/ "schema-config.yaml"
)
mode_args.extend(
[
"--schema-config",
"scripts/oracle_flyway/schema-config.yaml",
str(schema_config_path),
]
)

Expand Down
19 changes: 5 additions & 14 deletions model_gateway/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,20 +1035,11 @@ impl CliArgs {

let schema = self.load_schema_config()?;

let oracle = if history_backend == HistoryBackend::Oracle {
Some(self.build_oracle_config(schema.clone())?)
} else {
None
};
let postgres = if history_backend == HistoryBackend::Postgres {
Some(self.build_postgres_config(schema.clone())?)
} else {
None
};
let redis = if history_backend == HistoryBackend::Redis {
Some(self.build_redis_config(schema)?)
} else {
None
let (oracle, postgres, redis) = match history_backend {
HistoryBackend::Oracle => (Some(self.build_oracle_config(schema)?), None, None),
HistoryBackend::Postgres => (None, Some(self.build_postgres_config(schema)?), None),
HistoryBackend::Redis => (None, None, Some(self.build_redis_config(schema)?)),
_ => (None, None, None),
};

let builder = RouterConfig::builder()
Expand Down
8 changes: 5 additions & 3 deletions scripts/ci_agentic_svc_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,11 @@ flyway_conn.close()
print("Flyway SQL files executed successfully")
PYEOF

echo "ATP_FLYWAY_USER=$FLYWAY_USER" >> "$GITHUB_ENV"
echo "ATP_FLYWAY_PASSWORD=$FLYWAY_PASS" >> "$GITHUB_ENV"
echo "ATP_FLYWAY_DSN=$oracle_dsn" >> "$GITHUB_ENV"
{
echo "ATP_FLYWAY_USER=$FLYWAY_USER"
echo "ATP_FLYWAY_PASSWORD=$FLYWAY_PASS"
echo "ATP_FLYWAY_DSN=$oracle_dsn"
} >> "$GITHUB_ENV"
Comment thread
key4ng marked this conversation as resolved.
Resolved
}

cmd_cleanup_oracle_flyway_user() {
Expand Down
2 changes: 2 additions & 0 deletions scripts/oracle_flyway/sql/V2__Create_v2_conversations_and_alter_responses.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ CREATE INDEX IDX_CONV_V2_STORE_ID ON CONVERSATIONS_V2 (CONVERSATION_STORE_ID);
------------------------------------------------------------
CREATE TABLE CONVERSATION_ITEMS (
ID VARCHAR2(255) NOT NULL,
GENERATIVE_AI_PROJECT_ID VARCHAR2(255),
RESPONSE_ID VARCHAR2(255),
ITEM_TYPE VARCHAR2(100),
ROLE VARCHAR2(50),
Expand All @@ -39,6 +40,7 @@ CREATE TABLE CONVERSATION_ITEMS (
CREATE INDEX IDX_CONV_ITEMS_EXPIRES_AT ON CONVERSATION_ITEMS (EXPIRES_AT);
CREATE INDEX IDX_CONV_ITEMS_RESPONSE_ID ON CONVERSATION_ITEMS (RESPONSE_ID);
CREATE INDEX IDX_CONV_ITEMS_ITEM_TYPE ON CONVERSATION_ITEMS (ITEM_TYPE);
CREATE INDEX IDX_CONV_ITEMS_PROJECT_ID ON CONVERSATION_ITEMS (GENERATIVE_AI_PROJECT_ID);

------------------------------------------------------------
-- 3. CONVERSATION_ITEM_LINKS
Expand Down
Loading