save

Author: alainabbas

.gitignore

@@ -6,3 +6,4 @@ src/__pycache__/*
 .idea/
 bin/
 pyvenv.cfg
+config.yml

lib/data_weaver3/__pycache__/main.cpython-312.pyc

@@ -10,7 +10,7 @@
 
 config = {}
 
-def handle_value(data, source_key, target_key, default=True):
+def handle_value(data, source_key, target_key, default=False):
     """
     Handles the value of the given key in the data dictionary.
 

lib/data_weaver3/__pycache__/transforms.cpython-312.pyc

@@ -50,16 +50,13 @@ def suffix_val(val):
 def split(value: str, delimiter: str = ' ') -> list:
     return value.split(delimiter)
 
-def joinStr(values: list, delimiter: str = ' ') -> str:
-    print('test jointure xxxxxxxxxxxxxxxxxxxxxxxxx ')
+def join(values: list, delimiter: str = ' ') -> str:
     r=[]
     for v in values:
-        if type(v) is None:
+        if v is None:
             r.append(r)
-        else:
+        elif v != '':
             r.append(v)
-
-    values = [str(value) if value is not None else '' for value in values]
     return delimiter.join(r)
 
 def lower(value: str | list | dict) -> str:
@@ -103,7 +100,7 @@ def remove_accents_val(val):
     "prefix": lambda value, string: prefix(value, string),
     "suffix": lambda value, string: suffix(value, string),
     "split": lambda value, delimiter=None: split(value, delimiter),
-    "join": lambda value, delimiter='': joinStr(value, delimiter),
+    "join": lambda value, delimiter='': join(value, delimiter),
     "replace": lambda value, old, new: replace(value, old, new),
     "regex": lambda value, pattern, replace: regex(value, pattern, replace),
 }

lib/data_weaver3/main.py

@@ -124,6 +124,8 @@ async def main():
 
 if __name__ == '__main__':
     loop = asyncio.get_event_loop()
+    # A Activer pour debugging
+    #loop.set_debug(True)
     try:
         loop.run_until_complete(main())
     finally:

lib/data_weaver3/transforms.py

@@ -24,7 +24,7 @@ async def a_moins_b(url, a, b, headers):
         response.raise_for_status()
         if response.json()['result'] != 1:
             raise Exception("Bad AmoinsB result", response.json())
-        logger.info(f"AmoinsB verification <{payload['id']}> successful !")
+        logger.info(f"API Taiga verification <{payload['id']}> successful !")
     except requests.exceptions.HTTPError as e:
-        logger.warning(f"Failed to test AmoinsB: {e} \n {e.response.text}")
+        logger.warning(f"Failed to test API Taiga: {e} \n {e.response.text}")
         exit(255)

main.py

@@ -10,7 +10,7 @@
 sesame_api_baseurl = os.getenv('SESAME_API_BASEURL')
 sesame_api_token = os.getenv('SESAME_API_TOKEN')
 sesame_import_parallels_files = int(os.getenv('SESAME_IMPORT_PARALLELS_FILES', 1))
-sesame_import_parallels_entries = int(os.getenv('SESAME_IMPORT_PARALLELS_ENTRIES', 5))
+sesame_import_parallels_entries = int(os.getenv('SESAME_IMPORT_PARALLELS_ENTRIES', 1))
 
 async def gather_with_concurrency(n, tasks):
     semaphore = asyncio.Semaphore(n)
@@ -40,11 +40,17 @@ async def send_request(session, url, json):
     try:
 
         async with session.post(url, json=json, headers=headers, params=params) as response:
-            print(f"Request to {url} successful: {response.status}")
+            #print(f"Request to {url} successful: {response.status}")
             if response.status == 304:
-                print(f"Cached entry {json.get('inetOrgPerson', {}).get('employeeNumber')}")
+                print(f"{response.status} UNMODIFIED {json.get('inetOrgPerson', {}).get('employeeNumber')} {json.get('inetOrgPerson', {}).get('cn')}")
+            elif response.status == 200:
+                print(f"{response.status} MODIFIED {json.get('inetOrgPerson', {}).get('employeeNumber')} {json.get('inetOrgPerson', {}).get('cn')}")
+            elif response.status == 201:
+                print(f"{response.status} ADDED {json.get('inetOrgPerson', {}).get('employeeNumber')} {json.get('inetOrgPerson', {}).get('cn')}")
+            elif response.status == 202:
+                print(f"{response.status} ADDED WiTH WARNiNG {json.get('inetOrgPerson', {}).get('employeeNumber')} {json.get('inetOrgPerson', {}).get('cn')}")
             else:
-                print(f"Response to {json.get('inetOrgPerson', {}).get('employeeNumber')}:")
+                print(f"{response.status} -- {json.get('inetOrgPerson', {}).get('employeeNumber')} {json.get('inetOrgPerson', {}).get('cn')}")
                 await read_response(response)
             response.raise_for_status()  # Raises error for 4xx/5xx responses
     except aiohttp.ClientResponseError as e: