morphik 1.2.0__tar.gz → 1.2.2__tar.gz

{morphik-1.2.0 → morphik-1.2.2}/.gitignore

@@ -59,4 +59,5 @@ multi_vector_embeddings_*.json
 morphik_rust/target/
 morphik_rust/Cargo.lock
 DOCS_BY_FACILITIES/
-eval_freshworks/
+eval_freshworks/
+iep_test/

{morphik-1.2.0 → morphik-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: morphik
-Version: 1.2.0
+Version: 1.2.2
 Summary: Morphik Python Client
 Author-email: Morphik <founders@morphik.ai>
 Requires-Python: >=3.8
@@ -52,6 +52,9 @@ from morphik import Morphik
 # Initialize client - connects to localhost:8000 by default
 db = Morphik()
 
+# You can also use a direct HTTP(S) base URL for self-hosted deployments
+# db = Morphik("http://morphik:8000")
+
 # Or with authentication URI (for production)
 # db = Morphik("morphik://owner_id:token@api.morphik.ai")
 
@@ -96,6 +99,10 @@ print(response.completion)
 # Create a nested folder (parents are auto-created server-side)
 folder = db.create_folder(full_path="/projects/alpha/specs", description="Specs folder")
 
+# Move or rename folder paths
+moved = db.move_folder("/projects/alpha/specs", "/projects/archive/specs")
+renamed = moved.rename("specs-v2")
+
 # Scope queries to a path and include descendants with folder_depth=-1
 chunks = folder.retrieve_chunks(query="design notes", folder_depth=-1)
 docs = db.list_documents(folder_name="/projects/alpha", folder_depth=-1)
@@ -113,6 +120,9 @@ async def main():
     # Initialize async client - connects to localhost:8000 by default
     async with AsyncMorphik() as db:
 
+    # You can also use a direct HTTP(S) base URL for self-hosted deployments
+    # async with AsyncMorphik("http://morphik:8000") as db:
+
     # Or with authentication URI (for production)
     # async with AsyncMorphik("morphik://owner_id:token@api.morphik.ai") as db:
         # Ingest a text document

{morphik-1.2.0 → morphik-1.2.2}/README.md

@@ -39,6 +39,9 @@ from morphik import Morphik
 # Initialize client - connects to localhost:8000 by default
 db = Morphik()
 
+# You can also use a direct HTTP(S) base URL for self-hosted deployments
+# db = Morphik("http://morphik:8000")
+
 # Or with authentication URI (for production)
 # db = Morphik("morphik://owner_id:token@api.morphik.ai")
 
@@ -83,6 +86,10 @@ print(response.completion)
 # Create a nested folder (parents are auto-created server-side)
 folder = db.create_folder(full_path="/projects/alpha/specs", description="Specs folder")
 
+# Move or rename folder paths
+moved = db.move_folder("/projects/alpha/specs", "/projects/archive/specs")
+renamed = moved.rename("specs-v2")
+
 # Scope queries to a path and include descendants with folder_depth=-1
 chunks = folder.retrieve_chunks(query="design notes", folder_depth=-1)
 docs = db.list_documents(folder_name="/projects/alpha", folder_depth=-1)
@@ -100,6 +107,9 @@ async def main():
     # Initialize async client - connects to localhost:8000 by default
     async with AsyncMorphik() as db:
 
+    # You can also use a direct HTTP(S) base URL for self-hosted deployments
+    # async with AsyncMorphik("http://morphik:8000") as db:
+
     # Or with authentication URI (for production)
     # async with AsyncMorphik("morphik://owner_id:token@api.morphik.ai") as db:
         # Ingest a text document

{morphik-1.2.0 → morphik-1.2.2}/morphik/__init__.py

@@ -14,4 +14,4 @@ __all__ = [
     "DocumentQueryResponse",
 ]
 
-__version__ = "1.2.0"
+__version__ = "1.2.2"

{morphik-1.2.0 → morphik-1.2.2}/morphik/_internal.py

@@ -64,12 +64,31 @@ class _MorphikClientLogic:
         if not parsed.netloc:
             raise ValueError("Invalid URI format")
 
+        # Allow direct HTTP(S) endpoints without auth token for self-hosted usage.
+        if parsed.scheme in {"http", "https"}:
+            path_prefix = (parsed.path or "").rstrip("/")
+            self._base_url = f"{parsed.scheme}://{parsed.netloc}{path_prefix}".rstrip("/")
+            self._auth_token = None
+            if parsed.hostname in {"localhost", "127.0.0.1", "0.0.0.0", "host.docker.internal"}:
+                self._is_local = True
+            return
+
+        if parsed.scheme != "morphik":
+            raise ValueError("Invalid URI format")
+        if "@" not in parsed.netloc:
+            raise ValueError("Invalid Morphik URI format. Expected morphik://<owner_id>:<token>@<host>")
+
         # Split host and auth parts
-        auth, host = parsed.netloc.split("@")
-        _, self._auth_token = auth.split(":")
+        auth, host = parsed.netloc.rsplit("@", 1)
+        if ":" not in auth:
+            raise ValueError("Invalid Morphik URI auth format. Expected <owner_id>:<token>")
+        _, self._auth_token = auth.split(":", 1)
+
+        if parsed.hostname in {"localhost", "127.0.0.1", "0.0.0.0", "host.docker.internal"}:
+            self._is_local = True
 
         # Set base URL
-        self._base_url = f"{'http' if self._is_local else 'https'}://{host}"
+        self._base_url = f"{'http' if self._is_local else 'https'}://{host}".rstrip("/")
 
         # Basic token validation
         jwt.decode(self._auth_token, options={"verify_signature": False})

{morphik-1.2.0 → morphik-1.2.2}/morphik/_shared.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import json
 from pathlib import Path
 from typing import Any, Dict, Iterable, List, Optional, Union
+from urllib.parse import quote
 
 from pydantic import BaseModel
 
@@ -95,27 +96,8 @@ def build_rotate_app_params(
     return params
 
 
-def build_create_app_payload(
-    *,
-    name: str,
-    app_id: Optional[str],
-    user_id: Optional[str],
-    expiry_days: Optional[int],
-    org_id: Optional[str],
-    created_by_user_id: Optional[str],
-) -> Dict[str, Any]:
-    payload: Dict[str, Any] = {"name": name}
-    if app_id is not None:
-        payload["app_id"] = app_id
-    if user_id is not None:
-        payload["user_id"] = user_id
-    if expiry_days is not None:
-        payload["expiry_days"] = expiry_days
-    if org_id is not None:
-        payload["org_id"] = org_id
-    if created_by_user_id is not None:
-        payload["created_by_user_id"] = created_by_user_id
-    return payload
+def build_create_app_payload(*, name: str) -> Dict[str, Any]:
+    return {"name": name}
 
 
 def build_requeue_payload(
@@ -140,9 +122,7 @@ def build_requeue_payload(
     return payload
 
 
-def build_logs_params(
-    *, limit: int, hours: float, op_type: Optional[str], status: Optional[str]
-) -> Dict[str, Any]:
+def build_logs_params(*, limit: int, hours: float, op_type: Optional[str], status: Optional[str]) -> Dict[str, Any]:
     params: Dict[str, Any] = {
         "limit": max(1, min(limit, MAX_LIMIT)),
         "hours": max(MIN_LOG_HOURS, min(hours, MAX_LOG_HOURS)),
@@ -167,6 +147,43 @@ def build_document_by_filename_params(
     return params
 
 
+def normalize_folder_identifier(folder_id_or_name: str) -> str:
+    if not folder_id_or_name:
+        raise ValueError("folder_id_or_name is required")
+    normalized = folder_id_or_name.lstrip("/")
+    if not normalized:
+        raise ValueError("folder_id_or_name is required")
+    return normalized
+
+
+def build_folder_endpoint_identifier(folder_id_or_name: str) -> str:
+    normalized = normalize_folder_identifier(folder_id_or_name)
+    return quote(normalized, safe="/")
+
+
+def build_folder_move_payload(*, new_path: str) -> Dict[str, str]:
+    normalized_path = "/" + (new_path or "").strip("/")
+    if normalized_path == "/":
+        raise ValueError("new_path must include at least one non-root segment")
+    return {"new_path": normalized_path}
+
+
+def build_folder_rename_path(*, current_path: str, new_name: str) -> str:
+    normalized_name = (new_name or "").strip().strip("/")
+    if not normalized_name:
+        raise ValueError("new_name is required")
+    if "/" in normalized_name:
+        raise ValueError("new_name must be a single folder segment without '/'")
+
+    normalized_current = "/" + (current_path or "").strip("/")
+    segments = [segment for segment in normalized_current.split("/") if segment]
+    if not segments:
+        raise ValueError("current_path must include at least one non-root segment")
+
+    segments[-1] = normalized_name
+    return "/" + "/".join(segments)
+
+
 def normalize_additional_folders(
     additional_folders: Optional[List[str]],
     folder_name: Optional[Union[str, List[str]]],

{morphik-1.2.0 → morphik-1.2.2}/morphik/async_.py

@@ -11,19 +11,22 @@ from pydantic import BaseModel
 
 from ._internal import FinalChunkResult, _MorphikClientLogic
 from ._scoped_ops import _ScopedOperationsMixin
-from .models import CompletionResponse  # Prompt override models
 from ._shared import (
+    build_folder_endpoint_identifier,
+    build_folder_move_payload,
+    build_folder_rename_path,
     build_create_app_payload,
     build_document_by_filename_params,
     build_list_apps_params,
     build_logs_params,
-    build_requeue_payload,
     build_rename_app_params,
+    build_requeue_payload,
     build_rotate_app_params,
     collect_directory_files,
     merge_folders,
     normalize_additional_folders,
 )
+from .models import CompletionResponse  # Prompt override models
 from .models import (
     AppStorageUsageResponse,
     ChunkSource,
@@ -128,9 +131,7 @@ class _AsyncScopedClientOps:
         if not files:
             return []
 
-        return await self.ingest_files(
-            files=files, metadata=metadata, use_colpali=use_colpali, parallel=parallel
-        )
+        return await self.ingest_files(files=files, metadata=metadata, use_colpali=use_colpali, parallel=parallel)
 
     async def query_document(
         self,
@@ -418,6 +419,15 @@ class AsyncFolder(_AsyncScopedClientOps):
         """Returns the folder ID if available."""
         return self._id
 
+    def _sync_from_folder(self, folder: "AsyncFolder") -> None:
+        self._id = folder.id or self._id
+        self._name = folder.name
+        self._full_path = folder.full_path
+        self._parent_id = folder.parent_id
+        self._depth = folder.depth
+        self._child_count = folder.child_count
+        self._description = folder.description
+
     async def get_info(self) -> Dict[str, Any]:
         """
         Get detailed information about this folder.
@@ -448,6 +458,24 @@ class AsyncFolder(_AsyncScopedClientOps):
         self._description = info.description or self._description
         return info
 
+    async def move(self, new_path: str) -> "AsyncFolder":
+        """Move this folder to a new canonical path and refresh local metadata."""
+        identifier = self._id or self.full_path
+        if not identifier:
+            raise ValueError("Folder identifier is missing")
+        moved = await self._client.move_folder(identifier, new_path)
+        self._sync_from_folder(moved)
+        return moved
+
+    async def rename(self, new_name: str) -> "AsyncFolder":
+        """Rename this folder (leaf segment only) and refresh local metadata."""
+        identifier = self._id or self.full_path
+        if not identifier:
+            raise ValueError("Folder identifier is missing")
+        renamed = await self._client.rename_folder(identifier, new_name)
+        self._sync_from_folder(renamed)
+        return renamed
+
     async def get_summary(self) -> Summary:
         """Retrieve the latest summary for this folder."""
         identifier = self._id or self.full_path
@@ -492,7 +520,6 @@ class AsyncFolder(_AsyncScopedClientOps):
         return None
 
 
-
 class AsyncUserScope(_AsyncScopedClientOps):
     """
     A user scope that allows operations to be scoped to a specific end user and optionally a folder.
@@ -525,7 +552,6 @@ class AsyncUserScope(_AsyncScopedClientOps):
         return self._end_user_id
 
 
-
 class AsyncMorphik(_ScopedOperationsMixin):
     """
     Morphik client for document operations.
@@ -702,6 +728,50 @@ class AsyncMorphik(_ScopedOperationsMixin):
         response = await self._request("DELETE", f"folders/{folder_id_or_name}")
         return response
 
+    async def move_folder(self, folder_id_or_name: str, new_path: str) -> AsyncFolder:
+        """
+        Move and/or rename a folder by setting its new canonical path.
+
+        Args:
+            folder_id_or_name: Folder ID, name, or full path
+            new_path: Target full path (e.g. "/projects/archive/specs")
+
+        Returns:
+            AsyncFolder: Updated folder metadata
+        """
+        folder_param = build_folder_endpoint_identifier(folder_id_or_name)
+        payload = build_folder_move_payload(new_path=new_path)
+        response = await self._request("POST", f"folders/{folder_param}/move", data=payload)
+        info = FolderInfo(**response)
+        return AsyncFolder(
+            self,
+            info.name,
+            folder_id=info.id,
+            full_path=info.full_path,
+            parent_id=info.parent_id,
+            depth=info.depth,
+            child_count=info.child_count,
+            description=info.description,
+        )
+
+    async def rename_folder(self, folder_id_or_name: str, new_name: str) -> AsyncFolder:
+        """
+        Rename a folder by changing only its leaf segment.
+
+        Args:
+            folder_id_or_name: Folder ID, name, or full path
+            new_name: New folder name (single segment, no '/')
+
+        Returns:
+            AsyncFolder: Updated folder metadata
+        """
+        folder_param = build_folder_endpoint_identifier(folder_id_or_name)
+        current_info = FolderInfo(**(await self._request("GET", f"folders/{folder_param}")))
+        current_path = current_info.full_path or current_info.name
+        new_path = build_folder_rename_path(current_path=current_path, new_name=new_name)
+        move_identifier = current_info.id or folder_param
+        return await self.move_folder(move_identifier, new_path)
+
     async def get_folder_summary(self, folder_id_or_path: str) -> Summary:
         """Get the persisted summary for a folder."""
         folder_param = folder_id_or_path.lstrip("/") if folder_id_or_path else folder_id_or_path
@@ -996,9 +1066,7 @@ class AsyncMorphik(_ScopedOperationsMixin):
             return []
 
         # Use ingest_files with collected paths
-        return await self.ingest_files(
-            files=files, metadata=metadata, use_colpali=use_colpali, parallel=parallel
-        )
+        return await self.ingest_files(files=files, metadata=metadata, use_colpali=use_colpali, parallel=parallel)
 
     async def retrieve_chunks(
         self,
@@ -1947,42 +2015,18 @@ class AsyncMorphik(_ScopedOperationsMixin):
         self,
         *,
         name: str,
-        app_id: Optional[str] = None,
-        user_id: Optional[str] = None,
-        expiry_days: Optional[int] = None,
-        org_id: Optional[str] = None,
-        created_by_user_id: Optional[str] = None,
     ) -> Dict[str, str]:
         """Create a cloud app and return its authenticated URI (async)."""
-        payload = build_create_app_payload(
-            name=name,
-            app_id=app_id,
-            user_id=user_id,
-            expiry_days=expiry_days,
-            org_id=org_id,
-            created_by_user_id=created_by_user_id,
-        )
+        payload = build_create_app_payload(name=name)
         return await self._request("POST", "cloud/generate_uri", data=payload)
 
     async def generate_cloud_uri(
         self,
         *,
         name: str,
-        app_id: Optional[str] = None,
-        user_id: Optional[str] = None,
-        expiry_days: Optional[int] = None,
-        org_id: Optional[str] = None,
-        created_by_user_id: Optional[str] = None,
     ) -> Dict[str, str]:
         """Deprecated alias for create_app (async)."""
-        return await self.create_app(
-            name=name,
-            app_id=app_id,
-            user_id=user_id,
-            expiry_days=expiry_days,
-            org_id=org_id,
-            created_by_user_id=created_by_user_id,
-        )
+        return await self.create_app(name=name)
 
     async def requeue_ingestion_jobs(
         self,

{morphik-1.2.0 → morphik-1.2.2}/morphik/sync.py

@@ -11,19 +11,22 @@ from pydantic import BaseModel
 
 from ._internal import FinalChunkResult, _MorphikClientLogic
 from ._scoped_ops import _ScopedOperationsMixin
-from .models import CompletionResponse  # Prompt override models
 from ._shared import (
+    build_folder_endpoint_identifier,
+    build_folder_move_payload,
+    build_folder_rename_path,
     build_create_app_payload,
     build_document_by_filename_params,
     build_list_apps_params,
     build_logs_params,
-    build_requeue_payload,
     build_rename_app_params,
+    build_requeue_payload,
     build_rotate_app_params,
     collect_directory_files,
     merge_folders,
     normalize_additional_folders,
 )
+from .models import CompletionResponse  # Prompt override models
 from .models import (
     AppStorageUsageResponse,
     ChunkSource,
@@ -136,9 +139,7 @@ class _ScopedClientOps:
         if not files:
             return []
 
-        return self.ingest_files(
-            files=files, metadata=metadata, use_colpali=use_colpali, parallel=parallel
-        )
+        return self.ingest_files(files=files, metadata=metadata, use_colpali=use_colpali, parallel=parallel)
 
     def query_document(
         self,
@@ -444,6 +445,15 @@ class Folder(_ScopedClientOps):
         """Returns the folder ID if available."""
         return self._id
 
+    def _sync_from_folder(self, folder: "Folder") -> None:
+        self._id = folder.id or self._id
+        self._name = folder.name
+        self._full_path = folder.full_path
+        self._parent_id = folder.parent_id
+        self._depth = folder.depth
+        self._child_count = folder.child_count
+        self._description = folder.description
+
     def get_info(self) -> Dict[str, Any]:
         """
         Get detailed information about this folder.
@@ -475,6 +485,24 @@ class Folder(_ScopedClientOps):
         self._description = info.description or self._description
         return info
 
+    def move(self, new_path: str) -> "Folder":
+        """Move this folder to a new canonical path and refresh local metadata."""
+        identifier = self._id or self.full_path
+        if not identifier:
+            raise ValueError("Folder identifier is missing")
+        moved = self._client.move_folder(identifier, new_path)
+        self._sync_from_folder(moved)
+        return moved
+
+    def rename(self, new_name: str) -> "Folder":
+        """Rename this folder (leaf segment only) and refresh local metadata."""
+        identifier = self._id or self.full_path
+        if not identifier:
+            raise ValueError("Folder identifier is missing")
+        renamed = self._client.rename_folder(identifier, new_name)
+        self._sync_from_folder(renamed)
+        return renamed
+
     def get_summary(self) -> Summary:
         """Retrieve the latest summary for this folder."""
         identifier = self._id or self.full_path
@@ -519,7 +547,6 @@ class Folder(_ScopedClientOps):
         return None
 
 
-
 class UserScope(_ScopedClientOps):
     """
     A user scope that allows operations to be scoped to a specific end user and optionally a folder.
@@ -552,7 +579,6 @@ class UserScope(_ScopedClientOps):
         return self._end_user_id
 
 
-
 class Morphik(_ScopedOperationsMixin):
     """
     Morphik client for document operations.
@@ -733,6 +759,50 @@ class Morphik(_ScopedOperationsMixin):
         response = self._request("DELETE", f"folders/{folder_id_or_name}")
         return response
 
+    def move_folder(self, folder_id_or_name: str, new_path: str) -> Folder:
+        """
+        Move and/or rename a folder by setting its new canonical path.
+
+        Args:
+            folder_id_or_name: Folder ID, name, or full path
+            new_path: Target full path (e.g. "/projects/archive/specs")
+
+        Returns:
+            Folder: Updated folder metadata
+        """
+        folder_param = build_folder_endpoint_identifier(folder_id_or_name)
+        payload = build_folder_move_payload(new_path=new_path)
+        response = self._request("POST", f"folders/{folder_param}/move", data=payload)
+        info = FolderInfo(**response)
+        return Folder(
+            self,
+            info.name,
+            folder_id=info.id,
+            full_path=info.full_path,
+            parent_id=info.parent_id,
+            depth=info.depth,
+            child_count=info.child_count,
+            description=info.description,
+        )
+
+    def rename_folder(self, folder_id_or_name: str, new_name: str) -> Folder:
+        """
+        Rename a folder by changing only its leaf segment.
+
+        Args:
+            folder_id_or_name: Folder ID, name, or full path
+            new_name: New folder name (single segment, no '/')
+
+        Returns:
+            Folder: Updated folder metadata
+        """
+        folder_param = build_folder_endpoint_identifier(folder_id_or_name)
+        current_info = FolderInfo(**self._request("GET", f"folders/{folder_param}"))
+        current_path = current_info.full_path or current_info.name
+        new_path = build_folder_rename_path(current_path=current_path, new_name=new_name)
+        move_identifier = current_info.id or folder_param
+        return self.move_folder(move_identifier, new_path)
+
     def get_folder_summary(self, folder_id_or_path: str) -> Summary:
         """Get the persisted summary for a folder."""
         folder_param = folder_id_or_path.lstrip("/") if folder_id_or_path else folder_id_or_path
@@ -1039,9 +1109,7 @@ class Morphik(_ScopedOperationsMixin):
             return []
 
         # Use ingest_files with collected paths
-        return self.ingest_files(
-            files=files, metadata=metadata, use_colpali=use_colpali, parallel=parallel
-        )
+        return self.ingest_files(files=files, metadata=metadata, use_colpali=use_colpali, parallel=parallel)
 
     def retrieve_chunks(
         self,
@@ -1984,42 +2052,18 @@ class Morphik(_ScopedOperationsMixin):
         self,
         *,
         name: str,
-        app_id: Optional[str] = None,
-        user_id: Optional[str] = None,
-        expiry_days: Optional[int] = None,
-        org_id: Optional[str] = None,
-        created_by_user_id: Optional[str] = None,
     ) -> Dict[str, str]:
         """Create a cloud app and return its authenticated URI."""
-        payload = build_create_app_payload(
-            name=name,
-            app_id=app_id,
-            user_id=user_id,
-            expiry_days=expiry_days,
-            org_id=org_id,
-            created_by_user_id=created_by_user_id,
-        )
+        payload = build_create_app_payload(name=name)
         return self._request("POST", "cloud/generate_uri", data=payload)
 
     def generate_cloud_uri(
         self,
         *,
         name: str,
-        app_id: Optional[str] = None,
-        user_id: Optional[str] = None,
-        expiry_days: Optional[int] = None,
-        org_id: Optional[str] = None,
-        created_by_user_id: Optional[str] = None,
     ) -> Dict[str, str]:
         """Deprecated alias for create_app."""
-        return self.create_app(
-            name=name,
-            app_id=app_id,
-            user_id=user_id,
-            expiry_days=expiry_days,
-            org_id=org_id,
-            created_by_user_id=created_by_user_id,
-        )
+        return self.create_app(name=name)
 
     def requeue_ingestion_jobs(
         self,

{morphik-1.2.0 → morphik-1.2.2}/morphik/tests/test_app_ops.py

@@ -1,5 +1,4 @@
 import pytest
-
 from morphik.async_ import AsyncMorphik
 from morphik.models import DetailedHealthCheckResponse, LogResponse, RequeueIngestionJob
 from morphik.sync import Morphik
@@ -102,10 +101,10 @@ def test_sync_app_ops_payloads():
         assert call["endpoint"] == "apps/rotate_token"
         assert call["params"] == {"app_name": "demo", "expiry_days": 10}
 
-        client.create_app(name="demo", org_id="org")
+        client.create_app(name="demo")
         call = calls.pop()
         assert call["endpoint"] == "cloud/generate_uri"
-        assert call["data"] == {"name": "demo", "org_id": "org"}
+        assert call["data"] == {"name": "demo"}
 
         client.requeue_ingestion_jobs(jobs=[RequeueIngestionJob(external_id="doc-1")])
         call = calls.pop()
@@ -146,10 +145,10 @@ async def test_async_app_ops_payloads():
         assert call["endpoint"] == "apps/rotate_token"
         assert call["params"] == {"app_id": "app-1"}
 
-        await client.create_app(name="demo", user_id="u1", expiry_days=30)
+        await client.create_app(name="demo")
         call = calls.pop()
         assert call["endpoint"] == "cloud/generate_uri"
-        assert call["data"] == {"name": "demo", "user_id": "u1", "expiry_days": 30}
+        assert call["data"] == {"name": "demo"}
 
         await client.requeue_ingestion_jobs(include_all=True, statuses=["failed"])
         call = calls.pop()