acumatica-cli 0.18.1__tar.gz → 0.19.0__tar.gz

{acumatica_cli-0.18.1 → acumatica_cli-0.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acumatica-cli
-Version: 0.18.1
+Version: 0.19.0
 Summary: Acumatica ERP Config-as-Code: tenant provisioning, baseline config, and reference data
 Author: Konstantin Borovik
 Author-email: Konstantin Borovik <kb@lab5.ca>
@@ -78,7 +78,8 @@ acu [--tenant NAME] [--url URL] [--ssh USER@HOST] [--api-version V]
 │   ├── list                          CompanyID, sign-in name, internal CD, type
 │   ├── create --id N --login NAME    create + bootstrap; re-run to republish (SSH)
 │   │          [--type SalesDemo|T100|U100] [--parent N] [--hidden] [--no-init]
-│   └── delete --id N [--yes]         delete the tenant and its data, recycle app pool
+│   ├── delete --id N [--yes]         delete the tenant and its data, recycle app pool
+│   └── recycle [--yes]               restart site app pool (tenant map + free API slots)
 │
 ├── bootstrap [--export PATH]         publish AcuBootstrap (REST); --export = offline zip
 ├── apply [--dry-run] [FILES...]      push YAML via REST (idempotent PUT upserts)

{acumatica_cli-0.18.1 → acumatica_cli-0.19.0}/README.md

@@ -60,7 +60,8 @@ acu [--tenant NAME] [--url URL] [--ssh USER@HOST] [--api-version V]
 │   ├── list                          CompanyID, sign-in name, internal CD, type
 │   ├── create --id N --login NAME    create + bootstrap; re-run to republish (SSH)
 │   │          [--type SalesDemo|T100|U100] [--parent N] [--hidden] [--no-init]
-│   └── delete --id N [--yes]         delete the tenant and its data, recycle app pool
+│   ├── delete --id N [--yes]         delete the tenant and its data, recycle app pool
+│   └── recycle [--yes]               restart site app pool (tenant map + free API slots)
 │
 ├── bootstrap [--export PATH]         publish AcuBootstrap (REST); --export = offline zip
 ├── apply [--dry-run] [FILES...]      push YAML via REST (idempotent PUT upserts)

{acumatica_cli-0.18.1 → acumatica_cli-0.19.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "acumatica-cli"
-version = "0.18.1"
+version = "0.19.0"
 description = "Acumatica ERP Config-as-Code: tenant provisioning, baseline config, and reference data"
 license = "PolyForm-Noncommercial-1.0.0"
 readme = "README.md"

{acumatica_cli-0.18.1 → acumatica_cli-0.19.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "acumatica-cli"
-version = "0.18.1"
+version = "0.19.0"
 description = "Acumatica ERP Config-as-Code: tenant provisioning, baseline config, and reference data"
 authors = [{ name = "Konstantin Borovik", email = "kb@lab5.ca" }]
 license = "PolyForm-Noncommercial-1.0.0"

{acumatica_cli-0.18.1 → acumatica_cli-0.19.0}/src/acumatica_cli/cli.py

@@ -7,6 +7,7 @@ from collections.abc import Callable
 from importlib.metadata import distribution
 from pathlib import Path
 from typing import Concatenate
+from urllib.parse import urlparse
 
 import click
 import httpx
@@ -239,8 +240,10 @@ def tenant_group() -> None:
 def tenant_list(inst: Instance) -> None:
     """List tenants: CompanyID, sign-in name, internal CD, type."""
     tenants = TenantManager(inst).list()
+    # V9/B27: control-plane identity is the host, never scheme+path
+    host = urlparse(inst.base_url).hostname or inst.base_url
     output.table(
-        f"Tenants on {inst.base_url}",
+        f"Tenants on {host}",
         ("ID", "Login", "CD", "Type"),
         (
             (str(t.company_id), t.login_name, t.company_cd, t.company_type)
@@ -306,6 +309,11 @@ def tenant_create(
     create is skipped and the init + digest-gated publish chain still runs,
     so re-running create is the republish route for existing tenants. --id
     must match the existing CompanyID, else hard error naming both.
+
+    After create (or on exists-skip), CompanyCD is set equal to --login.
+    ac.exe only writes LoginName into CompanyKey and auto-generates CD
+    (Company2, Company3, …); the align step matches what operators do on
+    the Companies screen so ``acu tenant list`` shows Login = CD.
     """
     mgr = TenantManager(inst)
     existing = next((t for t in mgr.list() if t.login_name == login_name), None)
@@ -326,6 +334,14 @@ def tenant_create(
                 company_id, login_name, parent_id, not hidden, company_type or ""
             )
         output.data(raw.splitlines()[-1] if raw.strip() else "created")
+    # ac.exe only sets CompanyKey from LoginName; CompanyCD stays auto-generated
+    # (Company2/Company3/…). Align CD → login so list shows matching columns.
+    # Idempotent on re-run / exists-skip (docs/ac-exe.md).
+    with output.step(f"aligning CompanyCD to login ({login_name})"):
+        if mgr.set_company_cd(company_id, login_name):
+            output.data(f"CompanyCD set to {login_name}")
+        else:
+            output.data(f"CompanyCD already {login_name}")
     if no_init:
         output.warn("skipping init: tenant is invisible until an app-pool recycle")
         return
@@ -454,6 +470,27 @@ def tenant_delete(inst: Instance, company_id: int) -> None:
         mgr.recycle_app_pool()
 
 
+@tenant_group.command("recycle")
+@click.confirmation_option(
+    prompt=(
+        "Recycle the site app pool? This kills all sessions and frees API-user slots."
+    )
+)
+@pass_instance
+def tenant_recycle(inst: Instance) -> None:
+    """Recycle the IIS app pool for the instance (site-wide; no tenant --id).
+
+    Control plane only (SSH): ``Restart-WebAppPool`` for the instance pool.
+    Reloads the tenant map (V5) and drops every in-flight session so concurrent
+    API-user license slots free up. Hosted / empty ACU_SSH hard-errors before
+    any remote (same as other tenant cmds).
+    """
+    mgr = TenantManager(inst)
+    with output.step("recycling app pool (tenant map + free API-user sessions)"):
+        mgr.recycle_app_pool()
+    output.success("app pool recycled")
+
+
 @cli.group("config")
 def config_group() -> None:
     """Configuration ops.

{acumatica_cli-0.18.1 → acumatica_cli-0.19.0}/src/acumatica_cli/client.py

@@ -224,7 +224,7 @@ class AcumaticaClient:
                 f"tenant guard: asked for tenant {self.instance.tenant!r} "
                 f"but the session landed on {landed!r} - the instance "
                 "tenant map is stale or the tenant does not exist; check "
-                "acu tenant list and recycle the app pool"
+                "acu tenant list and run acu tenant recycle"
             )
 
     def relogin(self) -> None:

{acumatica_cli-0.18.1 → acumatica_cli-0.19.0}/src/acumatica_cli/templates/gitignore

@@ -1,4 +1,5 @@
 .env
-schemas/
-inventory/
 findings/
+inventory/
+schemas/
+state/

{acumatica_cli-0.18.1 → acumatica_cli-0.19.0}/src/acumatica_cli/tenant.py

@@ -14,8 +14,10 @@ class Tenant(Model):
     """One row of the instance's Company table.
 
     login_name is dbo.Company.CompanyKey — the name on the sign-in page and
-    the REST login's tenant value. company_cd is the internal auto-generated
-    code (ac.exe ignores LoginName for it; see docs/ac-exe.md).
+    the REST login's tenant value. company_cd is dbo.Company.CompanyCD; ac.exe
+    auto-generates it (Company2, Company3, …) and ignores LoginName for it
+    (docs/ac-exe.md). ``acu tenant create`` aligns CompanyCD to the login
+    after CompanyConfig so list Login and CD match.
     """
 
     company_id: int
@@ -131,6 +133,9 @@ class TenantManager:
         flags preset the tenant's admin to the instance credentials with no
         must-change flag, so the tenant is REST-loginable right after the
         app-pool recycle — no first-login dance (verified, docs/ac-exe.md).
+
+        Does not set CompanyCD (ac.exe auto-generates it). Call
+        :meth:`set_company_cd` after create to align CD with the login.
         """
         company = (
             f"CompanyID={company_id};ParentID={parent_id};"
@@ -142,6 +147,47 @@ class TenantManager:
         )
         return self._company_config(company, extra=admin)
 
+    def set_company_cd(self, company_id: int, company_cd: str) -> bool:
+        """Set ``dbo.Company.CompanyCD`` for a tenant (sqlcmd over SSH).
+
+        ac.exe CompanyConfig only writes LoginName into CompanyKey; CompanyCD
+        stays auto-generated (``Company2``, ``Company3``, …). Aligning CD to
+        the login makes ``acu tenant list`` show matching Login/CD columns and
+        matches the Companies-screen rename operators do by hand.
+
+        Returns True when an UPDATE ran, False when CD already matches.
+        Raises if the target id is missing or ``company_cd`` is already used
+        by a different CompanyID.
+        """
+        tenants = self.list()
+        target = next((t for t in tenants if t.company_id == company_id), None)
+        if target is None:
+            raise RuntimeError(f"no tenant with CompanyID={company_id}")
+        if target.company_cd == company_cd:
+            return False
+        conflict = next(
+            (
+                t
+                for t in tenants
+                if t.company_cd == company_cd and t.company_id != company_id
+            ),
+            None,
+        )
+        if conflict is not None:
+            raise RuntimeError(
+                f"CompanyCD {company_cd!r} already used by "
+                f"CompanyID={conflict.company_id}"
+            )
+        # company_id is int; company_cd is quoted with doubled single-quotes
+        escaped = company_cd.replace("'", "''")
+        query = (
+            f"UPDATE {DB_NAME}.dbo.Company "
+            f"SET CompanyCD = N'{escaped}' "
+            f"WHERE CompanyID = {company_id}"
+        )
+        self._ssh(f'sqlcmd -S "(local)" -E -C -Q "{query}"')
+        return True
+
     def delete(self, company_id: int) -> str:
         """Delete the tenant and all its data.