operx-cli 0.7.5__tar.gz → 0.7.7__tar.gz

{operx_cli-0.7.5 → operx_cli-0.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: operx-cli
-Version: 0.7.5
+Version: 0.7.7
 Summary: La línea de comandos de OperX: tu empresa desde la terminal, con tu token de API.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{operx_cli-0.7.5 → operx_cli-0.7.7}/operx_cli/AGENTES.md

@@ -105,6 +105,13 @@ llamada queda en el historial del token, marcada como hecha desde la CLI.
 - El responsable de una acción es una persona de la empresa (su nombre o
   código exacto) o, si no está en la empresa, alguien de afuera por su nombre:
   `operx` avisa cuál de las dos tomó.
+- Muestreo: `muestreo campanas`, `campana`, `relojes` e `informes` leen.
+  Planear va por `operx api`: campañas y sus visitas, puntos y sus límites, y
+  lotes de etiquetas (las rutas `sampling/…`; los ids de clientes, puntos,
+  personas y parámetros, en `operx api GET sampling/options/`). Las entregas
+  de muestras, la recepción, confirmar resultados, anular una etiqueta, las
+  fotos y los PDF con firmas o fotos (cadena de custodia, actas, paquete) son
+  de la app.
 - `operx personas importar ARCHIVO` sin `--confirmar` solo revisa el archivo
   y no guarda nada: hazlo primero y muéstrale el resultado a la persona.
 - Un acceso de solo lectura no escribe: la API responde 403.
@@ -257,4 +264,12 @@ operx sst acciones --estado abiertas --json
 # Lo que vence este mes en lo ambiental, y registrar residuos
 operx ambiental obligaciones --json
 operx ambiental residuo --corriente "Aceite usado" --kg 12,5 --si --json
+
+# Los frascos de Muestreo que vencen hoy, y las campañas a las que les falta algo
+operx muestreo relojes --horas 24 --json
+operx muestreo informes --pendientes --json
+
+# Una campaña de muestreo con su visita (no tiene comando propio): primero los ids
+operx api GET sampling/options/ --json
+operx api POST sampling/campaigns/ -d '{"name": "Seguimiento trimestral", "customer": 4, "starts_on": "2026-11-10", "ends_on": "2026-11-10", "visits": [{"point": 12, "planned_at": "2026-11-10T08:00:00-05:00", "parameters": ["pH", "DBO₅"]}]}' --si --json
 ```

{operx_cli-0.7.5 → operx_cli-0.7.7}/operx_cli/__init__.py

@@ -2,4 +2,4 @@
 API (backend/users/api_allowlist.py) from a terminal, with a personal API
 token."""
 
-__version__ = "0.7.5"
+__version__ = "0.7.7"

{operx_cli-0.7.5 → operx_cli-0.7.7}/operx_cli/app.py

@@ -14,7 +14,7 @@ from . import __version__, settings, shell
 from .agent_guide import guide_text
 from .client import ApiError
 from .commands import (
-    account, ambiental, articulos, avisos, campos, completar, inventario, lecturas, ordenes, personas, planta,
+    account, ambiental, articulos, avisos, campos, completar, inventario, lecturas, muestreo, ordenes, personas, planta,
     preventivos, raw, registros, reportes, rutinas, search, sst, update,
 )
 from .commands.common import CliError, Session
@@ -160,6 +160,7 @@ app.add_typer(campos.app, name="campos")
 app.add_typer(reportes.app, name="reportes")
 app.add_typer(sst.app, name="sst")
 app.add_typer(ambiental.app, name="ambiental")
+app.add_typer(muestreo.app, name="muestreo")
 
 
 @app.command()

operx_cli-0.7.7/operx_cli/commands/muestreo.py

@@ -0,0 +1,197 @@
+"""`operx muestreo`: Muestreo, for the lab's coordinator or an agent: the
+campaigns and what each visit took, the bottles' clocks, and what each
+campaign still needs before its report goes to the client. Planning, label
+batches and the files go through `operx api` (AGENTES.md); signatures,
+receptions and confirming results stay in the app."""
+
+from datetime import datetime, timezone
+from enum import Enum
+from typing import Annotated, Optional
+
+import typer
+
+from ..lookup import find_in
+from ..output import print_card, print_record, print_rows
+from ..values import shown_moment
+from .common import AllOption, CliError, CsvOption, JsonOption, SearchOption, client_of, list_rows, output_format
+
+app = typer.Typer(help="Muestreo: campañas, relojes de los frascos e informes para el cliente.", no_args_is_help=True)
+
+CAMPAIGN_STATUS = {"planned": "Planeada", "in_field": "En campo", "closed": "Cerrada", "cancelled": "Cancelada"}
+VISIT_STATUS = {"pending": "Por hacer", "done": "Tomada", "not_done": "No se hizo"}
+WHERE = {"in_field": "Con quien muestreó", "in_transit": "En camino al laboratorio"}
+
+CAMPAIGN_COLUMNS = [
+    ("code", "Código"), ("name", "Campaña"), ("customer_name", "Cliente"), ("dates", "Fechas"), ("status_label", "Estado"),
+    ("visits", "Visitas"), ("samples_text", "Muestras"),
+]
+VISIT_COLUMNS = [("label", "Visita"), ("when", "Cuándo"), ("sampler_name", "Muestrea"), ("status_label", "Estado"), ("sample_code", "Muestra")]
+CLOCK_COLUMNS = [
+    ("due", "Vence"), ("left", "Faltan"), ("label_code", "Etiqueta"), ("parameter", "Parámetro"), ("sample_code", "Muestra"),
+    ("campaign_code", "Campaña"), ("where_label", "Dónde"), ("holder", "Quién la tiene"),
+]
+REPORT_COLUMNS = [("code", "Campaña"), ("name", "Nombre"), ("customer", "Cliente"), ("state", "Estado"), ("progress", "Avance")]
+
+
+class EstadoCampana(str, Enum):
+    planeada = "planeada"
+    en_campo = "en-campo"
+    cerrada = "cerrada"
+    cancelada = "cancelada"
+
+
+CAMPAIGN_STATUS_OF = {"planeada": "planned", "en-campo": "in_field", "cerrada": "closed", "cancelada": "cancelled"}
+
+
+def _name(record):
+    return (record or {}).get("name") or ""
+
+
+def _dates(starts_on, ends_on):
+    start, end = shown_moment(starts_on), shown_moment(ends_on)
+    return start if start == end else f"{start} a {end}"
+
+
+def _samples_text(counts):
+    """{'in_field': 0, 'in_transit': 1, 'received': 2} → 'En camino 1 · Recibidas 2'."""
+    labels = [("in_field", "En campo"), ("in_transit", "En camino"), ("received", "Recibidas")]
+    return " · ".join(f"{label} {counts.get(key)}" for key, label in labels if counts.get(key))
+
+
+def _campaign_row(campaign):
+    return {
+        **campaign, "customer_name": _name(campaign.get("customer")) or "Sitios propios",
+        "dates": _dates(campaign.get("starts_on"), campaign.get("ends_on")),
+        "status_label": CAMPAIGN_STATUS.get(campaign.get("status"), campaign.get("status")),
+        "visits": f"{campaign.get('visits_done', 0)}/{campaign.get('visits_total', 0)}",
+        "samples_text": _samples_text(campaign.get("samples") or {}),
+    }
+
+
+def _matches(campaign, text):
+    wanted = text.casefold()
+    return any(wanted in str(value or "").casefold() for value in (campaign.get("code"), campaign.get("name"), _name(campaign.get("customer"))))
+
+
+@app.command()
+def campanas(
+    ctx: typer.Context,
+    estado: Annotated[Optional[EstadoCampana], typer.Option("--estado", help="Solo las de este estado.")] = None,
+    buscar: SearchOption = None,
+    as_json: JsonOption = False,
+    as_csv: CsvOption = False,
+):
+    """Las campañas de muestreo: cliente, fechas, estado, visitas tomadas y muestras."""
+    rows = client_of(ctx).get("sampling/campaigns")
+    if estado:
+        rows = [row for row in rows if row.get("status") == CAMPAIGN_STATUS_OF[estado.value]]
+    if buscar:
+        rows = [row for row in rows if _matches(row, buscar)]
+    output = output_format(as_json, as_csv)
+    print_rows(CAMPAIGN_COLUMNS, rows if output == "json" else [_campaign_row(row) for row in rows], output)
+
+
+def _visit_row(visit):
+    return {
+        **visit, "when": shown_moment(visit.get("planned_at")), "sampler_name": _name(visit.get("sampler")),
+        "status_label": VISIT_STATUS.get(visit.get("status"), visit.get("status")),
+        "sample_code": (visit.get("sample") or {}).get("code") or "",
+    }
+
+
+@app.command()
+def campana(
+    ctx: typer.Context,
+    codigo: Annotated[str, typer.Argument(help="El código de la campaña (C-2026-001) o su id.")],
+    as_json: JsonOption = False,
+):
+    """Una campaña de muestreo: su equipo, sus visitas y lo que tomó cada una."""
+    client = client_of(ctx)
+    found = find_in(client.get("sampling/campaigns"), codigo, ["code", "id"], "campaña")
+    campaign = client.get(f"sampling/campaigns/{found['id']}")
+    if as_json:
+        print_record(campaign, "json")
+        return
+    row = _campaign_row(campaign)
+    console = print_card(f"{campaign.get('code')} · {campaign.get('name')}", [
+        ("Cliente", row["customer_name"]),
+        ("Fechas", row["dates"]),
+        ("Estado", row["status_label"]),
+        ("Visitas tomadas", row["visits"]),
+        ("Muestras", row["samples_text"]),
+        ("Líder", _name(campaign.get("leader"))),
+        ("Equipo", ", ".join(_name(person) for person in campaign.get("team") or [])),
+        ("Laboratorio", _name(campaign.get("receiving_lab")) or "El propio"),
+        ("Trabajo", (campaign.get("work_order") or {}).get("title")),
+        ("Notas", campaign.get("notes")),
+    ])
+    console.print()
+    print_rows(VISIT_COLUMNS, [_visit_row(visit) for visit in campaign.get("visits") or []], "tabla")
+
+
+def _hours_left(deadline, now):
+    """'5 h', or 'Vencido' once past."""
+    hours = (datetime.fromisoformat(deadline.replace("Z", "+00:00")) - now).total_seconds() / 3600
+    if hours < 0:
+        return "Vencido"
+    return f"{hours:.0f} h" if hours >= 1 else "Menos de 1 h"
+
+
+@app.command()
+def relojes(
+    ctx: typer.Context,
+    horas: Annotated[Optional[int], typer.Option("--horas", min=1, help="Solo los que vencen en estas horas: 24.")] = None,
+    as_json: JsonOption = False,
+    as_csv: CsvOption = False,
+):
+    """Los frascos aún sin recibir en el laboratorio, por su tiempo máximo: el que vence primero arriba."""
+    bottles = client_of(ctx).get("sampling/panel").get("bottles", [])
+    now = datetime.now(timezone.utc)
+    if horas:
+        bottles = [
+            bottle for bottle in bottles
+            if (datetime.fromisoformat(bottle["deadline"].replace("Z", "+00:00")) - now).total_seconds() <= horas * 3600
+        ]
+    output = output_format(as_json, as_csv)
+    if output != "json":
+        bottles = [
+            {**bottle, "due": shown_moment(bottle.get("deadline")), "left": _hours_left(bottle["deadline"], now),
+             "where_label": WHERE.get(bottle.get("where"), bottle.get("where"))}
+            for bottle in bottles
+        ]
+    print_rows(CLOCK_COLUMNS, bottles, output)
+
+
+def _progress(row):
+    """'Tomadas 2/2 · Recibidas 2/2 · Resultados 8/8', as Informes shows it."""
+    parts = [
+        f"Tomadas {row.get('visits_done')}/{row.get('visits_planned')}",
+        f"Recibidas {row.get('received')}/{row.get('to_lab')}",
+        f"Resultados {row.get('results_confirmed')}/{row.get('results_expected')}",
+    ]
+    if row.get("visits_not_done"):
+        parts.append(f"No se hicieron {row['visits_not_done']}")
+    if row.get("rejected"):
+        parts.append(f"Rechazadas {row['rejected']}")
+    return " · ".join(parts)
+
+
+@app.command()
+def informes(
+    ctx: typer.Context,
+    listas: Annotated[bool, typer.Option("--listas", help="Solo las listas para entregar al cliente.")] = False,
+    pendientes: Annotated[bool, typer.Option("--pendientes", help="Solo las que aún les falta algo.")] = False,
+    buscar: SearchOption = None,
+    todas: AllOption = False,
+    as_json: JsonOption = False,
+    as_csv: CsvOption = False,
+):
+    """Cada campaña con muestras y lo que le falta para entregar su informe al cliente."""
+    if listas and pendientes:
+        raise CliError("Usa --listas o --pendientes, no los dos.")
+    estado = "listos" if listas else "pendientes" if pendientes else None
+    rows = list_rows(client_of(ctx), "sampling/reports", {"estado": estado, "buscar": buscar}, todas)
+    output = output_format(as_json, as_csv)
+    if output != "json":
+        rows = [{**row, "state": "Listo" if row.get("ready") else row.get("missing"), "progress": _progress(row)} for row in rows]
+    print_rows(REPORT_COLUMNS, rows, output)

{operx_cli-0.7.5 → operx_cli-0.7.7}/operx_cli/commands/registros.py

@@ -70,16 +70,17 @@ class Rol(str, Enum):
     gestor = "gestor"
     laboratorio = "laboratorio"
     consultor = "consultor"
+    contratista = "contratista"
 
 
-# customers/models.py ROLES: Ambiental's outside firms are the last three.
+# customers/models.py ROLES: Ambiental's outside firms, then Trabajos' contractors.
 ROLE_KEYS = {
     "cliente": "client", "proveedor": "supplier", "gestor": "waste_manager",
-    "laboratorio": "lab", "consultor": "consultant",
+    "laboratorio": "lab", "consultor": "consultant", "contratista": "contractor",
 }
 ROLE_LABELS = {
     "client": "Cliente", "supplier": "Proveedor", "waste_manager": "Gestor de residuos",
-    "lab": "Laboratorio", "consultant": "Consultor",
+    "lab": "Laboratorio", "consultant": "Consultor", "contractor": "Contratista",
 }
 
 
@@ -268,7 +269,7 @@ def crear_cliente(
     direccion_facturacion: Annotated[Optional[str], typer.Option("--direccion-facturacion")] = None,
     notas: Annotated[Optional[str], typer.Option("--notas")] = None,
     rol: Annotated[
-        Optional[list[Rol]], typer.Option("--rol", help="cliente (sin --rol), proveedor, gestor, laboratorio o consultor. Se repite.")
+        Optional[list[Rol]], typer.Option("--rol", help="cliente (sin --rol), proveedor, gestor, laboratorio, consultor o contratista. Se repite.")
     ] = None,
     si: YesOption = False,
     as_json: JsonOption = False,

{operx_cli-0.7.5 → operx_cli-0.7.7}/operx_cli/shell.py

@@ -60,6 +60,7 @@ COMMAND_PRODUCTS = {
     "rutinas": ("people",),
     "sst": ("sst",),
     "ambiental": ("environment",),
+    "muestreo": ("sampling",),
 }
 
 

{operx_cli-0.7.5 → operx_cli-0.7.7}/operx_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: operx-cli
-Version: 0.7.5
+Version: 0.7.7
 Summary: La línea de comandos de OperX: tu empresa desde la terminal, con tu token de API.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{operx_cli-0.7.5 → operx_cli-0.7.7}/operx_cli.egg-info/SOURCES.txt

@@ -34,6 +34,7 @@ operx_cli/commands/completar.py
 operx_cli/commands/empresas.py
 operx_cli/commands/inventario.py
 operx_cli/commands/lecturas.py
+operx_cli/commands/muestreo.py
 operx_cli/commands/ordenes.py
 operx_cli/commands/personas.py
 operx_cli/commands/planta.py
@@ -60,6 +61,7 @@ tests/test_login.py
 tests/test_logout_and_routes.py
 tests/test_lookup.py
 tests/test_more_of_the_api.py
+tests/test_muestreo.py
 tests/test_ordenes.py
 tests/test_output.py
 tests/test_personas.py

{operx_cli-0.7.5 → operx_cli-0.7.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "operx-cli"
-version = "0.7.5"
+version = "0.7.7"
 description = "La línea de comandos de OperX: tu empresa desde la terminal, con tu token de API."
 readme = "README.md"
 requires-python = ">=3.10"

operx_cli-0.7.7/tests/test_muestreo.py

@@ -0,0 +1,119 @@
+"""`operx muestreo`: the campaigns, the bottles' clocks and Informes.
+Fixtures: real answers a personal token got from a local backend
+(backend/sampling/tests/test_api_tokens.py), as sampling/api_descriptions.py
+describes them."""
+
+from datetime import datetime, timedelta, timezone
+
+import pytest
+
+from .fake_api import FakeApi, run
+
+CAMPAIGN_ROW = {
+    "id": 1, "code": "C-2026-001", "name": "Vertimientos", "customer": {"id": 1, "name": "Lácteos del Valle S.A.S."},
+    "starts_on": "2026-10-29", "ends_on": "2026-10-30", "status": "in_field", "visits_done": 1, "visits_total": 2,
+    "samples": {"in_field": 0, "in_transit": 1, "received": 0},
+}
+PLANNED_ROW = {
+    "id": 2, "code": "C-2026-002", "name": "Pozos", "customer": None, "starts_on": "2026-11-12", "ends_on": "2026-11-12",
+    "status": "planned", "visits_done": 0, "visits_total": 1, "samples": {"in_field": 0, "in_transit": 0, "received": 0},
+}
+VISIT_TAKEN = {
+    "id": 1, "point": {"id": 1, "code": "V-1", "client_code": "VF-01", "name": "Vertimiento final"}, "label": "V-1 · Vertimiento final",
+    "kind": "regular", "planned_at": "2026-10-29T14:00:00+00:00", "sampler": {"id": 440, "name": "Camila Rojas"},
+    "sample_type": "grab", "composite_hours": None, "aliquots": None, "parameters": ["pH", "DBO₅"], "status": "done",
+    "not_done_reason": "", "planned_containers": [],
+    "sample": {"id": 1, "code": "M-0001", "kind": "regular", "status": "in_transit", "started_at": "2026-10-29T14:10:00+00:00",
+               "ended_at": None, "accuracy_m": "4", "distance_m": "9.8", "field_values": [], "containers": []},
+}
+VISIT_PENDING = {**VISIT_TAKEN, "id": 2, "point": {"id": 2, "code": "V-2", "client_code": "EP-01", "name": "Entrada PTAR"},
+                 "label": "V-2 · Entrada PTAR", "sampler": None, "status": "pending", "sample": None}
+CAMPAIGN = {
+    **CAMPAIGN_ROW, "leader": {"id": 439, "name": "Laura Gómez"}, "team": [{"id": 440, "name": "Camila Rojas"}],
+    "receiving_lab": None, "qa_ratio": 10, "notes": "Llevar la nevera grande.", "work_order": None,
+    "visits": [VISIT_TAKEN, VISIT_PENDING], "kit": [],
+}
+REPORT_READY = {
+    "id": 1, "code": "C-2026-001", "name": "Vertimientos", "customer": "Lácteos del Valle S.A.S.", "starts_on": "2026-10-29",
+    "ends_on": "2026-10-29", "visits_planned": 2, "visits_done": 1, "visits_not_done": 1, "samples": 1, "to_lab": 1,
+    "received": 1, "rejected": 0, "results_expected": 2, "results_confirmed": 2, "missing": "", "ready": True,
+}
+
+
+def bottle(code, parameter, deadline):
+    return {
+        "label_code": code, "parameter": parameter, "sample_id": 1, "sample_code": "M-0001", "campaign_id": 1, "visit_id": 1,
+        "campaign_code": "C-2026-001", "customer": "Lácteos del Valle S.A.S.", "where": "in_transit",
+        "holder": "Jorge Medina · Transportes Ruta Verde", "holding": {"hours": 48.0},
+        "filled_at": "2026-10-29T21:08:08+00:00", "deadline": deadline.isoformat(),
+    }
+
+
+@pytest.fixture(autouse=True)
+def signed_in(monkeypatch):
+    monkeypatch.setenv("OPERX_TOKEN", "opx_test")
+
+
+def test_campanas_lists_each_campaign_with_its_visits_and_samples():
+    fake = FakeApi({("GET", "sampling/campaigns/"): [CAMPAIGN_ROW, PLANNED_ROW]})
+
+    result = run(fake, "muestreo", "campanas", "--estado", "en-campo", "--csv")
+
+    assert result.exit_code == 0, result.output
+    lines = result.output.splitlines()
+    assert lines[0] == "Código;Campaña;Cliente;Fechas;Estado;Visitas;Muestras", "with its BOM, for Excel"
+    assert lines[1:] == ["C-2026-001;Vertimientos;Lácteos del Valle S.A.S.;29/10/2026 a 30/10/2026;En campo;1/2;En camino 1"]
+
+
+def test_campanas_finds_by_text_and_gives_the_api_rows_in_json():
+    fake = FakeApi({("GET", "sampling/campaigns/"): [CAMPAIGN_ROW, PLANNED_ROW]})
+
+    result = run(fake, "muestreo", "campanas", "--buscar", "pozos", "--json")
+
+    assert result.exit_code == 0, result.output
+    assert '"code": "C-2026-002"' in result.output and "C-2026-001" not in result.output
+
+
+def test_campana_shows_one_campaign_by_its_code_with_each_visit():
+    fake = FakeApi({("GET", "sampling/campaigns/"): [CAMPAIGN_ROW, PLANNED_ROW], ("GET", "sampling/campaigns/1/"): CAMPAIGN})
+
+    result = run(fake, "muestreo", "campana", "c-2026-001")
+
+    assert result.exit_code == 0, result.output
+    assert "C-2026-001 · Vertimientos" in result.output and "Laura Gómez" in result.output and "El propio" in result.output
+    assert "M-0001" in result.output and "Por hacer" in result.output and "Entrada PTAR" in result.output
+
+
+def test_relojes_puts_the_nearest_deadline_first_and_says_what_is_late():
+    now = datetime.now(timezone.utc)
+    bottles = [bottle("OPX-000003-4", "DBO₅", now - timedelta(hours=1)), bottle("OPX-000004-2", "DQO", now + timedelta(hours=5, minutes=10)),
+               bottle("OPX-000005-0", "Nitratos", now + timedelta(days=20))]
+    fake = FakeApi({("GET", "sampling/panel/"): {"bottles": bottles}})
+
+    result = run(fake, "muestreo", "relojes", "--horas", "24", "--csv")
+
+    assert result.exit_code == 0, result.output
+    rows = [line.split(";") for line in result.output.splitlines()[1:]]
+    assert [(row[1], row[2], row[6]) for row in rows] == [
+        ("Vencido", "OPX-000003-4", "En camino al laboratorio"), ("5 h", "OPX-000004-2", "En camino al laboratorio"),
+    ]
+
+
+def test_informes_asks_for_the_campaigns_ready_to_hand_over():
+    fake = FakeApi({("GET", "sampling/reports/"): {
+        "count": 1, "next": None, "previous": None, "results": [REPORT_READY], "counts": {"todos": 3, "listos": 1, "pendientes": 2},
+    }})
+
+    result = run(fake, "muestreo", "informes", "--listas", "--csv")
+
+    assert result.exit_code == 0, result.output
+    assert fake.requests[-1].url.params["estado"] == "listos"
+    assert result.output.splitlines()[1] == (
+        "C-2026-001;Vertimientos;Lácteos del Valle S.A.S.;Listo;Tomadas 1/2 · Recibidas 1/1 · Resultados 2/2 · No se hicieron 1"
+    )
+
+
+def test_informes_takes_one_of_listas_or_pendientes():
+    result = run(FakeApi({}), "muestreo", "informes", "--listas", "--pendientes")
+
+    assert result.exit_code != 0 and "no los dos" in result.output