Source ZohoCRM: Update api version and default optional fields to None

airbyte-integrations/connectors/source-zoho-crm/Dockerfile

@@ -12,5 +12,5 @@ RUN pip install .
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.2
+LABEL io.airbyte.version=0.1.3
 LABEL io.airbyte.name=airbyte/source-zoho-crm

airbyte-integrations/connectors/source-zoho-crm/metadata.yaml

@@ -2,7 +2,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: 4942d392-c7b5-4271-91f9-3b4f4e51eb3e
-  dockerImageTag: 0.1.2
+  dockerImageTag: 0.1.3
   dockerRepository: airbyte/source-zoho-crm
   githubIssueLabel: source-zoho-crm
   icon: zohocrm.svg

airbyte-integrations/connectors/source-zoho-crm/source_zoho_crm/api.py

@@ -37,6 +37,7 @@ class ZohoAPI:
     )
     _API_ENV_TO_URL_PREFIX = MappingProxyType({"production": "", "developer": "developer", "sandbox": "sandbox"})
     _CONCURRENCY_API_LIMITS = MappingProxyType({"Free": 5, "Standard": 10, "Professional": 15, "Enterprise": 20, "Ultimate": 25})
+    _API_VERSION = "v4"
 
     def __init__(self, config: Mapping[str, Any]):
         self.config = config
@@ -76,16 +77,16 @@ def _json_from_path(self, path: str, key: str, params: MutableMapping[str, str]
         return response.json()[key]
 
     def module_settings(self, module_name: str) -> List[MutableMapping[Any, Any]]:
-        return self._json_from_path(f"/crm/v2/settings/modules/{module_name}", key="modules")
+        return self._json_from_path(f"/crm/{self._API_VERSION}/settings/modules/{module_name}", key="modules")
 
     def modules_settings(self) -> List[MutableMapping[Any, Any]]:
-        return self._json_from_path("/crm/v2/settings/modules", key="modules")
+        return self._json_from_path(f"/crm/{self._API_VERSION}/settings/modules", key="modules")
 
     def fields_settings(self, module_name: str) -> List[MutableMapping[Any, Any]]:
-        return self._json_from_path("/crm/v2/settings/fields", key="fields", params={"module": module_name})
+        return self._json_from_path(f"/crm/{self._API_VERSION}/settings/fields", key="fields", params={"module": module_name})
 
     def check_connection(self) -> Tuple[bool, Any]:
-        path = "/crm/v2/settings/modules"
+        path = f"/crm/{self._API_VERSION}/settings/modules"
         response = requests.get(url=f"{self.api_url}{path}", headers=self.authenticator.get_auth_header())
         try:
             response.raise_for_status()

airbyte-integrations/connectors/source-zoho-crm/source_zoho_crm/streams.py

@@ -44,7 +44,8 @@ def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapp
         yield from data
 
     def path(self, *args, **kwargs) -> str:
-        return f"/crm/v2/{self.module.api_name}"
+        fields = ",".join([field.api_name for field in self.module.fields][0:50]) # Note, limited to 50 fields at max
+        return f"/crm/v4/{self.module.api_name}?fields={fields}"
 
     def get_json_schema(self) -> Optional[Dict[Any, Any]]:
         try:
@@ -92,16 +93,6 @@ def read_records(self, *args, **kwargs) -> Iterable[Mapping[str, Any]]:
             self.state = {self.cursor_field: new_cursor_value.isoformat("T", "seconds")}
             yield record
 
-    def request_headers(
-        self, stream_state: Mapping[str, Any], stream_slice: Mapping[str, Any] = None, next_page_token: Mapping[str, Any] = None
-    ) -> Mapping[str, Any]:
-        last_modified = stream_state.get(self.cursor_field, self._start_datetime)
-        # since API filters inclusively, we add 1 sec to prevent duplicate reads
-        last_modified_dt = datetime.datetime.fromisoformat(last_modified)
-        last_modified_dt += datetime.timedelta(seconds=1)
-        last_modified = last_modified_dt.isoformat("T", "seconds")
-        return {"If-Modified-Since": last_modified}
-
 
 class ZohoStreamFactory:
     def __init__(self, config: Mapping[str, Any]):

airbyte-integrations/connectors/source-zoho-crm/source_zoho_crm/types.py

@@ -107,13 +107,13 @@ class AutoNumberDict(FromDictMixin):
 @dataclasses.dataclass
 class FieldMeta(FromDictMixin):
     json_type: str
-    length: Optional[int]
     api_name: str
     data_type: str
-    decimal_place: Optional[int]
     system_mandatory: bool
     display_label: str
-    pick_list_values: Optional[List[ZohoPickListItem]]
+    decimal_place: Optional[int] = None
+    pick_list_values: Optional[List[ZohoPickListItem]] = None
+    length: Optional[int] = None
     auto_number: Optional[AutoNumberDict] = AutoNumberDict(prefix="", suffix="")
 
     def _default_type_kwargs(self) -> Dict[str, str]:

docs/integrations/sources/zoho-crm.md

@@ -130,6 +130,7 @@ Make sure to complete the auth flow quickly, as the initial token granted by Zoh
 
 | Version | Date       | Pull Request                                             | Subject                                                                            |
 |:--------|:-----------|:---------------------------------------------------------|:-----------------------------------------------------------------------------------|
+| 0.1.3   | 2023-07-03 | [23906](https://github.com/airbytehq/airbyte/pull/27423) | Updated api to use v4, fixed optional params being required bug
 | 0.1.2   | 2023-03-09 | [23906](https://github.com/airbytehq/airbyte/pull/23906) | added support for the latest CDK, fixed SAT                                        |
 | 0.1.1   | 2023-03-13 | [23818](https://github.com/airbytehq/airbyte/pull/23818) | Set airbyte type to string for zoho autonumbers when they include prefix or suffix |
 | 0.1.0   | 2022-03-30 | [11193](https://github.com/airbytehq/airbyte/pull/11193) | Initial release                                                                    |