fcp-python 0.1.6__py3-none-any.whl → 0.2.0__py3-none-any.whl

fcp_python/bridge.py

@@ -47,8 +47,6 @@ slipstream fcp python_query "unused @file:src/utils.py"
 #### Refactoring
 ```
 slipstream fcp python "rename Config Settings"
-slipstream fcp python "extract validate @file:server.py @lines:15-30"
-slipstream fcp python "import os @file:main.py @line:5"
 ```
 
 #### Selectors
@@ -57,7 +55,6 @@ slipstream fcp python "import os @file:main.py @line:5"
 - `@module:NAME` — filter by module
 - `@kind:KIND` — function, class, method, variable, constant, module, property
 - `@line:N` — filter by line number
-- `@lines:N-M` — line range (for extract)
 - `@decorator:NAME` — filter by decorator (e.g. `@decorator:staticmethod`)
 """
 

fcp_python/domain/mutation.py

@@ -2,24 +2,13 @@
 
 from __future__ import annotations
 
-from pathlib import Path
-from urllib.parse import unquote, urlparse
-
 from fcp_core import VerbRegistry, parse_op, suggest, ParseError
 
-from fcp_python.lsp.types import (
-    CodeAction,
-    WorkspaceEdit,
-)
-from fcp_python.lsp.workspace_edit import apply_workspace_edit, ApplyResult
-from fcp_python.resolver.selectors import (
-    SelectorType,
-    parse_line_range,
-    parse_selector,
-)
+from fcp_python.lsp.types import WorkspaceEdit
+from fcp_python.lsp.workspace_edit import apply_workspace_edit
+from fcp_python.resolver.selectors import parse_selector
 
 from .format import (
-    format_code_action_choices,
     format_disambiguation,
     format_error,
     format_mutation_result,
@@ -49,42 +38,10 @@ async def dispatch_mutation(
     match op.verb:
         case "rename":
             return await handle_rename(model, op.positionals, op.selectors)
-        case "extract":
-            return await handle_extract(model, op.positionals, op.selectors)
-        case "import":
-            return await handle_import(model, op.positionals, op.selectors)
         case _:
             return format_error(f"verb '{op.verb}' is not a mutation.", None)
 
 
-async def ensure_file_synced(model: PythonModel, uri: str) -> None:
-    """Open a file in LSP if not already open, to sync with disk."""
-    client = model.lsp_client
-    if client is None:
-        return
-    parsed = urlparse(uri)
-    if parsed.scheme != "file":
-        return
-    path = Path(unquote(parsed.path))
-    text = path.read_text()
-    await client.did_open(uri, text)
-
-
-async def sync_after_edit(model: PythonModel, result: ApplyResult) -> None:
-    """After applying a WorkspaceEdit, sync all changed files with LSP."""
-    for uri, _ in result.files_changed:
-        await ensure_file_synced(model, uri)
-    for uri in result.files_created:
-        await ensure_file_synced(model, uri)
-
-
-def file_uri(model: PythonModel, file_value: str) -> str:
-    """Build a file URI from a selector value, using model root as base."""
-    if file_value.startswith("file://"):
-        return file_value
-    return f"{model.root_uri.rstrip('/')}/{file_value}"
-
-
 # -- rename ---------------------------------------------------------------
 
 async def handle_rename(
@@ -136,258 +93,3 @@ async def handle_rename(
         "rename", f"{old_name} → {new_name}", result, model.root_uri
     )
 
-
-# -- extract ---------------------------------------------------------------
-
-async def handle_extract(
-    model: PythonModel,
-    positionals: list[str],
-    selectors: list[str],
-) -> str:
-    if not positionals:
-        return format_error("extract requires FUNC_NAME.", None)
-    func_name = positionals[0]
-
-    parsed_selectors = [s for s in (parse_selector(sel) for sel in selectors) if s is not None]
-
-    file_sel = next((s for s in parsed_selectors if s.selector_type == SelectorType.FILE), None)
-    lines_sel = next((s for s in parsed_selectors if s.selector_type == SelectorType.LINES), None)
-
-    if file_sel is None:
-        return format_error("extract requires @file:PATH selector.", None)
-    if lines_sel is None:
-        return format_error("extract requires @lines:N-M selector.", None)
-
-    line_range = parse_line_range(lines_sel.value)
-    if line_range is None:
-        return format_error(
-            f"invalid line range '{lines_sel.value}'. Use @lines:N-M.", None
-        )
-    start_line, end_line = line_range
-
-    uri = file_uri(model, file_sel.value)
-    # Convert 1-indexed user lines to 0-indexed LSP
-    lsp_start = start_line - 1 if start_line > 0 else start_line
-    lsp_end = end_line - 1 if end_line > 0 else end_line
-
-    client = model.lsp_client
-    assert client is not None
-
-    try:
-        await ensure_file_synced(model, uri)
-    except Exception as e:
-        return format_error(f"extract: {e}", None)
-
-    params = {
-        "textDocument": {"uri": uri},
-        "range": {
-            "start": {"line": lsp_start, "character": 0},
-            "end": {"line": lsp_end, "character": 999},
-        },
-        "context": {
-            "diagnostics": [],
-            "only": ["refactor.extract.function", "refactor.extract"],
-            "triggerKind": 1,
-        },
-    }
-
-    try:
-        raw_actions = await client.request("textDocument/codeAction", params)
-    except Exception as e:
-        return format_error(f"extract failed: {e}", None)
-
-    if not raw_actions:
-        raw_actions = []
-
-    actions = [CodeAction.from_dict(a) for a in raw_actions]
-    extract_actions = [
-        a for a in actions
-        if a.kind and a.kind.startswith("refactor.extract")
-    ]
-
-    if not extract_actions:
-        return format_error("no extract action available for the selected range.", None)
-
-    if len(extract_actions) == 1:
-        action = extract_actions[0]
-    else:
-        # Prefer "Extract into function" over others
-        func_action = next(
-            (a for a in extract_actions if "function" in a.title.lower()), None
-        )
-        if func_action:
-            action = func_action
-        else:
-            preferred = next((a for a in extract_actions if a.is_preferred), None)
-            if preferred:
-                action = preferred
-            else:
-                return format_code_action_choices(extract_actions)
-
-    if action.edit is None:
-        return format_error("extract action has no edit.", None)
-
-    try:
-        apply_result = apply_workspace_edit(action.edit)
-    except Exception as e:
-        return format_error(f"failed to apply extract: {e}", None)
-
-    # Sync changed files
-    try:
-        await sync_after_edit(model, apply_result)
-    except Exception:
-        pass
-
-    # Follow-up rename: pylsp/rope generates a placeholder name.
-    rename_result = await _follow_up_rename(model, uri, func_name)
-
-    if rename_result is not None:
-        return format_mutation_result("extract", func_name, rename_result, model.root_uri)
-    return format_mutation_result("extract", func_name, apply_result, model.root_uri)
-
-
-async def _follow_up_rename(
-    model: PythonModel,
-    uri: str,
-    desired_name: str,
-) -> ApplyResult | None:
-    """After extract, rename the generated function to the user's desired name."""
-    client = model.lsp_client
-    if client is None:
-        return None
-
-    parsed = urlparse(uri)
-    if parsed.scheme != "file":
-        return None
-    path = Path(unquote(parsed.path))
-    try:
-        content = path.read_text()
-    except Exception:
-        return None
-
-    # Rope generates "extracted_function" or similar placeholder names
-    for generated_name in ["extracted_function", "extracted_method", "extracted_variable"]:
-        fn_pattern = f"def {generated_name}"
-        byte_offset = content.find(fn_pattern)
-        if byte_offset >= 0:
-            name_offset = byte_offset + 4  # "def ".len()
-            line = content[:name_offset].count("\n")
-            last_newline = content.rfind("\n", 0, name_offset)
-            col = name_offset - (last_newline + 1) if last_newline >= 0 else name_offset
-
-            params = {
-                "textDocument": {"uri": uri},
-                "position": {"line": line, "character": col},
-                "newName": desired_name,
-            }
-            try:
-                raw_edit = await client.request("textDocument/rename", params)
-                if raw_edit:
-                    workspace_edit = WorkspaceEdit.from_dict(raw_edit)
-                    return apply_workspace_edit(workspace_edit)
-            except Exception:
-                pass
-            break
-
-    return None
-
-
-# -- import ---------------------------------------------------------------
-
-async def handle_import(
-    model: PythonModel,
-    positionals: list[str],
-    selectors: list[str],
-) -> str:
-    if not positionals:
-        return format_error("import requires SYMBOL.", None)
-    symbol_name = positionals[0]
-
-    parsed_selectors = [s for s in (parse_selector(sel) for sel in selectors) if s is not None]
-
-    file_sel = next((s for s in parsed_selectors if s.selector_type == SelectorType.FILE), None)
-    line_sel = next((s for s in parsed_selectors if s.selector_type == SelectorType.LINE), None)
-
-    if file_sel is None:
-        return format_error("import requires @file:PATH selector.", None)
-    if line_sel is None:
-        return format_error("import requires @line:N selector.", None)
-
-    try:
-        line_num = int(line_sel.value)
-    except ValueError:
-        return format_error("invalid line number.", None)
-
-    uri = file_uri(model, file_sel.value)
-    lsp_line = line_num - 1 if line_num > 0 else line_num
-
-    client = model.lsp_client
-    assert client is not None
-
-    try:
-        await ensure_file_synced(model, uri)
-    except Exception as e:
-        return format_error(f"import: {e}", None)
-
-    params = {
-        "textDocument": {"uri": uri},
-        "range": {
-            "start": {"line": lsp_line, "character": 0},
-            "end": {"line": lsp_line, "character": 999},
-        },
-        "context": {
-            "diagnostics": [],
-            "only": ["quickfix", "source", "source.organizeImports"],
-            "triggerKind": 1,
-        },
-    }
-
-    try:
-        raw_actions = await client.request("textDocument/codeAction", params)
-    except Exception as e:
-        return format_error(f"import failed: {e}", None)
-
-    if not raw_actions:
-        raw_actions = []
-
-    actions = [CodeAction.from_dict(a) for a in raw_actions]
-    symbol_lower = symbol_name.lower()
-
-    import_actions = [
-        a for a in actions
-        if (
-            (a.kind and (
-                "import" in a.kind
-                or a.kind == "quickfix"
-                or a.kind.startswith("source")
-            ))
-            or "import" in a.title.lower()
-            or "use " in a.title.lower()
-        )
-        and symbol_lower in a.title.lower()
-    ]
-
-    if not import_actions:
-        return format_error(
-            f"no import action for '{symbol_name}' at {file_sel.value}:{line_num}.",
-            None,
-        )
-
-    if len(import_actions) == 1:
-        action = import_actions[0]
-    else:
-        preferred = next((a for a in import_actions if a.is_preferred), None)
-        if preferred:
-            action = preferred
-        else:
-            return format_code_action_choices(import_actions)
-
-    if action.edit is None:
-        return format_error("import action has no edit.", None)
-
-    try:
-        result = apply_workspace_edit(action.edit)
-    except Exception as e:
-        return format_error(f"failed to apply import: {e}", None)
-
-    return format_mutation_result("import", symbol_name, result, model.root_uri)

