Merge pull request #55 from isabelizimm/redirect-rsconnect

isabelizimm · web-flow · commit c050d495aae1 · 2022-06-03T13:08:29.000-04:00
fix Connect redirect and openapi path
diff --git a/vetiver/server.py b/vetiver/server.py
@@ -9,6 +9,7 @@
 import numpy as np
 from typing import Callable, Union, List
 
+from . import __version__
 from .vetiver_model import VetiverModel
 from .utils import _jupyter_nb
 
@@ -47,7 +48,15 @@ def _init_app(self):
 
         @app.get("/", include_in_schema=False)
         def docs_redirect():
-            return RedirectResponse("/__docs__")
+            
+            redirect = "__docs__"
+
+            return RedirectResponse(redirect)
+
+        if self.model.metadata.get("url") is not None:
+            @app.get("/pin-url")
+            def pin_url():
+                return repr(self.model.metadata.get("url"))
 
         @app.get("/ping", include_in_schema=True)
         async def ping():
@@ -93,7 +102,7 @@ async def rapidoc():
                         <script type="module" src="https://unpkg.com/rapidoc@9.1.3/dist/rapidoc-min.js"></script>
                         </script></head>
                         <body>
-                            <rapi-doc spec-url="{app.openapi_url}"
+                            <rapi-doc spec-url="{self.app.openapi_url[1:]}"
                             id="thedoc" render-style="read" schema-style="tree" 
                             show-components="true" show-info="true" show-header="true" 
                             allow-search="true"
@@ -169,9 +178,10 @@ def _custom_openapi(self):
             return self.app.openapi_schema
         openapi_schema = get_openapi(
             title=self.model.model_name + " model API",
-            version="0.1.3",
+            version= __version__,
             description=self.model.description,
             routes=self.app.routes,
+            servers=self.app.servers
         )
         openapi_schema["info"]["x-logo"] = {"url": "../docs/figures/logo.svg"}
         self.app.openapi_schema = openapi_schema
