uri parsing

Author: EugeneSukharev1988

build_and_push.sh

@@ -2,7 +2,7 @@
 
 # Configuration
 PACKAGE_NAME="montycat"
-VERSION="0.1.44"
+VERSION="0.1.45"
 PYPI_TOKEN="${PYPI_TOKEN:-}"
 
 # Exit on any error

montycat/core/engine.py

@@ -1,5 +1,6 @@
 import orjson
 from typing import Union, List, Optional, Any
+from urllib.parse import urlparse
 from .tools import Permission
 from .utils import send_data
 
@@ -37,7 +38,7 @@ def __init__(self, host: str, port: int, username: str, password: str, store: Un
     def from_uri(cls, uri: str) -> 'Engine':
         """
         Creates an Engine instance from a URI string in the format:
-        montycat://host/port/username/password[/store]
+        montycat://username:password@host:port[/store]
 
         The store is optional. If not provided, it will be set to None.
 
@@ -52,21 +53,24 @@ def from_uri(cls, uri: str) -> 'Engine':
         """
         if not uri.startswith("montycat://"):
             raise ValueError("URI must use 'montycat://' protocol")
-        parts = uri[len("montycat://"):].split("/")
-        if len(parts) == 4:
-            host, port_str, username, password = parts
-            store = None
-        elif len(parts) == 5:
-            host, port_str, username, password, store = parts
-        else:
-            raise ValueError("Missing or extra parts in URI")
-        if any(part == "" for part in [host, port_str, username, password]):
-            raise ValueError("Host, port, username, and password must be non-empty")
-        try:
-            port = int(port_str)
-        except ValueError:
-            raise ValueError("Port must be an integer")
-        return cls(host, port, username, password, store)
+
+        parsed = urlparse(uri)
+
+        if not parsed.username or not parsed.password:
+            raise ValueError("Username and password must be provided")
+        if not parsed.hostname or not parsed.port:
+            raise ValueError("Host and port must be provided")
+
+        # Optional store
+        store = parsed.path[1:] if parsed.path and len(parsed.path) > 1 else None
+
+        return cls(
+            host=parsed.hostname,
+            port=parsed.port,
+            username=parsed.username,
+            password=parsed.password,
+            store=store
+        )
 
     async def _execute_query_with_credentials(self, command: List[Any]) -> Any:
         """

montycat/store_classes/kv.py

@@ -368,7 +368,7 @@ async def list_all_schemas_in_keyspace(cls):
         return await cls._run_query(query)
 
     @classmethod
-    def show_store_properties(cls):
+    def show_properties(cls):
         """
         Displays the properties of the store associated with the provided class settings.
         

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='montycat',
-    version='0.1.44',
+    version='0.1.45',
     description='A Python client for MontyCat, NoSQL store utilizing Data Mesh architecture.',
     packages=find_packages(),
     zip_safe=False,