fcp_python/domain/verbs.py

@@ -24,8 +24,6 @@ def register_query_verbs(registry: VerbRegistry) -> None:
 def register_mutation_verbs(registry: VerbRegistry) -> None:
     registry.register_many([
         VerbSpec(verb="rename", syntax="rename SYMBOL NEW_NAME [@selectors...]", category="mutation"),
-        VerbSpec(verb="extract", syntax="extract FUNC_NAME @file:PATH @lines:N-M", category="mutation"),
-        VerbSpec(verb="import", syntax="import SYMBOL @file:PATH @line:N", category="mutation"),
     ])
 
 

fcp_python/main.py

@@ -55,9 +55,7 @@ _registry = _make_registry()
 @mcp.tool(
     description=(
         "Execute Python mutation operations. Examples: "
-        "'rename Config Settings', "
-        "'extract validate @file:server.py @lines:15-30', "
-        "'import os @file:main.py @line:5'"
+        "'rename Config Settings'"
     )
 )
 async def python(ops: list[str]) -> str:
@@ -108,13 +106,10 @@ async def python_help() -> str:
             "  @kind:KIND      — filter by symbol kind (function, class, method, variable, ...)\n"
             "  @module:NAME    — filter by module\n"
             "  @line:N         — filter by line number\n"
