Fixed fastapi docs to get request body for execute endpoint.

execute endpoint changed to get request body with no type
and pass it ko function

Author: faridseifi

src/python_activator/api.py

@@ -1,8 +1,8 @@
 import os
 from pathlib import Path
+from typing import Any
 import uvicorn
-from fastapi import FastAPI, Header, HTTPException, Request
-from fastapi.openapi.docs import get_swagger_ui_html
+from fastapi import FastAPI, Header, HTTPException, Request,Body
 from python_activator.loader import load_packages
 from python_activator.installer import install_packages
 
@@ -11,30 +11,15 @@
 Knowledge_Objects = {}
 object_directory = ""  # used for location of knowledge objects
 
-
-@app.get("/docs", include_in_schema=False)
-async def custom_swagger_ui_html():
-    return get_swagger_ui_html(
-        openapi_url="/openapi.json",
-        title="API Documentation",
-        swagger_js_url="/static/swagger-ui-bundle.js",
-        swagger_css_url="/static/swagger-ui.css",
-    )
-
-
-@app.get("/openapi.json", include_in_schema=False)
-async def get_openapi():
-    return app.openapi()
-
-
 @app.get(
     "/",
     include_in_schema=False,
 )
 async def root(request: Request):
     return {
-        "endpoints": request.url.__str__() + "endpoints",
-        "execute": request.url.__str__() + "endpoints/{id}",
+        "endpoints" : request.url.__str__() + "endpoints",
+        "fastapi documentation" : request.url.__str__() + "docs",
+        "execute" : request.url.__str__() + "endpoints/{id}",
     }
 
 
@@ -55,10 +40,10 @@ async def endpoint_detail(endpoint_key: str):
 # endpoint to expose all packages
 @app.post("/endpoints/{endpoint_key:path}")
 async def execute_endpoint(
-    endpoint_key: str, request: Request, content_type: str = Header(...)
+    endpoint_key: str, body: Any = Body(...), content_type: str = Header(default="application/json")
 ):
     try:
-        result = await Knowledge_Objects[endpoint_key].execute(request)
+        result = await Knowledge_Objects[endpoint_key].execute(body)
         return result
     except KeyError as e:
         raise HTTPException(

src/python_activator/loader.py

@@ -17,12 +17,9 @@ def __init__(self, name, status, function=None, id="", url="", entry=""):
         self.url = url
         self.entry = entry
 
-    async def execute(self, request):
-        data = (
-            await request.json()
-        )  # if content_type == 'application/json': data = await request.json() else:   data="test"
+    async def execute(self, body):
         try:
-            return self.function(data)
+            return self.function(body)
         except TypeError as e:
             raise HTTPException(
                 status_code=422, 

tests/test_manifest.py

@@ -3,16 +3,16 @@
 import pathlib
 import zipfile
 from urllib.parse import urlparse
-
 import requests
 import urllib
-
-from python_activator.loader import load_packages
+from pathlib import Path
+from python_activator.loader import load_packages,get_uri
 
 
 def test_process_local_manifest():
     os.environ["MANIFEST_PATH"] = "/home/faridsei/dev/test/manifest/manifest.json"
-    load_packages("/home/faridsei/dev/test/pyshelf/")
+    os.environ["COLLECTION_PATH"] = "/home/faridsei/dev/test/pyshelf/"
+    load_packages()
     del os.environ["MANIFEST_PATH"]
 
     # Assert
@@ -23,15 +23,17 @@ def test_process_internet_manifest():
     os.environ[
         "MANIFEST_PATH"
     ] = "https://github.com/kgrid-objects/example-collection/releases/download/4.2.1/manifest.json"
-    load_packages("/home/faridsei/dev/test/pyshelf/")
+    os.environ["COLLECTION_PATH"] = "/home/faridsei/dev/test/pyshelf/"
+    load_packages()
     del os.environ["MANIFEST_PATH"]
 
     # Assert
     assert 1 == 1
 
 
 def test_process_no_manifest():
-    load_packages("/home/faridsei/dev/test/pyshelf/")
+    os.environ["COLLECTION_PATH"] = "/home/faridsei/dev/test/pyshelf/"
+    load_packages()
 
     # Assert
     assert 1 == 1
@@ -72,22 +74,27 @@ def test_using_uri_to_extract_zip():
     assert os.path.exists(destenation_path + "/python-multimime-v1.0")
 
 def test_get_uri():
-    test=get_uri("/home/faridsei/dev/test/manifest/python-multimime-v1.0.zip")
-    test=get_uri("https://github.com/kgrid-objects/example-collection/releases/download/4.2.1/python-multimime-v1.0.zip")
-    assert 1!=1
-    
+    uri=get_uri("/home/faridsei/dev/test/manifest/python-multimime-v1.0.zip")
+    assert uri #if any
+    uri=get_uri("https://github.com/kgrid-objects/example-collection/releases/download/4.2.1/python-multimime-v1.0.zip")
+    assert uri #if any
+
+def is_valid_uri(uri):
+    try:
+        result = urlparse(uri)
+        if result.scheme and result.netloc:
+            return True  # Valid URL
+        elif not result.scheme and not result.netloc:
+            # Check if it's a valid local file path
+            file_path = Path(result.path)
+            return file_path.is_absolute() and file_path.exists()
+        else:
+            return False  # Invalid URI
+    except:
+        return False  # Invalid URI
 # def test_formatting_dictionary_of_object_to_json():
 #    assert 1!=1
 
 
-def get_uri(path: str):
-    uri = path
-    if os.path.isabs(path):  # if a local path create the URI
-        uri = pathlib.Path(path).as_uri()  # adds file:// if local path
-    return uri
 
 
-def get_base_uri(uri):
-    parsed_uri = urlparse(uri)
-    base_uri = f"{parsed_uri.scheme}://{parsed_uri.netloc}"
-    return base_uri