Initialize or reset proxy each time before request is sent.

Initialize or reset proxy each time before request is sent.
Create LambdaService object when button is pressed.
Removed redundant code.

Author: Mtk112

arho_feature_template/core/lambda_service.py

@@ -17,19 +17,22 @@ def __init__(self):
         # Init network manager
         self.network_manager = QNetworkAccessManager()
 
-        # Get settings
+    def send_request(self, action: str, plan_id: str):
+        """Sends a request to the lambda function."""
+
         proxy_host, proxy_port, self.lambda_url = get_settings()
 
+        # Initialize or reset proxy each time a request is sent. Incase settings have changed.
         if proxy_host and proxy_port:
             # Set up SOCKS5 Proxy if values are provided
             proxy = QNetworkProxy()
             proxy.setType(QNetworkProxy.Socks5Proxy)
             proxy.setHostName(proxy_host)
             proxy.setPort(int(proxy_port))
             self.network_manager.setProxy(proxy)
+        else:
+            self.network_manager.setProxy(QNetworkProxy())
 
-    def send_request(self, action: str, plan_id: str):
-        """Sends a request to the lambda function."""
         payload = {"action": action, "plan_uuid": plan_id}
         payload_bytes = QByteArray(json.dumps(payload).encode("utf-8"))
 
@@ -53,7 +56,6 @@ def _process_reply(self, reply: QNetworkReply):
 
         try:
             response_data = reply.readAll().data().decode("utf-8")
-
             response_json = json.loads(response_data)
 
             # Determine if the proxy is set up.
@@ -71,7 +73,7 @@ def _process_reply(self, reply: QNetworkReply):
             if not isinstance(plan_json, dict):
                 plan_json = {}
 
-            outline_json = None
+            outline_json = {}
             if plan_json:
                 geographical_area = plan_json.get("geographicalArea")
                 if geographical_area:
@@ -83,9 +85,6 @@ def _process_reply(self, reply: QNetworkReply):
                         "geometry": geographical_area.get("geometry"),
                     }
 
-            if outline_json is None:
-                outline_json = {}  # Fallback to empty dictionary if no outline JSON is created
-
             # Emit the signal with the two JSONs
             self.jsons_received.emit(plan_json, outline_json)
 

arho_feature_template/core/plan_manager.py

@@ -16,8 +16,6 @@
 
 class PlanManager:
     def __init__(self):
-        self.lambda_service = LambdaService()
-        self.lambda_service.jsons_received.connect(self.save_plan_jsons)
         self.json_plan_path = None
         self.json_plan_outline_path = None
         self.kaava_layer = get_layer_by_name("Kaava")
@@ -121,6 +119,8 @@ def get_plan_json(self):
                 QMessageBox.critical(None, "Virhe", "Ei aktiivista kaavaa.")
                 return
 
+            self.lambda_service = LambdaService()
+            self.lambda_service.jsons_received.connect(self.save_plan_jsons)
             self.lambda_service.send_request("get_plans", plan_id)
 
     def save_plan_jsons(self, plan_json, outline_json):