removing 1.4 from the endpoint URLs and references to TRAPI 1.4 that …

…aren't necessary

PLATER/plater-clustered-docker/main.sh

@@ -26,7 +26,7 @@ function heartbeat {
     echo "starting heartbeat logic... "
     if [[ ! -z "${AUTOMAT_HOST}" ]]; then
         echo "Checking Plater status..."
-        testEndpoint=${PLATER_SERVICE_ADDRESS}:${WEB_PORT}/1.4/meta_knowledge_graph
+        testEndpoint=${PLATER_SERVICE_ADDRESS}:${WEB_PORT}/meta_knowledge_graph
         response=$(curl --write-out %{http_code} --silent --output /dev/null ${testEndpoint})
         until [ $response = "200" ]; do
             response=$(curl --write-out %{http_code} --silent --output /dev/null ${testEndpoint})

PLATER/services/app_trapi.py

@@ -24,8 +24,8 @@
     config.get('logging_format'),
 )
 
-# Mount open api at /1.4/openapi.json
-APP_TRAPI_1_4 = FastAPI(openapi_url="/openapi.json", docs_url="/docs", root_path='/1.4')
+# Mount open api at /openapi.json
+APP_TRAPI = FastAPI(openapi_url="/openapi.json", docs_url="/docs", root_path='/')
 
 
 def get_meta_kg_response(graph_metadata_reader: GraphMetadata):
@@ -131,7 +131,7 @@ async def reasoner_api(
     return json_response
 
 
-APP_TRAPI_1_4.add_api_route(
+APP_TRAPI.add_api_route(
     "/meta_knowledge_graph",
     get_meta_knowledge_graph,
     methods=["GET"],
@@ -142,7 +142,7 @@ async def reasoner_api(
     tags=["trapi"]
 )
 
-APP_TRAPI_1_4.add_api_route(
+APP_TRAPI.add_api_route(
     "/sri_testing_data",
     get_sri_testing_data,
     methods=["GET"],
@@ -153,7 +153,7 @@ async def reasoner_api(
     tags=["trapi"]
 )
 
-APP_TRAPI_1_4.add_api_route(
+APP_TRAPI.add_api_route(
     "/query",
     reasoner_api,
     methods=["POST"],
@@ -164,15 +164,15 @@ async def reasoner_api(
     tags=["trapi"]
 )
 
-APP_TRAPI_1_4.openapi_schema = construct_open_api_schema(app=APP_TRAPI_1_4, trapi_version="1.4.0", prefix='/1.4')
+APP_TRAPI.openapi_schema = construct_open_api_schema(app=APP_TRAPI, trapi_version="1.5.0")
 
 # env var PROFILE_EVERYTHING=true could be used to turn on profiling / speedscope results for all http endpoints
 if config.get('PROFILER_ON', False) and (config.get('PROFILER_ON') not in ("false", "False")):
     from pyinstrument import Profiler
     from pyinstrument.renderers import SpeedscopeRenderer
     from fastapi.responses import HTMLResponse
 
-    @APP_TRAPI_1_4.middleware("http")
+    @APP_TRAPI.middleware("http")
     async def profile_request(request: Request, call_next):
         profiling = request.query_params.get("profile", "false")
         if profiling and profiling != "false":

PLATER/services/server.py

@@ -6,12 +6,12 @@
 from PLATER.services.config import config
 from PLATER.services.util.logutil import LoggingUtil
 from PLATER.services.app_common import APP_COMMON
-from PLATER.services.app_trapi import APP_TRAPI_1_4
+from PLATER.services.app_trapi import APP_TRAPI
 from PLATER.services.util.api_utils import construct_open_api_schema
 
 TITLE = config.get('PLATER_TITLE', 'Plater API')
 
-VERSION = os.environ.get('PLATER_VERSION', '1.4.0-2')
+VERSION = os.environ.get('PLATER_VERSION', '1.6.0')
 
 logger = LoggingUtil.init_logging(
     __name__,
@@ -21,13 +21,13 @@
 
 APP = FastAPI()
 
-# Mount 1.4 app at /1.4
-APP.mount('/1.4', APP_TRAPI_1_4, 'Trapi 1.4')
+# Mount TRAPI app at /
+APP.mount('/', APP_TRAPI, 'TRAPI')
 # Mount default app at /
 APP.mount('/', APP_COMMON, '')
 # Add all routes of each app for open api generation at /openapi.json
 # This will create an aggregate openapi spec.
-APP.include_router(APP_TRAPI_1_4.router, prefix='/1.4')
+APP.include_router(APP_TRAPI.router)
 APP.include_router(APP_COMMON.router)
 # Construct app /openapi.json # Note this is not to be registered on smart api . Instead /1.1/openapi.json
 # or /1.2/openapi.json should be used.

PLATER/services/util/api_utils.py

@@ -30,7 +30,7 @@ def get_bl_helper():
 
 def construct_open_api_schema(app, trapi_version, prefix=""):
     plater_title = config.get('PLATER_TITLE', 'Plater API')
-    plater_version = os.environ.get('PLATER_VERSION', '1.4.0-2')
+    plater_version = os.environ.get('PLATER_VERSION', '1.6.0')
     server_url = os.environ.get('PUBLIC_URL', '')
     if app.openapi_schema:
         return app.openapi_schema