@@ -21,3 +21,5 @@ Globals:
             update: False
             list:
                 web: [globals,python_helper,Popen,Path,numpy,pywin32,sqlalchemy]
+        git:
+            force-upgrade-command: pip install --upgrade --force python_framework
@@ -2,17 +2,26 @@
 from python_helper import Constant as c
 from python_helper import StringHelper
 
-KW_OPEN_API = 'swagger'
+
+KW_UI = 'ui'
 KW_JSON = 'json'
+KW_API = 'api'
+KW_RESOURCE = 'resource'
+KW_OPEN_API = 'swagger'
 DOCUMENTATION_FILE = f'{KW_OPEN_API}{c.DOT}{KW_JSON}'
 
+def getDocumentationFolderPath(apiInstance):
+    globals = apiInstance.globals
+    return f'{globals.currentPath}{KW_API}{globals.OS_SEPARATOR}{KW_RESOURCE}{globals.OS_SEPARATOR}{KW_OPEN_API}{KW_UI}'
+    # return f'{apiInstance.documentationFolder}{g.OS_SEPARATOR}{DOCUMENTATION_FILE}'
+
 def getDocumentationFilePath(apiInstance):
     # return f'{g.apiPath}api{g.OS_SEPARATOR}resource{g.OS_SEPARATOR}swaggerui{g.OS_SEPARATOR}swagger.json'
-    return f'{apiInstance.documentationFolder}{g.OS_SEPARATOR}{DOCUMENTATION_FILE}'
+    return f'{getDocumentationFolderPath(apiInstance)}{globals.OS_SEPARATOR}{DOCUMENTATION_FILE}'
 
 def loadDocumentationAsString(apiInstance):
     documentationFilePath = getDocumentationFilePath(apiInstance)
-    with open(documentationFilePathapiInstance.documentationFolder, globals.READ, encoding=globals.ENCODING) as documentationFile :
+    with open(documentationFilePath, globals.READ, encoding=globals.ENCODING) as documentationFile :
         documentationAsString = c.NOTHING.join(documentationFile.readlines())
     return documentationAsString
 
 
@@ -6,10 +6,8 @@
 from python_framework.api.src.service.openapi.OpenApiKey import Key as k
 from python_framework.api.src.service.openapi.OpenApiValue import Value as v
 from python_framework.api.src.service.openapi import OpenApiDocumentationFile
-from python_framework.api.src.service.openapi.OpenApiDocumentationFile import KW_OPEN_API, KW_JSON, DOCUMENTATION_FILE
+from python_framework.api.src.service.openapi.OpenApiDocumentationFile import DOCUMENTATION_FILE, KW_OPEN_API
 
-KW_UI = 'ui'
-OPEN_API_URL = f'/{OpenApiDocumentationFile.KW_OPEN_API}'
 COLON_DOUBLE_BAR = '://'
 LOCAL_HOST = 'localhost'
 
@@ -49,8 +47,6 @@
 KW_HOST = 'host'
 KW_SCHEMES = 'schemes'
 
-KW_RESOURCE = 'resource'
-
 KW_URL_SET = '__URL_SET__'
 KW_DESCRIPTION_LIST = '__DESCRIPTION_LIST__'
 KW_CONTROLLER = '__CONTROLLER__'
@@ -61,13 +57,13 @@
 
 def addSwagger(apiInstance, appInstance):
     globals = apiInstance.globals
-    documentationUrl = f'{apiInstance.baseUrl}{OPEN_API_URL}'
+    documentationUrl = f'{apiInstance.baseUrl}{SLASH}{KW_OPEN_API}'
     swaggerUi = get_swaggerui_blueprint(
         documentationUrl,
         DOCUMENTATION_FILE
     )
-    # swaggerUi._static_folder = f'{globals.currentPath}{KW_API}{globals.OS_SEPARATOR}{KW_RESOURCE}{globals.OS_SEPARATOR}{KW_OPEN_API}{KW_UI}{globals.OS_SEPARATOR}'
-    appInstance.documentationFolder = swaggerUi._static_folder
+    swaggerUi._static_folder = f'{OpenApiDocumentationFile(apiInstance)}{globals.OS_SEPARATOR}'
+    # appInstance.documentationFolder = swaggerUi._static_folder
     appInstance.register_blueprint(swaggerUi, url_prefix=documentationUrl)
     OpenApiDocumentationFile.overrideDocumentation(apiInstance)
 
 
@@ -1,6 +1,6 @@
 from distutils.core import setup
 
-version = '0.0.1-16'
+version = '0.0.1-17'
 name = 'python_framework'
 url = f'https://github.com/SamuelJansen/{name}/'