bcbd1bdb22
Integ / changes (push) Has been skipped
Pre-commit / pre-commit (push) Failing after 1s
CLI exit codes / changes (push) Has been skipped
Test (Install) / changes (push) Has been skipped
Test (Python) / changes (push) Has been skipped
Test (TypeScript) / changes (push) Has been skipped
CLI exit codes / cli-gate (push) Has been cancelled
Test (Install) / test-install-gate (push) Has been cancelled
Integ / integ-gate (push) Has been cancelled
Test (Python) / test-python-gate (push) Has been cancelled
Test (TypeScript) / test-typescript-gate (push) Has been cancelled
Test (Install) / python-minimal (3.12) (push) Has been cancelled
Test (Install) / python-minimal (3.11) (push) Has been cancelled
Test (Install) / python-extra (agno, mirage.agents.agno) (push) Has been cancelled
Test (Install) / python-extra (chroma, mirage.resource.chroma) (push) Has been cancelled
Test (Install) / python-extra (pdf, mirage.core.filetype.pdf) (push) Has been cancelled
Integ / integ (push) Has been cancelled
Integ / integ-database (push) Has been cancelled
Integ / integ-database-ts (push) Has been cancelled
Integ / integ-data (push) Has been cancelled
Integ / integ-ssh (push) Has been cancelled
Integ / integ-ssh-ts (push) Has been cancelled
Test (Python) / audit (push) Has been cancelled
Test (TypeScript) / test (push) Has been cancelled
Test (TypeScript) / python-fs-shim (push) Has been cancelled
CLI exit codes / Python CLI (push) Has been cancelled
CLI exit codes / TypeScript CLI (push) Has been cancelled
CLI exit codes / Cross-language snapshot interop (push) Has been cancelled
Test (Python) / test (push) Has been cancelled
Test (Python) / import-isolation (deepagents, openai, mirage.agents.openai_agents) (push) Has been cancelled
Test (Python) / import-isolation (deepagents, pydantic-ai, mirage.agents.pydantic_ai) (push) Has been cancelled
Integ / integ-ts (push) Has been cancelled
Integ / integ-fuse (push) Has been cancelled
Test (Install) / python-extra (databricks, mirage.resource.databricks_volume) (push) Has been cancelled
Test (Install) / python-extra (deepagents, mirage.agents.langchain) (push) Has been cancelled
Test (Install) / python-extra (email, mirage.resource.email) (push) Has been cancelled
Test (Install) / python-extra (fuse, mirage.fuse.mount) (push) Has been cancelled
Test (Install) / python-extra (hdf5, mirage.core.filetype.hdf5) (push) Has been cancelled
Test (Install) / python-extra (hf, mirage.resource.hf_buckets) (push) Has been cancelled
Test (Install) / python-extra (lancedb, mirage.resource.lancedb) (push) Has been cancelled
Test (Install) / python-extra (langfuse, mirage.resource.langfuse) (push) Has been cancelled
Test (Install) / python-extra (mongodb, mirage.resource.mongodb) (push) Has been cancelled
Test (Install) / python-extra (nextcloud, mirage.resource.nextcloud) (push) Has been cancelled
Test (Install) / python-extra (openai, mirage.agents.openai_agents) (push) Has been cancelled
Test (Install) / python-extra (openhands, mirage.agents.openhands, 3.12) (push) Has been cancelled
Test (Install) / python-extra (parquet, mirage.core.filetype.parquet) (push) Has been cancelled
Test (Install) / python-extra (postgres, mirage.resource.postgres) (push) Has been cancelled
Test (Install) / python-extra (pydantic-ai, mirage.agents.pydantic_ai) (push) Has been cancelled
Test (Install) / python-extra (qdrant, mirage.resource.qdrant) (push) Has been cancelled
Test (Install) / python-extra (redis, mirage.resource.redis) (push) Has been cancelled
Test (Install) / python-extra (s3, mirage.resource.s3) (push) Has been cancelled
Test (Install) / python-extra (ssh, mirage.resource.ssh) (push) Has been cancelled
Test (Install) / ts-minimal (push) Has been cancelled
88 lines
2.7 KiB
Python
88 lines
2.7 KiB
Python
from collections.abc import Awaitable, Callable
|
|
|
|
from mirage.accessor.base import Accessor
|
|
from mirage.commands.builtin.utils.lines import split_lines
|
|
from mirage.commands.spec.types import CommandName
|
|
from mirage.commands.spec.usage import extra_operand_error
|
|
from mirage.io.types import ByteSource, IOResult
|
|
from mirage.types import PathSpec
|
|
|
|
|
|
def _comm_merge(lines1: list[str], lines2: list[str]) -> list[tuple[int, str]]:
|
|
result: list[tuple[int, str]] = []
|
|
i, j = 0, 0
|
|
while i < len(lines1) and j < len(lines2):
|
|
if lines1[i] < lines2[j]:
|
|
result.append((1, lines1[i]))
|
|
i += 1
|
|
elif lines1[i] > lines2[j]:
|
|
result.append((2, lines2[j]))
|
|
j += 1
|
|
else:
|
|
result.append((3, lines1[i]))
|
|
i += 1
|
|
j += 1
|
|
while i < len(lines1):
|
|
result.append((1, lines1[i]))
|
|
i += 1
|
|
while j < len(lines2):
|
|
result.append((2, lines2[j]))
|
|
j += 1
|
|
return result
|
|
|
|
|
|
def _format_comm(
|
|
merged: list[tuple[int, str]],
|
|
suppress1: bool,
|
|
suppress2: bool,
|
|
suppress3: bool,
|
|
) -> str:
|
|
out: list[str] = []
|
|
for col, text in merged:
|
|
if col == 1 and not suppress1:
|
|
out.append(text)
|
|
elif col == 2 and not suppress2:
|
|
prefix = "" if suppress1 else "\t"
|
|
out.append(prefix + text)
|
|
elif col == 3 and not suppress3:
|
|
prefix = ""
|
|
if not suppress1:
|
|
prefix += "\t"
|
|
if not suppress2:
|
|
prefix += "\t"
|
|
out.append(prefix + text)
|
|
return "\n".join(out) + "\n" if out else ""
|
|
|
|
|
|
async def comm(
|
|
paths: list[PathSpec],
|
|
*,
|
|
read_bytes: Callable[..., Awaitable[bytes]],
|
|
accessor: Accessor | None = None,
|
|
suppress1: bool = False,
|
|
suppress2: bool = False,
|
|
suppress3: bool = False,
|
|
check_order: bool = False,
|
|
) -> tuple[ByteSource | None, IOResult]:
|
|
if len(paths) > 2:
|
|
raise extra_operand_error(CommandName.COMM, paths[2].raw_path)
|
|
if len(paths) < 2:
|
|
raise ValueError("comm: requires two paths")
|
|
data1 = (await read_bytes(accessor, paths[0])).decode(errors="replace")
|
|
data2 = (await read_bytes(accessor, paths[1])).decode(errors="replace")
|
|
lines1 = split_lines(data1)
|
|
lines2 = split_lines(data2)
|
|
stderr = ""
|
|
if check_order:
|
|
if lines1 != sorted(lines1):
|
|
stderr = "comm: file 1 is not in sorted order\n"
|
|
elif lines2 != sorted(lines2):
|
|
stderr = "comm: file 2 is not in sorted order\n"
|
|
merged = _comm_merge(lines1, lines2)
|
|
output = _format_comm(merged, suppress1, suppress2, suppress3)
|
|
return output.encode(), IOResult(
|
|
stderr=stderr.encode() if stderr else None)
|
|
|
|
|
|
__all__ = ["comm"]
|