one_on_one -> relationship_type

Author: straeter

everyrow-mcp/src/everyrow_mcp/server.py

@@ -352,9 +352,9 @@ class MergeInput(BaseModel):
         default=None,
         description='Optional. Control web search behavior: "auto" tries LLM merge first then conditionally searches, "no" skips web search entirely, "yes" forces web search on every row. Defaults to "auto" if not provided.',
     )
-    one_on_one: bool | None = Field(
+    relationship_type: Literal["many_to_one", "one_to_one"] | None = Field(
         default=None,
-        description="Optional boolean parameter for one-on-one merge mode. Defaults to None/False.",
+        description='Optional. Control merge relationship type: "many_to_one" (default) allows multiple left rows to match one right row, "one_to_one" enforces unique matching between left and right rows.',
     )
 
     @field_validator("left_csv", "right_csv")
@@ -398,7 +398,7 @@ async def everyrow_merge(params: MergeInput) -> str:
         merge_on_left=params.merge_on_left,
         merge_on_right=params.merge_on_right,
         use_web_search=params.use_web_search,
-        one_on_one=params.one_on_one,
+        relationship_type=params.relationship_type,
     )
 
     output_file = resolve_output_path(params.output_path, params.left_csv, "merged")

src/everyrow/generated/models/__init__.py

@@ -24,6 +24,7 @@
 from .merge_operation_left_input_type_1_item import MergeOperationLeftInputType1Item
 from .merge_operation_left_input_type_2 import MergeOperationLeftInputType2
 from .merge_operation_right_input_type_1_item import MergeOperationRightInputType1Item
+from .merge_operation_relationship_type_type_0 import MergeOperationRelationshipTypeType0
 from .merge_operation_right_input_type_2 import MergeOperationRightInputType2
 from .merge_operation_use_web_search_type_0 import MergeOperationUseWebSearchType0
 from .operation_response import OperationResponse
@@ -75,6 +76,7 @@
     "MergeOperationLeftInputType1Item",
     "MergeOperationLeftInputType2",
     "MergeOperationRightInputType1Item",
+    "MergeOperationRelationshipTypeType0",
     "MergeOperationRightInputType2",
     "MergeOperationUseWebSearchType0",
     "OperationResponse",

src/everyrow/generated/models/merge_operation.py

@@ -8,6 +8,7 @@
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
+from ..models.merge_operation_relationship_type_type_0 import MergeOperationRelationshipTypeType0
 from ..models.merge_operation_use_web_search_type_0 import MergeOperationUseWebSearchType0
 from ..types import UNSET, Unset
 
@@ -35,11 +36,9 @@ class MergeOperation:
         use_web_search (MergeOperationUseWebSearchType0 | None | Unset): Control web search behavior: 'auto' (default)
             tries LLM merge first then conditionally searches, 'no' skips web search entirely, 'yes' forces web search
             without initial LLM merge Default: MergeOperationUseWebSearchType0.AUTO.
