sunholo 0.104.0__tar.gz → 0.104.2__tar.gz

{sunholo-0.104.0 → sunholo-0.104.2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.104.0
+Version: 0.104.2
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Home-page: https://github.com/sunholo-data/sunholo-py
-Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.104.0.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.104.2.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -30,7 +30,6 @@ Requires-Dist: azure-identity; extra == "all"
 Requires-Dist: azure-storage-blob; extra == "all"
 Requires-Dist: fastapi; extra == "all"
 Requires-Dist: flask; extra == "all"
-Requires-Dist: flask-cors; extra == "all"
 Requires-Dist: google-auth; extra == "all"
 Requires-Dist: google-auth-httplib2; extra == "all"
 Requires-Dist: google-auth-oauthlib; extra == "all"
@@ -130,7 +129,6 @@ Requires-Dist: playwright; extra == "tools"
 Provides-Extra: http
 Requires-Dist: fastapi; extra == "http"
 Requires-Dist: flask; extra == "http"
-Requires-Dist: flask-cors; extra == "http"
 Requires-Dist: gunicorn; extra == "http"
 Requires-Dist: httpcore; extra == "http"
 Requires-Dist: httpx; extra == "http"

{sunholo-0.104.0 → sunholo-0.104.2}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.104.0'
+version = '0.104.2'
 
 setup(
     name='sunholo',
@@ -42,7 +42,6 @@ setup(
             "azure-storage-blob",
             "fastapi",
             "flask",
-            "flask-cors",
             "google-auth",
             "google-auth-httplib2",
             "google-auth-oauthlib",
@@ -152,7 +151,6 @@ setup(
         'http': [
             "fastapi",
             "flask",
-            "flask-cors",
             "gunicorn",
             "httpcore",
             "httpx",

{sunholo-0.104.0 → sunholo-0.104.2}/sunholo/agents/flask/base.py

@@ -13,20 +13,9 @@
 #   limitations under the License.
 def create_app(name):
     from flask import Flask
-    from flask_cors import CORS
-
+    
     app = Flask(name)
 
-    CORS(app, 
-         origins=["https://*.sunholo.com", "http://*.sunholo.com"],  # Allow all subdomains of sunholo.com
-         methods=["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],  # Allow all necessary HTTP methods
-         allow_headers=["DNT", "User-Agent", "X-Requested-With", "If-Modified-Since", 
-                        "Cache-Control", "Content-Type", "Range", "Authorization", "x-api-key"],  # Add custom headers
-         expose_headers=["Content-Length", "Content-Range"],  # Optional: headers that are exposed to clients
-         supports_credentials=True, 
-         max_age=1728000  # Set max age of preflight request caching (in seconds)
-    )
-
     app.config['TRAP_HTTP_EXCEPTIONS'] = True
     app.config['PROPAGATE_EXCEPTIONS'] = True
    

{sunholo-0.104.0 → sunholo-0.104.2}/sunholo/agents/flask/vac_routes.py

@@ -63,7 +63,7 @@ if __name__ == "__main__":
         self.vac_interpreter = vac_interpreter or partial(self.vac_interpreter_default)
         self.additional_routes = additional_routes if additional_routes is not None else []
         self.register_routes()
-
+        
 
     def vac_interpreter_default(self, question: str, vector_name: str, chat_history=[], **kwargs):
         # Create a callback that does nothing for streaming if you don't want intermediate outputs
@@ -103,6 +103,7 @@ if __name__ == "__main__":
 
         # Authentication middleware
         self.app.before_request(self.check_authentication)
+        self.app.after_request(self.register_after_request)
 
         # OpenAI health endpoint
         self.app.route('/openai/health', methods=['GET', 'POST'])(self.openai_health_endpoint)
@@ -110,9 +111,25 @@ if __name__ == "__main__":
         # OpenAI compatible endpoint
         self.app.route('/openai/v1/chat/completions', methods=['POST'])(self.handle_openai_compatible_endpoint)
         self.app.route('/openai/v1/chat/completions/<vector_name>', methods=['POST'])(self.handle_openai_compatible_endpoint)
-        # Register additional routes
+    
+        # Register OPTIONS handler for CORS
+        self.app.route('/<path:path>', methods=['OPTIONS'])(self.handle_options)
+        
         self.register_additional_routes()
 
+    def handle_options(self):
+        response = Response(status=200)
+        response.headers.add('Access-Control-Allow-Origin', '*')
+
+        # Reflect the request's `Access-Control-Request-Headers`
+        request_headers = request.headers.get('Access-Control-Request-Headers', '')
+        response.headers.add('Access-Control-Allow-Headers', request_headers)
+
+        # Specify allowed methods
+        response.headers.add('Access-Control-Allow-Methods', 'GET, POST, OPTIONS')
+        
+        return response
+
     def register_additional_routes(self):
         """
         Registers additional custom routes provided during initialization.
@@ -152,6 +169,21 @@ if __name__ == "__main__":
         for route in self.additional_routes:
             self.app.route(route["rule"], methods=route["methods"])(route["handler"])
 
+    def register_after_request(self, response):
+        """
+        Register after_request to add CORS headers.
+        """
+        log.debug(f'Request headers: {request.headers}')
+        # the header forwarded
+
+        response.headers.add('Access-Control-Allow-Origin', '*')
+        response.headers.add('Access-Control-Allow-Headers', 'Content-Type, Authorization, x-api-key')
+        response.headers.add('Access-Control-Allow-Methods', 'GET, POST, OPTIONS')
+
+        log.debug(f'Response headers: {response.headers}')
+
+        return response
+
     def home(self):
         return jsonify("OK")
 
@@ -385,7 +417,7 @@ if __name__ == "__main__":
             bot_output = {'answer': f'QNA_ERROR: An error occurred while processing /vac/{vector_name}: {str(err)} traceback: {traceback.format_exc()}'}
             if span:
                 gen.end(output=bot_output)
-                
+
         if trace:
             span.end(output=jsonify(bot_output))
             trace.update(output=jsonify(bot_output)) 

{sunholo-0.104.0 → sunholo-0.104.2}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.104.0
+Version: 0.104.2
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Home-page: https://github.com/sunholo-data/sunholo-py
-Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.104.0.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.104.2.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -30,7 +30,6 @@ Requires-Dist: azure-identity; extra == "all"
 Requires-Dist: azure-storage-blob; extra == "all"
 Requires-Dist: fastapi; extra == "all"
 Requires-Dist: flask; extra == "all"
-Requires-Dist: flask-cors; extra == "all"
 Requires-Dist: google-auth; extra == "all"
 Requires-Dist: google-auth-httplib2; extra == "all"
 Requires-Dist: google-auth-oauthlib; extra == "all"
@@ -130,7 +129,6 @@ Requires-Dist: playwright; extra == "tools"
 Provides-Extra: http
 Requires-Dist: fastapi; extra == "http"
 Requires-Dist: flask; extra == "http"
-Requires-Dist: flask-cors; extra == "http"
 Requires-Dist: gunicorn; extra == "http"
 Requires-Dist: httpcore; extra == "http"
 Requires-Dist: httpx; extra == "http"

{sunholo-0.104.0 → sunholo-0.104.2}/sunholo.egg-info/requires.txt

@@ -11,7 +11,6 @@ azure-identity
 azure-storage-blob
 fastapi
 flask
-flask-cors
 google-auth
 google-auth-httplib2
 google-auth-oauthlib
@@ -108,7 +107,6 @@ pillow
 [http]
 fastapi
 flask
-flask-cors
 gunicorn
 httpcore
 httpx