sunholo 0.104.0__py3-none-any.whl → 0.104.2__py3-none-any.whl

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/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.dist-info → sunholo-0.104.2.dist-info}/METADATA

@@ -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'
@@ -120,7 +119,6 @@ Requires-Dist: pillow ; extra == 'gcp'
 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.dist-info → sunholo-0.104.2.dist-info}/RECORD

@@ -12,9 +12,9 @@ sunholo/agents/fastapi/__init__.py,sha256=S_pj4_bTUmDGoq_exaREHlOKThi0zTuGT0VZY0
 sunholo/agents/fastapi/base.py,sha256=W-cyF8ZDUH40rc-c-Apw3-_8IIi2e4Y9qRtnoVnsc1Q,2521
 sunholo/agents/fastapi/qna_routes.py,sha256=lKHkXPmwltu9EH3RMwmD153-J6pE7kWQ4BhBlV3to-s,3864
 sunholo/agents/flask/__init__.py,sha256=poJDKMr2qj8qMb99JqCvCPSiEt1tj2tLQ3hKW3f2aVw,107
-sunholo/agents/flask/base.py,sha256=Pb3czM-OtQaNPxqxTZTj3JvnvT2oMV1X37S7L-W8A0w,1487
+sunholo/agents/flask/base.py,sha256=HLz3Z5efWaewTwSFEM6JH48NA9otoJBoVFJlARGk9L8,788
 sunholo/agents/flask/qna_routes.py,sha256=uwUD1yrzOPH27m2AXpiQrPk_2VfJOQOM6dAynOWQtoQ,22532
-sunholo/agents/flask/vac_routes.py,sha256=sFjVXxudKP3SMO2hpcSbPZRZFBfrJr0tDQmlHTzn5E0,27181
+sunholo/agents/flask/vac_routes.py,sha256=JCZTqPKeER4E_I5P3vO4ek8r3yZPLI7-UMGNvvgTgpo,28400
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=PxVfDtO2_2ZEEbnhXSCbXLdeoHoQVImo4y3Jr2XkCFY,1204
 sunholo/auth/__init__.py,sha256=TeP-OY0XGxYV_8AQcVGoh35bvyWhNUcMRfhuD5l44Sk,91
@@ -147,9 +147,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=tBZxqVZ4InTmdBvLlOYwoSEWu4-kGquc-gxDwZCC4FA,7667
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.104.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.104.0.dist-info/METADATA,sha256=4JeZEj5xrF9rKUjrJVKwIEJzFkdSpYEbRqBnbbpHprA,8399
-sunholo-0.104.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sunholo-0.104.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.104.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.104.0.dist-info/RECORD,,
+sunholo-0.104.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.104.2.dist-info/METADATA,sha256=QInkHYU7eFDKv1bZ5I_iBeyPcPva3aaMW6ic0Jwndm0,8312
+sunholo-0.104.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+sunholo-0.104.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.104.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.104.2.dist-info/RECORD,,