fix: don't require port and ssl params if URI is used for Redis connection (#505)

Author: pawel-kmiecik

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.29
+
+### Fixes
+
+* **Fix Redis connector shouldn't require `port` and `ssl` params if URI is provided**
+
 ## 1.0.28
 
 ### Fixes

unstructured_ingest/__version__.py

@@ -1 +1 @@
-__version__ = "1.0.28"  # pragma: no cover
+__version__ = "1.0.29"  # pragma: no cover

unstructured_ingest/processes/connectors/redisdb.py

@@ -32,7 +32,9 @@ class RedisAccessConfig(AccessConfig):
         default=None, description="If not anonymous, use this uri, if specified."
     )
     password: Optional[str] = Field(
-        default=None, description="If not anonymous, use this password, if specified."
+        default=None, 
+        description="Password used to connect to database if uri is "
+                    "not specified and connection is not anonymous."
     )
 
 
@@ -41,20 +43,32 @@ class RedisConnectionConfig(ConnectionConfig):
         default=RedisAccessConfig(), validate_default=True
     )
     host: Optional[str] = Field(
-        default=None, description="Hostname or IP address of a Redis instance to connect to."
+        default=None,
+        description="Hostname or IP address of a Redis instance to connect to "
+                    "if uri is not specified.",
     )
     database: int = Field(default=0, description="Database index to connect to.")
-    port: int = Field(default=6379, description="port used to connect to database.")
+    port: Optional[int] = Field(
+        default=6379, description="Port used to connect to database if uri is not specified."
+    )
     username: Optional[str] = Field(
-        default=None, description="Username used to connect to database."
+        default=None, description="Username used to connect to database if uri is not specified."
+    )
+    ssl: Optional[bool] = Field(
+        default=True,
+        description="Whether the connection should use SSL encryption if uri is not specified.",
     )
-    ssl: bool = Field(default=True, description="Whether the connection should use SSL encryption.")
     connector_type: str = Field(default=CONNECTOR_TYPE, init=False)
 
     @model_validator(mode="after")
     def validate_host_or_url(self) -> "RedisConnectionConfig":
-        if not self.access_config.get_secret_value().uri and not self.host:
-            raise ValueError("Please pass a hostname either directly or through uri")
+        if not self.access_config.get_secret_value().uri:
+            if not self.host:
+                raise ValueError("Please pass a hostname either directly or through uri")
+            if self.port is None:
+                raise ValueError("Since URI is not specified, port cannot be None")
+            if self.ssl is None:
+                raise ValueError("Since URI is not specified, ssl cannot be None")
         return self
 
     @requires_dependencies(["redis"], extras="redis")
@@ -64,21 +78,20 @@ async def create_async_client(self) -> AsyncGenerator["Redis", None]:
 
         access_config = self.access_config.get_secret_value()
 
-        options = {
-            "host": self.host,
-            "port": self.port,
-            "db": self.database,
-            "ssl": self.ssl,
-            "username": self.username,
-        }
-
-        if access_config.password:
-            options["password"] = access_config.password
-
         if access_config.uri:
             async with from_url(access_config.uri) as client:
                 yield client
         else:
+            options = {
+                "host": self.host,
+                "port": self.port,
+                "db": self.database,
+                "ssl": self.ssl,
+                "username": self.username,
+            }
+
+            if access_config.password:
+                options["password"] = access_config.password
             async with Redis(**options) as client:
                 yield client