Revert "add arcpy and proxy"

This reverts commit 9d88596.

Author: OCurdy

geopycat/geocat.py

@@ -10,7 +10,7 @@
 import requests
 import urllib3
 from dotenv import load_dotenv
-import arcpy
+import psycopg2
 from geopycat import settings
 from geopycat import utils
 
@@ -101,8 +101,9 @@ def __get_token(self) -> object:
         return session
 
     def db_connect(self) -> object:
-        """Connect to geocat DB and returns an arcpy connection object"""
+        """Connect to geocat DB and returns a psycopg2 connection object"""
 
+        # Access database credentials from env variable if exists
         db_username = os.getenv('DB_USERNAME')
         db_password = os.getenv('DB_PASSWORD')
 
@@ -112,9 +113,11 @@ def db_connect(self) -> object:
 
         _env = [k for k, v in settings.ENV.items() if v == self.env][0]
 
-        connection_string = f"DATABASE_PLATFORM=POSTGRESQL;DATABASE={_env};DBCLIENT=postgresql;DB_CONNECTION_PROPERTIES=database-lb.geocat.swisstopo.cloud;USER={db_username};PASSWORD={db_password};VERSION=sde.DEFAULT"
-
-        connection = arcpy.ArcSDESQLExecute(connection_string)
+        connection = psycopg2.connect(
+                host="database-lb.geocat.swisstopo.cloud",
+                database=f"geocat-{_env}",
+                user=db_username,
+                password=db_password)
 
         return connection
 
@@ -508,6 +511,8 @@ def backup_metadata(self, uuids: list, backup_dir: str = None, with_related: boo
                 print(f"{utils.warningred('The following Metadata could not be backup : ') + uuid}")
                 continue
 
+            uuid = uuid.replace(":", "_").replace("/", "_").replace("\\", "_").replace("'", "_").replace('"', "_")
+
             with open(os.path.join(backup_dir, f"{uuid}.zip"), "wb") as output:
                 output.write(response.content)
 
@@ -556,6 +561,8 @@ def backup_metadata_xml(self, uuids: list, backup_dir: str = None):
                 print(f"{utils.warningred('The following Metadata could not be backup : ') + uuid}")
                 continue
 
+            uuid = uuid.replace(":", "_").replace("/", "_").replace("\\", "_").replace("'", "_").replace('"', "_")
+
             with open(os.path.join(backup_dir, f"{uuid}.xml"), "wb") as output:
                 output.write(response.content)
 
@@ -744,58 +751,52 @@ def search_and_replace(self, search: str, replace: str, escape_wildcard: bool =
 
         try:
             connection = self.db_connect()
+            with connection.cursor() as cursor:
 
-            query = f"""
-            SELECT uuid FROM public.metadata
-            WHERE (istemplate = 'n' OR istemplate = 'y')
-            AND data LIKE '%{search_sql}%'
-            """
+                cursor.execute("SELECT uuid FROM public.metadata where (istemplate='n' OR istemplate='y')" \
+                                f"AND data like '%{search_sql}%'")
 
-            result = connection.execute(query)
+                for row in cursor:
+                    metadata_uuids.append(row[0])
 
-            for row in result:
-                metadata_uuids.append(row[0])
+        except (Exception, psycopg2.Error) as error:
+            print("Error while fetching data from PostgreSQL", error)
 
-        except arcpy.ExecuteError:
-            msgs = arcpy.GetMessages(2)
-            print(f"Error while fetching data from the geodatabase: {msgs}")
-        except Exception as error:
-            print(f"Unexpected error: {error}")
+        finally:
+            if connection:
+                connection.close()
 
         headers = {"accept": "application/json", "Content-Type": "application/json"}
 
         if len(metadata_uuids) == 0:
-            print(f"Warning: '{search}' not found in any metadata")
+            print(utils.warningred(f"{search} not found in any metadata"))
             return
 
         for uuid in metadata_uuids:
+
             params = {
                 "search": search,
                 "replace": replace,
                 "uuids": [uuid],
                 "updateDateStamp": False
             }
 
-            response = self.session.post(
-                self.env + "/geonetwork/srv/api/processes/db/search-and-replace",
-                params=params,
-                headers=headers
-            )
+            response = self.session.post(self.env + "/geonetwork/srv/api/processes/db/search-and-replace",
+                                params=params, headers=headers)
 
-            if hasattr(response, 'ok') and response.ok:
-                print(f"Metadata {uuid}: '{search}' successfully replaced by '{replace}'")
+            if utils.process_ok(response):
+                print(utils.okgreen(f"Metadata {uuid} : {search} successfully replaced by {replace}"))
             else:
-                print(f"Metadata {uuid}: '{search}' unsuccessfully replaced by '{replace}'")
-
+                print(utils.warningred(f"Metadata {uuid} : {search} unsuccessfully replaced by {replace}"))
 
     def search_db(self, search: str, escape_wildcard: bool = True) -> list:
         """
-        Performs search at the DB level using arcpy.ArcSDESQLExecute.
-        Returns a list of metadata UUIDs where the search input was found.
+        Performs search at the DB level. Returns list of metadata UUID where search
+        input was found.
 
         Parameters:
-            search (str): Value to search for.
-            escape_wildcard (bool): If True, "%" wildcards are escaped as "\%".
+            search (str): value to search for
+            escape_wildcard (bool): if True, "%" wildcard are escaped "\%"
         """
 
         if not self.check_admin():
@@ -809,30 +810,22 @@ def search_db(self, search: str, escape_wildcard: bool = True) -> list:
             search_sql = search
 
         try:
-            # Establish the database connection
             connection = self.db_connect()
+            with connection.cursor() as cursor:
 
-            # Build the SQL query
-            query = f"""
-            SELECT uuid FROM public.metadata
-            WHERE (istemplate = 'n' OR istemplate = 'y')
-            AND data LIKE '%{search_sql}%'
-            """
+                cursor.execute("SELECT uuid FROM public.metadata where (istemplate='n' OR istemplate='y')" \
+                                f"AND data like '%{search_sql}%'")
 
-            # Execute the query using arcpy.ArcSDESQLExecute
-            result = connection.execute(query)
+                for row in cursor:
+                    metadata_uuids.append(row[0])
 
-            # Fetch the results
-            for row in result:
-                metadata_uuids.append(row[0])
-
-        except arcpy.ExecuteError:
-            # Retrieve arcpy-specific error messages
-            msgs = arcpy.GetMessages(2)
-            print(f"Error while fetching data from the geodatabase: {msgs}")
-        except Exception as error:
-            print(f"Unexpected error: {error}")
+        except (Exception, psycopg2.Error) as error:
+            print("Error while fetching data from PostgreSQL", error)
 
+        finally:
+            if connection:
+                connection.close()
+        
         return metadata_uuids
 
     def delete_metadata(self, uuid: str) -> object:

geopycat/settings.py

@@ -28,10 +28,6 @@
     {
         "http": "proxy.admin.ch:8080",
         "https": "proxy.admin.ch:8080",
-    },
-        {
-        "http": "prxp01.admin.ch:8080",
-        "https": "prxp01.admin.ch:8080",
     },
     {}
 ]