Feature/simpler subpackages (#81)

* Back to simpler directory structure

* Bump version, update templates

trustgraph-core/scripts/chunker-recursive

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.chunking.recursive import run
+from trustgraph.chunking.recursive import run
 
 run()
 

trustgraph-core/scripts/chunker-token

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.chunking.token import run
+from trustgraph.chunking.token import run
 
 run()
 

trustgraph-core/scripts/de-query-milvus

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.query.doc_embeddings.milvus import run
+from trustgraph.query.doc_embeddings.milvus import run
 
 run()
 

trustgraph-core/scripts/de-query-qdrant

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.query.doc_embeddings.qdrant import run
+from trustgraph.query.doc_embeddings.qdrant import run
 
 run()
 

trustgraph-core/scripts/de-write-milvus

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.storage.doc_embeddings.milvus import run
+from trustgraph.storage.doc_embeddings.milvus import run
 
 run()
 

trustgraph-core/scripts/de-write-qdrant

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.storage.doc_embeddings.qdrant import run
+from trustgraph.storage.doc_embeddings.qdrant import run
 
 run()
 

trustgraph-core/scripts/document-rag

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.retrieval.document_rag import run
+from trustgraph.retrieval.document_rag import run
 
 run()
 

trustgraph-core/scripts/embeddings-ollama

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.embeddings.ollama import run
+from trustgraph.embeddings.ollama import run
 
 run()
 

trustgraph-core/scripts/embeddings-vectorize

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.embeddings.vectorize import run
+from trustgraph.embeddings.vectorize import run
 
 run()
 

trustgraph-core/scripts/ge-dump-parquet

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.dump.graph_embeddings.parquet import run
+from trustgraph.dump.graph_embeddings.parquet import run
 
 run()
 

trustgraph-core/scripts/ge-query-milvus

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.query.graph_embeddings.milvus import run
+from trustgraph.query.graph_embeddings.milvus import run
 
 run()
 

trustgraph-core/scripts/ge-query-qdrant

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.query.graph_embeddings.qdrant import run
+from trustgraph.query.graph_embeddings.qdrant import run
 
 run()
 

trustgraph-core/scripts/ge-write-milvus

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.storage.graph_embeddings.milvus import run
+from trustgraph.storage.graph_embeddings.milvus import run
 
 run()
 

trustgraph-core/scripts/ge-write-qdrant

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.storage.graph_embeddings.qdrant import run
+from trustgraph.storage.graph_embeddings.qdrant import run
 
 run()
 

trustgraph-core/scripts/graph-rag

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.retrieval.graph_rag import run
+from trustgraph.retrieval.graph_rag import run
 
 run()
 

trustgraph-core/scripts/graph-show

@@ -6,7 +6,7 @@ Connects to the graph query service and dumps all graph edges.
 
 import argparse
 import os
-from trustgraph.core.clients.triples_query_client import TriplesQueryClient
+from trustgraph.clients.triples_query_client import TriplesQueryClient
 
 default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://localhost:6650')
 

trustgraph-core/scripts/graph-to-turtle

@@ -6,7 +6,7 @@ Connects to the graph query service and dumps all graph edges.
 
 import argparse
 import os
-from trustgraph.core.clients.triples_query_client import TriplesQueryClient
+from trustgraph.clients.triples_query_client import TriplesQueryClient
 import rdflib
 import io
 import sys

trustgraph-core/scripts/kg-extract-definitions

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.extract.kg.definitions import run
+from trustgraph.extract.kg.definitions import run
 
 run()
 

trustgraph-core/scripts/kg-extract-relationships

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.extract.kg.relationships import run
+from trustgraph.extract.kg.relationships import run
 
 run()
 

trustgraph-core/scripts/kg-extract-topics

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.extract.kg.topics import run
+from trustgraph.extract.kg.topics import run
 
 run()
 

trustgraph-core/scripts/load-graph-embeddings

@@ -6,15 +6,15 @@ Loads Graph embeddings into TrustGraph processing.
 
 import pulsar
 from pulsar.schema import JsonSchema
-from trustgraph.core.schema import GraphEmbeddings, Value
-from trustgraph.core.schema import graph_embeddings_store_queue
+from trustgraph.schema import GraphEmbeddings, Value
+from trustgraph.schema import graph_embeddings_store_queue
 import argparse
 import os
 import time
 import pyarrow as pa
 import pyarrow.parquet as pq
 
-from trustgraph.core.log_level import LogLevel
+from trustgraph.log_level import LogLevel
 
 class Loader:
 

trustgraph-core/scripts/load-pdf

@@ -6,14 +6,14 @@ Loads a PDF document into TrustGraph processing.
 
 import pulsar
 from pulsar.schema import JsonSchema
-from trustgraph.core.schema import Document, Source, document_ingest_queue
+from trustgraph.schema import Document, Source, document_ingest_queue
 import base64
 import hashlib
 import argparse
 import os
 import time
 
-from trustgraph.core.log_level import LogLevel
+from trustgraph.log_level import LogLevel
 
 class Loader:
 

trustgraph-core/scripts/load-text

@@ -6,14 +6,14 @@ Loads a text document into TrustGraph processing.
 
 import pulsar
 from pulsar.schema import JsonSchema
-from trustgraph.core.schema import TextDocument, Source, text_ingest_queue
+from trustgraph.schema import TextDocument, Source, text_ingest_queue
 import base64
 import hashlib
 import argparse
 import os
 import time
 
-from trustgraph.core.log_level import LogLevel
+from trustgraph.log_level import LogLevel
 
 class Loader:
 

trustgraph-core/scripts/load-triples

@@ -6,15 +6,15 @@ Loads Graph embeddings into TrustGraph processing.
 
 import pulsar
 from pulsar.schema import JsonSchema
-from trustgraph.core.schema import Triple, Value
-from trustgraph.core.schema import triples_store_queue
+from trustgraph.schema import Triple, Value
+from trustgraph.schema import triples_store_queue
 import argparse
 import os
 import time
 import pyarrow as pa
 import pyarrow.parquet as pq
 
-from trustgraph.core.log_level import LogLevel
+from trustgraph.log_level import LogLevel
 
 class Loader:
 

trustgraph-core/scripts/metering

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.metering import run
+from trustgraph.metering import run
 
 run()

trustgraph-core/scripts/object-extract-row

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.extract.object.row import run
+from trustgraph.extract.object.row import run
 
 run()
 

trustgraph-core/scripts/oe-write-milvus

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.storage.object_embeddings.milvus import run
+from trustgraph.storage.object_embeddings.milvus import run
 
 run()
 

trustgraph-core/scripts/pdf-decoder

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.decoding.pdf import run
+from trustgraph.decoding.pdf import run
 
 run()
 

trustgraph-core/scripts/prompt-generic

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.model.prompt.generic import run
+from trustgraph.model.prompt.generic import run
 
 run()
 

trustgraph-core/scripts/prompt-template

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.model.prompt.template import run
+from trustgraph.model.prompt.template import run
 
 run()
 

trustgraph-core/scripts/query-document-rag

@@ -6,7 +6,7 @@ Uses the Document RAG service to answer a query
 
 import argparse
 import os
-from trustgraph.core.clients.document_rag_client import DocumentRagClient
+from trustgraph.clients.document_rag_client import DocumentRagClient
 
 default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://localhost:6650')
 

trustgraph-core/scripts/query-graph-rag

@@ -6,7 +6,7 @@ Uses the GraphRAG service to answer a query
 
 import argparse
 import os
-from trustgraph.core.clients.graph_rag_client import GraphRagClient
+from trustgraph.clients.graph_rag_client import GraphRagClient
 
 default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://localhost:6650')
 

trustgraph-core/scripts/rows-write-cassandra

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.storage.rows.cassandra import run
+from trustgraph.storage.rows.cassandra import run
 
 run()
 

trustgraph-core/scripts/run-processing

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.processing import run
+from trustgraph.processing import run
 
 run()
 

trustgraph-core/scripts/text-completion-azure

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.model.text_completion.azure import run
+from trustgraph.model.text_completion.azure import run
 
 run()
 

trustgraph-core/scripts/text-completion-bedrock

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.model.text_completion.bedrock import run
+from trustgraph.model.text_completion.bedrock import run
 
 run()
 

trustgraph-core/scripts/text-completion-claude

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.model.text_completion.claude import run
+from trustgraph.model.text_completion.claude import run
 
 run()
 

trustgraph-core/scripts/text-completion-cohere

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.model.text_completion.cohere import run
+from trustgraph.model.text_completion.cohere import run
 
 run()
 

trustgraph-core/scripts/text-completion-llamafile

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.model.text_completion.llamafile import run
+from trustgraph.model.text_completion.llamafile import run
 
 run()
 

trustgraph-core/scripts/text-completion-ollama

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.model.text_completion.ollama import run
+from trustgraph.model.text_completion.ollama import run
 
 run()
 

trustgraph-core/scripts/text-completion-openai

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.model.text_completion.openai import run
+from trustgraph.model.text_completion.openai import run
 
 run()
 

trustgraph-core/scripts/text-completion-vertexai

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.model.text_completion.vertexai import run
+from trustgraph.model.text_completion.vertexai import run
 
 run()
 

trustgraph-core/scripts/triples-dump-parquet

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.dump.triples.parquet import run
+from trustgraph.dump.triples.parquet import run
 
 run()
 

trustgraph-core/scripts/triples-query-cassandra

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.query.triples.cassandra import run
+from trustgraph.query.triples.cassandra import run
 
 run()
 

trustgraph-core/scripts/triples-query-neo4j

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.query.triples.neo4j import run
+from trustgraph.query.triples.neo4j import run
 
 run()
 

trustgraph-core/scripts/triples-write-cassandra

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.storage.triples.cassandra import run
+from trustgraph.storage.triples.cassandra import run
 
 run()
 

trustgraph-core/scripts/triples-write-neo4j

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from trustgraph.core.storage.triples.neo4j import run
+from trustgraph.storage.triples.neo4j import run
 
 run()