-            "  @lines:N-M      — line range for extract\n"
             "  @decorator:NAME — filter by decorator"
         ),
         "Mutation Examples": (
-            '  python ["rename Config Settings"]              — cross-file semantic rename\n'
-            '  python ["extract validate @file:server.py @lines:15-30"] — extract function\n'
-            '  python ["import os @file:main.py @line:5"]     — add missing import'
+            '  python ["rename Config Settings"]              — cross-file semantic rename'
         ),
     }
     return _registry.generate_reference_card(extra)

{fcp_python-0.1.6.dist-info → fcp_python-0.2.0.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: fcp-python
-Version: 0.1.6
+Version: 0.2.0
 Summary: Python Code Intelligence FCP — semantic Python code operations for LLMs via pylsp
 Requires-Python: <3.14,>=3.11
 Requires-Dist: fastmcp>=3.0
-Requires-Dist: fcp-core>=0.1.17
+Requires-Dist: fcp-core>=0.2.0
 Requires-Dist: python-lsp-server[rope]>=1.12

{fcp_python-0.1.6.dist-info → fcp_python-0.2.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 fcp_python/__init__.py,sha256=jXbt2O90IFhcdC8JQ4qr2zYFSlz1Zvpml9hEam5JstU,58
-fcp_python/bridge.py,sha256=UmwubXf8BLAFYv8qvn08oUbduGpwifIx_ZJJFqafl9A,5907
-fcp_python/main.py,sha256=Q5Z9iMSDjpPWcRa8nH06xNLPBLi75OHOwENhCm4xiJM,9467
+fcp_python/bridge.py,sha256=2hiVRmJJotgCZFVRvZ9BZf3X4rLo5-ILyXmbxNL1dbA,5737
+fcp_python/main.py,sha256=aUQ50PTUCWvW30AnD6TkYo2n69flryVCyE1MHRtwvVc,9116
 fcp_python/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fcp_python/domain/format.py,sha256=9oHtn3d9vvRT28DrJxNs9m-YpIWjfjIr-pMWF5Tu4v0,7311
 fcp_python/domain/model.py,sha256=yI2kVvEWv50wICqqmrHV_302EVMtZd_t1v1X50ZonO8,1458
-fcp_python/domain/mutation.py,sha256=ggkm-4zY9rTHfNYYWEcfGNok14MFXUS6_nsBVXaQqoU,12578
+fcp_python/domain/mutation.py,sha256=ZiTRZdZI0zqqFpFZ-v8CWtNzpMO8L9tcsV_yMipqM1A,2987
 fcp_python/domain/query.py,sha256=KFve1HFAKwyHJPgT1INEQ97jieUUDvhswho-NHqrxkc,21706
-fcp_python/domain/verbs.py,sha256=3u2SJ5do1UKXSA39KaCDvdTkhMXHpUAhm363kEQKDXs,1919
+fcp_python/domain/verbs.py,sha256=-w5zY1BPJmVCOC1a-0xd3uj5EAjpNN4UeY-e51LRLbI,1717
 fcp_python/lsp/__init__.py,sha256=Kai6_M5ap1qjrLEfpkdcVZenIzQDQHMUu28JscQg_kM,39
 fcp_python/lsp/client.py,sha256=H-I1Hq8ayAUimGcsMpiLmFZcdYHRvQBL0jYG--F51JU,6428
 fcp_python/lsp/lifecycle.py,sha256=i-b61LGOeQxZIUjUAf_oR8nMqS7rnGR52EYb9KM3zHc,2774
@@ -17,7 +17,7 @@ fcp_python/resolver/__init__.py,sha256=9ImXXfUvA0TWGDZx1GMniKzav7SKT9q9u1C_0EOZE
 fcp_python/resolver/index.py,sha256=9y56ZoBNqwl8a4_Ue54ZBjNWzj3kZ548miIZvab_90k,1859
 fcp_python/resolver/pipeline.py,sha256=cPqawRgQ3hxNKottcsco1RGLT4f2c3IWidqnuSzhh7c,3174
 fcp_python/resolver/selectors.py,sha256=u_NQdp6eU2fPSKnSpWNhTZbxwy6OgvxVTR3pKdB_7Rg,5070
-fcp_python-0.1.6.dist-info/METADATA,sha256=-q3_LDxfvfDxcjoGJ_vWaF-n46AvjhG6S0BOIlDZre0,282
-fcp_python-0.1.6.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-fcp_python-0.1.6.dist-info/entry_points.txt,sha256=iSyoGO8uLz21KTX8mL3twnRXWsuc7-8O3U03WCSiJ_s,52
-fcp_python-0.1.6.dist-info/RECORD,,
+fcp_python-0.2.0.dist-info/METADATA,sha256=jEWXwfiHLz2iljasXFEDgbUPpPTP7cr6foGcA4UUxuI,281
+fcp_python-0.2.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+fcp_python-0.2.0.dist-info/entry_points.txt,sha256=iSyoGO8uLz21KTX8mL3twnRXWsuc7-8O3U03WCSiJ_s,52
+fcp_python-0.2.0.dist-info/RECORD,,

{fcp_python-0.1.6.dist-info → fcp_python-0.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.30.1
 Root-Is-Purelib: true
 Tag: py3-none-any