fix: updating pytests for subtype addition and making subtype optional

src/hrflow_connectors/core/connector.py

@@ -17,7 +17,6 @@
     BaseModel,
     Field,
     ValidationError,
-    constr,
     create_model,
     root_validator,
     validator,
@@ -765,20 +764,23 @@ class ConnectorModel(BaseModel):
     description: str
     url: str
     type: ConnectorType
-    subtype: constr(regex=CONNECTOR_SUBTYPE_FORMAT_REGEX) = Field(
-        ..., description="Lowercased string with no spaces"
+    subtype: t.Optional[str] = Field(
+        regex=CONNECTOR_SUBTYPE_FORMAT_REGEX,
+        description="Lowercased string with no spaces",
     )
     actions: t.List[ConnectorAction]
 
     @validator("subtype", pre=True, always=True)
-    def check_subtype(cls, value: str) -> str:
-        cleaned_value = value.lower()
-        if cleaned_value != value:
-            raise ValueError(f"ConnectorModel's `subtype` {value} must be lowercase.")
-        if " " in cleaned_value:
-            raise ValueError(
-                f"ConnectorModel's `subtype` {value} must not contain any spaces."
-            )
+    def check_subtype(cls, value: t.Optional[str], values: dict) -> str:
+        if value is None:
+            cleaned_value = values.get("name", "").lower().replace(" ", "")
+        else:
+            cleaned_value = value.lower().replace(" ", "")
+            if cleaned_value != value:
+                raise ValueError(
+                    "ConnectorModel's `subtype`={} must be lowercase without any"
+                    " spaces.".format(value)
+                )
         return cleaned_value
 
     def logo(self, connectors_directory: Path) -> str:

tests/core/test_connector.py

@@ -1690,28 +1690,19 @@ def new_format(*args, **kwargs):
     ).format(parameters_action_name.name)
 
 
-def test_connector_lowercase_subtype_constraint():
-    subtype = "SmartLeads"
-    with pytest.raises(ValidationError) as excinfo:
-        Connector(
-            name="SmartLeads",
-            type=ConnectorType.Other,
-            subtype=subtype,
-            description=DESCRIPTION,
-            url="https://www.smartleads.test/",
-            actions=[],
-        )
-    expected_error = (
-        "1 validation error for ConnectorModel"
-        "\nsubtype"
-        "\n  ConnectorModel's `subtype` {} must be lowercase. (type=value_error)"
-        .format(subtype)
+def test_connector_model_subtype_missing():
+    model = Connector(
+        name="SmartLeads",
+        type=ConnectorType.Other,
+        description=DESCRIPTION,
+        url="https://www.smartleads.test/",
+        actions=[],
     )
-    assert str(excinfo.value) == expected_error
+    assert model.model.subtype == "smartleads"
 
 
-def test_connector_space_subtype_constraint():
-    subtype = "smart leads"
+def test_connector_subtype_constraint():
+    subtype = "Smart Leads"
     with pytest.raises(ValidationError) as excinfo:
         Connector(
             name="SmartLeads",
@@ -1722,7 +1713,9 @@ def test_connector_space_subtype_constraint():
             actions=[],
         )
     expected_error = (
-        "1 validation error for ConnectorModel\nsubtype\n  ConnectorModel's `subtype`"
-        " {} must not contain any spaces. (type=value_error)".format(subtype)
+        "1 validation error for ConnectorModel\nsubtype\n  ConnectorModel's"
+        " `subtype`={} must be lowercase without any spaces. (type=value_error)".format(
+            subtype
+        )
     )
     assert str(excinfo.value) == expected_error