Merge branch 'btkcodedev/prestashopFix' of https://github.com/airbytehq/airbyte into btkcodedev/prestashopFix

Author: btkcodedev

airbyte-integrations/connectors/source-prestashop/components.py

@@ -2,10 +2,10 @@
 # Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
 
-from dataclasses import InitVar, dataclass
-from typing import Any, List, Mapping, Optional, Tuple
 import re
+from dataclasses import InitVar, dataclass
 from datetime import datetime as dt
+from typing import Any, List, Mapping, Optional, Tuple
 
 from airbyte_cdk.sources.declarative.schema import JsonFileSchemaLoader
 from airbyte_cdk.sources.declarative.transformations import RecordTransformation
@@ -14,6 +14,7 @@
 
 class ParserError(Exception):
     """Replacement for pendulum's ParserError"""
+
     pass
 
 
@@ -48,75 +49,71 @@ def parse(self, text):
         Handles various date formats including those with timezone information.
         """
         # Reject dates with zeros like '0000-00-00' or '0000-00-00 00:00:00'
-        if re.match(r'^0+[-]0+[-]0+', text):
+        if re.match(r"^0+[-]0+[-]0+", text):
             raise ParserError("Zero date not allowed")
-            
+
         # Comprehensive list of formats to try
         formats = [
             # Basic formats
-            '%Y-%m-%d',
-            '%Y/%m/%d',
-            '%d-%m-%Y',
-            '%d/%m/%Y',
-            
+            "%Y-%m-%d",
+            "%Y/%m/%d",
+            "%d-%m-%Y",
+            "%d/%m/%Y",
             # Date and time formats
-            '%Y-%m-%d %H:%M:%S',
-            '%Y-%m-%d %H:%M:%S.%f',
-            '%Y/%m/%d %H:%M:%S',
-            '%Y/%m/%d %H:%M:%S.%f',
-            
+            "%Y-%m-%d %H:%M:%S",
+            "%Y-%m-%d %H:%M:%S.%f",
+            "%Y/%m/%d %H:%M:%S",
+            "%Y/%m/%d %H:%M:%S.%f",
             # ISO formats
-            '%Y-%m-%dT%H:%M:%S',
-            '%Y-%m-%dT%H:%M:%S.%f',
-            
+            "%Y-%m-%dT%H:%M:%S",
+            "%Y-%m-%dT%H:%M:%S.%f",
             # With timezone
-            '%Y-%m-%d %H:%M:%S%z',
-            '%Y-%m-%d %H:%M:%S.%f%z',
-            '%Y-%m-%dT%H:%M:%S%z',
-            '%Y-%m-%dT%H:%M:%S.%f%z',
-            
+            "%Y-%m-%d %H:%M:%S%z",
+            "%Y-%m-%d %H:%M:%S.%f%z",
+            "%Y-%m-%dT%H:%M:%S%z",
+            "%Y-%m-%dT%H:%M:%S.%f%z",
             # Using Z for UTC
-            '%Y-%m-%dT%H:%M:%SZ',
-            '%Y-%m-%dT%H:%M:%S.%fZ',
+            "%Y-%m-%dT%H:%M:%SZ",
+            "%Y-%m-%dT%H:%M:%S.%fZ",
         ]
 
         # Try parsing with different formats
         for fmt in formats:
             try:
                 # Handle 'Z' timezone indicator for UTC
                 text_to_parse = text
-                if fmt.endswith('Z') and not text.endswith('Z'):
+                if fmt.endswith("Z") and not text.endswith("Z"):
                     continue
-                if not fmt.endswith('Z') and text.endswith('Z'):
+                if not fmt.endswith("Z") and text.endswith("Z"):
                     text_to_parse = text[:-1]  # Remove Z
-                    fmt = fmt + 'Z' if 'Z' not in fmt else fmt
-                    
+                    fmt = fmt + "Z" if "Z" not in fmt else fmt
+
                 date_obj = dt.strptime(text_to_parse, fmt)
                 # In pendulum, dates with zero components are rejected
                 if date_obj.year == 0 or date_obj.month == 0 or date_obj.day == 0:
                     raise ParserError("Date with zero components")
                 return date_obj
             except ValueError:
                 continue
-                
+
         # Try ISO format as a last resort
         try:
             # Replace Z with +00:00 for ISO format parsing
-            iso_text = text.replace('Z', '+00:00')
-            
+            iso_text = text.replace("Z", "+00:00")
+
             # For Python < 3.11 compatibility, remove microseconds if they have more than 6 digits
-            microseconds_match = re.search(r'\.(\d{7,})(?=[+-Z]|$)', iso_text)
+            microseconds_match = re.search(r"\.(\d{7,})(?=[+-Z]|$)", iso_text)
             if microseconds_match:
                 fixed_micro = microseconds_match.group(1)[:6]
-                iso_text = iso_text.replace(microseconds_match.group(0), f'.{fixed_micro}')
-                
+                iso_text = iso_text.replace(microseconds_match.group(0), f".{fixed_micro}")
+
             date_obj = dt.fromisoformat(iso_text)
             if date_obj.year == 0 or date_obj.month == 0 or date_obj.day == 0:
                 raise ParserError("Date with zero components")
             return date_obj
         except (ValueError, AttributeError):
             pass
-            
+
         # If nothing worked, raise the error like pendulum would
         raise ParserError(f"Unable to parse: {text}")
 

airbyte-integrations/connectors/source-prestashop/metadata.yaml

@@ -10,7 +10,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: d60a46d4-709f-4092-a6b7-2457f7d455f5
-  dockerImageTag: 1.1.1
+  dockerImageTag: 1.2.0
   dockerRepository: airbyte/source-prestashop
   documentationUrl: https://docs.airbyte.com/integrations/sources/prestashop
   githubIssueLabel: source-prestashop

docs/integrations/sources/prestashop.md

@@ -107,6 +107,7 @@ If there are more endpoints you'd like Airbyte to support, please [create an iss
 
 | Version | Date       | Pull Request                                              | Subject                                                                         |
 | :------ | :--------- | :-------------------------------------------------------- | :------------------------------------------------------------------------------ |
+| 1.2.0 | 2025-03-13 | [55739](https://github.com/airbytehq/airbyte/pull/55739) | Remove pendulum from dependency |
 | 1.1.1 | 2025-03-08 | [43831](https://github.com/airbytehq/airbyte/pull/43831) | Update dependencies |
 | 1.1.0 | 2025-03-03 | [47016](https://github.com/airbytehq/airbyte/pull/47016) | Migrate to manifest-only format |
 | 1.0.4 | 2024-04-19 | [37233](https://github.com/airbytehq/airbyte/pull/37233) | Updating to 0.80.0 CDK |