From 67d69b5285d437577d30b487977672fcb0b48834 Mon Sep 17 00:00:00 2001 From: cybermaggedon Date: Fri, 6 Dec 2024 13:05:56 +0000 Subject: [PATCH] Fixed a problem with the packages, api/__init__.py appeared in both (#196) trustgraph-flow and trustgraph-base, moved the gateway stuff into a different directory. --- trustgraph-flow/scripts/api-gateway | 2 +- trustgraph-flow/trustgraph/api/__init__.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/__init__.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/__main__.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/agent.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/auth.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/dbpedia.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/embeddings.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/encyclopedia.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/endpoint.py | 0 .../trustgraph/{api => }/gateway/graph_embeddings_load.py | 0 .../trustgraph/{api => }/gateway/graph_embeddings_stream.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/graph_rag.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/internet_search.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/prompt.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/publisher.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/running.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/serialize.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/service.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/socket.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/subscriber.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/text_completion.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/triples_load.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/triples_query.py | 0 trustgraph-flow/trustgraph/{api => }/gateway/triples_stream.py | 0 25 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 trustgraph-flow/trustgraph/api/__init__.py rename trustgraph-flow/trustgraph/{api => }/gateway/__init__.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/__main__.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/agent.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/auth.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/dbpedia.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/embeddings.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/encyclopedia.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/endpoint.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/graph_embeddings_load.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/graph_embeddings_stream.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/graph_rag.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/internet_search.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/prompt.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/publisher.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/running.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/serialize.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/service.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/socket.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/subscriber.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/text_completion.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/triples_load.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/triples_query.py (100%) rename trustgraph-flow/trustgraph/{api => }/gateway/triples_stream.py (100%) diff --git a/trustgraph-flow/scripts/api-gateway b/trustgraph-flow/scripts/api-gateway index d28a5b8a..f7ba0fda 100755 --- a/trustgraph-flow/scripts/api-gateway +++ b/trustgraph-flow/scripts/api-gateway @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from trustgraph.api.gateway import run +from trustgraph.gateway import run run() diff --git a/trustgraph-flow/trustgraph/api/__init__.py b/trustgraph-flow/trustgraph/api/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/trustgraph-flow/trustgraph/api/gateway/__init__.py b/trustgraph-flow/trustgraph/gateway/__init__.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/__init__.py rename to trustgraph-flow/trustgraph/gateway/__init__.py diff --git a/trustgraph-flow/trustgraph/api/gateway/__main__.py b/trustgraph-flow/trustgraph/gateway/__main__.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/__main__.py rename to trustgraph-flow/trustgraph/gateway/__main__.py diff --git a/trustgraph-flow/trustgraph/api/gateway/agent.py b/trustgraph-flow/trustgraph/gateway/agent.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/agent.py rename to trustgraph-flow/trustgraph/gateway/agent.py diff --git a/trustgraph-flow/trustgraph/api/gateway/auth.py b/trustgraph-flow/trustgraph/gateway/auth.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/auth.py rename to trustgraph-flow/trustgraph/gateway/auth.py diff --git a/trustgraph-flow/trustgraph/api/gateway/dbpedia.py b/trustgraph-flow/trustgraph/gateway/dbpedia.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/dbpedia.py rename to trustgraph-flow/trustgraph/gateway/dbpedia.py diff --git a/trustgraph-flow/trustgraph/api/gateway/embeddings.py b/trustgraph-flow/trustgraph/gateway/embeddings.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/embeddings.py rename to trustgraph-flow/trustgraph/gateway/embeddings.py diff --git a/trustgraph-flow/trustgraph/api/gateway/encyclopedia.py b/trustgraph-flow/trustgraph/gateway/encyclopedia.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/encyclopedia.py rename to trustgraph-flow/trustgraph/gateway/encyclopedia.py diff --git a/trustgraph-flow/trustgraph/api/gateway/endpoint.py b/trustgraph-flow/trustgraph/gateway/endpoint.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/endpoint.py rename to trustgraph-flow/trustgraph/gateway/endpoint.py diff --git a/trustgraph-flow/trustgraph/api/gateway/graph_embeddings_load.py b/trustgraph-flow/trustgraph/gateway/graph_embeddings_load.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/graph_embeddings_load.py rename to trustgraph-flow/trustgraph/gateway/graph_embeddings_load.py diff --git a/trustgraph-flow/trustgraph/api/gateway/graph_embeddings_stream.py b/trustgraph-flow/trustgraph/gateway/graph_embeddings_stream.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/graph_embeddings_stream.py rename to trustgraph-flow/trustgraph/gateway/graph_embeddings_stream.py diff --git a/trustgraph-flow/trustgraph/api/gateway/graph_rag.py b/trustgraph-flow/trustgraph/gateway/graph_rag.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/graph_rag.py rename to trustgraph-flow/trustgraph/gateway/graph_rag.py diff --git a/trustgraph-flow/trustgraph/api/gateway/internet_search.py b/trustgraph-flow/trustgraph/gateway/internet_search.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/internet_search.py rename to trustgraph-flow/trustgraph/gateway/internet_search.py diff --git a/trustgraph-flow/trustgraph/api/gateway/prompt.py b/trustgraph-flow/trustgraph/gateway/prompt.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/prompt.py rename to trustgraph-flow/trustgraph/gateway/prompt.py diff --git a/trustgraph-flow/trustgraph/api/gateway/publisher.py b/trustgraph-flow/trustgraph/gateway/publisher.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/publisher.py rename to trustgraph-flow/trustgraph/gateway/publisher.py diff --git a/trustgraph-flow/trustgraph/api/gateway/running.py b/trustgraph-flow/trustgraph/gateway/running.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/running.py rename to trustgraph-flow/trustgraph/gateway/running.py diff --git a/trustgraph-flow/trustgraph/api/gateway/serialize.py b/trustgraph-flow/trustgraph/gateway/serialize.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/serialize.py rename to trustgraph-flow/trustgraph/gateway/serialize.py diff --git a/trustgraph-flow/trustgraph/api/gateway/service.py b/trustgraph-flow/trustgraph/gateway/service.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/service.py rename to trustgraph-flow/trustgraph/gateway/service.py diff --git a/trustgraph-flow/trustgraph/api/gateway/socket.py b/trustgraph-flow/trustgraph/gateway/socket.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/socket.py rename to trustgraph-flow/trustgraph/gateway/socket.py diff --git a/trustgraph-flow/trustgraph/api/gateway/subscriber.py b/trustgraph-flow/trustgraph/gateway/subscriber.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/subscriber.py rename to trustgraph-flow/trustgraph/gateway/subscriber.py diff --git a/trustgraph-flow/trustgraph/api/gateway/text_completion.py b/trustgraph-flow/trustgraph/gateway/text_completion.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/text_completion.py rename to trustgraph-flow/trustgraph/gateway/text_completion.py diff --git a/trustgraph-flow/trustgraph/api/gateway/triples_load.py b/trustgraph-flow/trustgraph/gateway/triples_load.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/triples_load.py rename to trustgraph-flow/trustgraph/gateway/triples_load.py diff --git a/trustgraph-flow/trustgraph/api/gateway/triples_query.py b/trustgraph-flow/trustgraph/gateway/triples_query.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/triples_query.py rename to trustgraph-flow/trustgraph/gateway/triples_query.py diff --git a/trustgraph-flow/trustgraph/api/gateway/triples_stream.py b/trustgraph-flow/trustgraph/gateway/triples_stream.py similarity index 100% rename from trustgraph-flow/trustgraph/api/gateway/triples_stream.py rename to trustgraph-flow/trustgraph/gateway/triples_stream.py