Skip to content

armgit / Ix

Public Imported from GitHub
0

Understand any codebase instantly. System intelligence for codebases, built for humans and AI.

fix: restore ingestion routes and fix hardcoded docker volume path

Tanner Kocher706d402e6d1b
diff --git a/docker-compose.yml b/docker-compose.yml
index 3f0007d5..381180b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
ports:
- "8090:8090"
volumes:
- - /c/Users/josep:/c/Users/josep:ro
+ - ${HOME}:${HOME}:ro
environment:
ARANGO_HOST: arangodb
ARANGO_PORT: "8529"
diff --git a/memory-layer/src/main/scala/ix/memory/Main.scala b/memory-layer/src/main/scala/ix/memory/Main.scala
index 1643959a..11cd8b12 100644
--- a/memory-layer/src/main/scala/ix/memory/Main.scala
+++ b/memory-layer/src/main/scala/ix/memory/Main.scala
@@ -9,6 +9,7 @@ import ix.memory.api.Routes
import ix.memory.conflict.ConflictService
import ix.memory.context._
import ix.memory.db._
+import ix.memory.ingestion._
import ix.memory.map.MapService
object Main extends IOApp.Simple {
@@ -30,6 +31,10 @@ object Main extends IOApp.Simple {
queryApi = new ArangoGraphQueryApi(client)
// 3. Services
+ parserRouter = new ParserRouter()
+ ingestionService = new IngestionService(parserRouter, writeApi, queryApi)
+ bulkWriteApi = new BulkWriteApi(client)
+ bulkIngestionService = new BulkIngestionService(parserRouter, bulkWriteApi, queryApi)
seeder = new GraphSeeder(queryApi)
expander = new GraphExpander(queryApi)
claimCollector = new ClaimCollector(queryApi)
@@ -41,7 +46,7 @@ object Main extends IOApp.Simple {
mapService = new MapService(client, queryApi, writeApi)
// 4. HTTP routes
- routes = Routes.all(contextService, queryApi, writeApi, conflictService, client, mapService)
+ routes = Routes.all(contextService, ingestionService, bulkIngestionService, queryApi, writeApi, conflictService, client, mapService)
// 5. Server
server <- EmberServerBuilder
diff --git a/memory-layer/src/main/scala/ix/memory/api/Routes.scala b/memory-layer/src/main/scala/ix/memory/api/Routes.scala
index f97e5f3c..94ff863d 100644
--- a/memory-layer/src/main/scala/ix/memory/api/Routes.scala
+++ b/memory-layer/src/main/scala/ix/memory/api/Routes.scala
@@ -11,17 +11,20 @@ import org.http4s.dsl.io._
import ix.memory.conflict.ConflictService
import ix.memory.context.ContextService
import ix.memory.db.{ArangoClient, GraphQueryApi, GraphWriteApi}
+import ix.memory.ingestion.{BulkIngestionService, IngestionService}
import ix.memory.map.MapService
object Routes {
def all(
- contextService: ContextService,
- queryApi: GraphQueryApi,
- writeApi: GraphWriteApi,
- conflictService: ConflictService,
- client: ArangoClient,
- mapService: MapService
+ contextService: ContextService,
+ ingestionService: IngestionService,
+ bulkIngestionService: BulkIngestionService,
+ queryApi: GraphQueryApi,
+ writeApi: GraphWriteApi,
+ conflictService: ConflictService,
+ client: ArangoClient,
+ mapService: MapService
): HttpRoutes[IO] = {
val health = HttpRoutes.of[IO] {
@@ -30,6 +33,7 @@ object Routes {
}
val contextRoutes = new ContextRoutes(contextService).routes
+ val ingestionRoutes = new IngestionRoutes(ingestionService, bulkIngestionService).routes
val entityRoutes = new EntityRoutes(queryApi).routes
val diffRoutes = new DiffRoutes(queryApi).routes
val conflictRoutes = new ConflictRoutes(conflictService).routes
@@ -46,7 +50,7 @@ object Routes {
val mapRoutes = new MapRoutes(mapService).routes
val resetRoutes = new ResetRoutes(client).routes
- health <+> contextRoutes <+> entityRoutes <+>
+ health <+> contextRoutes <+> ingestionRoutes <+> entityRoutes <+>
diffRoutes <+> conflictRoutes <+> decideRoutes <+> searchRoutes <+>
truthRoutes <+> patchRoutes <+> decisionListRoutes <+> expandRoutes <+>
statsRoutes <+> patchCommitRoutes <+> listRoutes <+> goalRoutes <+>
diff --git a/memory-layer/src/test/scala/ix/memory/api/RoutesSpec.scala b/memory-layer/src/test/scala/ix/memory/api/RoutesSpec.scala
index 6953aead..4666464e 100644
--- a/memory-layer/src/test/scala/ix/memory/api/RoutesSpec.scala
+++ b/memory-layer/src/test/scala/ix/memory/api/RoutesSpec.scala
@@ -17,6 +17,8 @@ import ix.memory.TestDbHelper
import ix.memory.conflict.ConflictService
import ix.memory.context._
import ix.memory.db._
+import ix.memory.ingestion._
+import ix.memory.map.MapService
import ix.memory.model._
class RoutesSpec extends AsyncFlatSpec with AsyncIOSpec with Matchers with TestDbHelper {
@@ -61,8 +63,13 @@ class RoutesSpec extends AsyncFlatSpec with AsyncIOSpec with Matchers with TestD
new ConfidenceScorerImpl(),
new ConflictDetectorImpl()
)
+ val parserRouter = new ParserRouter()
+ val ingestionService = new IngestionService(parserRouter, writeApi, queryApi)
+ val bulkWriteApi = new BulkWriteApi(client)
+ val bulkIngestionService = new BulkIngestionService(parserRouter, bulkWriteApi, queryApi)
+ val mapService = new MapService(client, queryApi, writeApi)
- Routes.all(contextService, queryApi, writeApi, conflictService, client).orNotFound
+ Routes.all(contextService, ingestionService, bulkIngestionService, queryApi, writeApi, conflictService, client, mapService).orNotFound
}
"Routes" should "return 200 OK for health check" in {