-<<<<<<< HEAD
-        one_on_one (bool | None | Unset): Optional boolean parameter for one-on-one merge mode. Defaults to None/False.
-=======
-        one_on_one (bool | None | Unset): Optional parameter for one-on-one merge behavior
->>>>>>> main
+        relationship_type (MergeOperationRelationshipTypeType0 | None | Unset): Control relationship type:
+            'many_to_one' (default) allows multiple left rows to match one right row,
+            'one_to_one' enforces unique matching between left and right rows.
         session_id (None | Unset | UUID): Session ID. If not provided, a new session is auto-created for this task.
     """
 
@@ -49,7 +48,7 @@ class MergeOperation:
     left_key: None | str | Unset = UNSET
     right_key: None | str | Unset = UNSET
     use_web_search: MergeOperationUseWebSearchType0 | None | Unset = MergeOperationUseWebSearchType0.AUTO
-    one_on_one: bool | None | Unset = UNSET
+    relationship_type: MergeOperationRelationshipTypeType0 | None | Unset = UNSET
     session_id: None | Unset | UUID = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
@@ -100,11 +99,13 @@ def to_dict(self) -> dict[str, Any]:
         else:
             use_web_search = self.use_web_search
 
-        one_on_one: bool | None | Unset
-        if isinstance(self.one_on_one, Unset):
-            one_on_one = UNSET
+        relationship_type: None | str | Unset
+        if isinstance(self.relationship_type, Unset):
+            relationship_type = UNSET
+        elif isinstance(self.relationship_type, MergeOperationRelationshipTypeType0):
+            relationship_type = self.relationship_type.value
         else:
-            one_on_one = self.one_on_one
+            relationship_type = self.relationship_type
 
         session_id: None | str | Unset
         if isinstance(self.session_id, Unset):
@@ -129,8 +130,8 @@ def to_dict(self) -> dict[str, Any]:
             field_dict["right_key"] = right_key
         if use_web_search is not UNSET:
             field_dict["use_web_search"] = use_web_search
-        if one_on_one is not UNSET:
-            field_dict["one_on_one"] = one_on_one
+        if relationship_type is not UNSET:
+            field_dict["relationship_type"] = relationship_type
         if session_id is not UNSET:
             field_dict["session_id"] = session_id
 
@@ -246,14 +247,22 @@ def _parse_use_web_search(data: object) -> MergeOperationUseWebSearchType0 | Non
 
         use_web_search = _parse_use_web_search(d.pop("use_web_search", UNSET))
 
-        def _parse_one_on_one(data: object) -> bool | None | Unset:
+        def _parse_relationship_type(data: object) -> MergeOperationRelationshipTypeType0 | None | Unset:
             if data is None:
                 return data
             if isinstance(data, Unset):
                 return data
-            return cast(bool | None | Unset, data)
+            try:
+                if not isinstance(data, str):
+                    raise TypeError()
+                relationship_type_type_0 = MergeOperationRelationshipTypeType0(data)
+
+                return relationship_type_type_0
+            except (TypeError, ValueError, AttributeError, KeyError):
+                pass
+            return cast(MergeOperationRelationshipTypeType0 | None | Unset, data)
 
-        one_on_one = _parse_one_on_one(d.pop("one_on_one", UNSET))
+        relationship_type = _parse_relationship_type(d.pop("relationship_type", UNSET))
 
         def _parse_session_id(data: object) -> None | Unset | UUID:
             if data is None:
@@ -279,7 +288,7 @@ def _parse_session_id(data: object) -> None | Unset | UUID:
             left_key=left_key,
             right_key=right_key,
             use_web_search=use_web_search,
-            one_on_one=one_on_one,
+            relationship_type=relationship_type,
             session_id=session_id,
         )
 

src/everyrow/generated/models/merge_operation_relationship_type_type_0.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+class MergeOperationRelationshipTypeType0(str, Enum):
+    MANY_TO_ONE = "many_to_one"
+    ONE_TO_ONE = "one_to_one"
+
+    def __str__(self) -> str:
+        return str(self.value)

src/everyrow/ops.py

@@ -545,7 +545,7 @@ async def merge(
     merge_on_left: str | None = None,
     merge_on_right: str | None = None,
     use_web_search: Literal["auto", "yes", "no"] | None = None,
-    one_on_one: bool | None = None,
+    relationship_type: Literal["many_to_one", "one_to_one"] | None = None,
 ) -> MergeResult:
     """Merge two tables using AI.
 
@@ -557,7 +557,7 @@ async def merge(
         merge_on_left: Optional column name in left table to merge on
         merge_on_right: Optional column name in right table to merge on
         use_web_search: Optional. Control web search behavior: "auto" tries LLM merge first then conditionally searches, "no" skips web search entirely, "yes" forces web search on every row. Defaults to "auto" if not provided.
-        one_on_one: Optional boolean parameter for one-on-one merge mode. Defaults to None/False.
+        relationship_type: Optional. Control merge relationship type: "many_to_one" (default) allows multiple left rows to match one right row, "one_to_one" enforces unique matching between left and right rows.
 
     Returns:
         MergeResult containing the merged table and match breakdown by method (exact, fuzzy, llm, web)
@@ -580,7 +580,7 @@ async def merge(
                 merge_on_left=merge_on_left,
                 merge_on_right=merge_on_right,
                 use_web_search=use_web_search,
-                one_on_one=one_on_one,
+                relationship_type=relationship_type,
             )
             return await merge_task.await_result()
     merge_task = await merge_async(
@@ -591,7 +591,7 @@ async def merge(
         merge_on_left=merge_on_left,
         merge_on_right=merge_on_right,
         use_web_search=use_web_search,
-        one_on_one=one_on_one,
+        relationship_type=relationship_type,
     )
     return await merge_task.await_result()
 
@@ -604,7 +604,7 @@ async def merge_async(
     merge_on_left: str | None = None,
     merge_on_right: str | None = None,
     use_web_search: Literal["auto", "yes", "no"] | None = None,
-    one_on_one: bool | None = None,
+    relationship_type: Literal["many_to_one", "one_to_one"] | None = None,
 ) -> MergeTask:
     """Submit a merge task asynchronously.
 
@@ -621,7 +621,7 @@ async def merge_async(
         left_key=merge_on_left or UNSET,
         right_key=merge_on_right or UNSET,
         use_web_search=use_web_search or UNSET,  # type: ignore
-        one_on_one=one_on_one or UNSET,  # type: ignore
+        relationship_type=relationship_type or UNSET,  # type: ignore
         session_id=session.session_id,
     )