mirror of
https://github.com/brunopostle/ifcurl.git
synced 2026-07-12 02:08:13 +00:00
Add /clash endpoint for geometry intersection detection (ifcurl-k0x)
render_service.py: _sandboxed_clash(ifc_bytes, selector_a, selector_b) uses
ifcopenshell.geom.tree.clash_collision_many for hard-clash detection (mesh-
level interpenetration, touching excluded). When selector_b is None, tests
set A against all other IfcProduct elements. Deduplicates pairs via frozenset.
render_service.py: /clash endpoint wraps _sandboxed_clash in the sandbox.
service.py: ClashRequest model, _clash_via_socket() for socket delegation,
and GET/POST /clash endpoints. URL selector= is set A; optional selector_b
body/query param is set B. Returns {"pairs": [["guidA", "guidB"], ...]}.
Reuses Tier 2 byte cache.
https://claude.ai/code/session_01NBsytCd6L7UQPiKbcLn4kn
This commit is contained in:
Claude
parent
39243e343a
commit
ccf692b168
3 changed files with 179 additions and 2 deletions
|
|
@ -2,7 +2,7 @@
|
|||
{"_type":"issue","id":"ifcurl-p60","title":"Viewer: no element click-to-identify — can't get GlobalId or properties","description":"There is no way to click on a mesh in the viewer and see which IFC element it represents. Reviewers can see geometry but cannot reference specific elements — they can't discover a GlobalId to put in a selector URL, can't see the element name/type/Psets, and can't say 'this specific wall' in a BCF or Forgejo comment. This breaks the collaboration workflow at its foundation: every useful feedback comment needs to identify specific elements. Need: click or hover on a surface to highlight it and show a properties panel (name, type, GlobalId, key Psets). The GlobalId should be copyable into the selector field or URL. The ThatOpen components library provides the tools for this (OBC.IfcRelationsIndexer, element property queries).","status":"closed","priority":1,"issue_type":"feature","assignee":"Bruno Postle","owner":"bruno@postle.net","created_at":"2026-04-24T11:02:33Z","created_by":"Bruno Postle","updated_at":"2026-04-24T11:47:23Z","started_at":"2026-04-24T11:14:57Z","closed_at":"2026-04-24T11:47:23Z","close_reason":"Closed","dependency_count":0,"dependent_count":0,"comment_count":0}
|
||||
{"_type":"issue","id":"ifcurl-4l7","title":"viewer.html: scale= URLs don't load in orthographic mode","description":"applyCameraParam() reads the camera= and fov= parameters from the URL and applies them, but never reads scale= or switches the camera to orthographic (parallel) projection. URLs like ?camera=...\u0026scale=50 will load in perspective mode instead of orthographic. The OBC OrthoPerspectiveCamera can switch modes, but the code path to set parallel projection and apply the scale value is missing from applyCameraParam.","status":"closed","priority":1,"issue_type":"bug","assignee":"Bruno Postle","owner":"bruno@postle.net","created_at":"2026-04-24T09:04:51Z","created_by":"Bruno Postle","updated_at":"2026-04-24T10:56:29Z","started_at":"2026-04-24T10:50:19Z","closed_at":"2026-04-24T10:56:29Z","close_reason":"Closed","dependency_count":0,"dependent_count":0,"comment_count":0}
|
||||
{"_type":"issue","id":"ifcurl-362","title":"Add missing server-config files: gitconfig-ifcmerge and gitattributes","description":"forgejo/README.md documents deploying two files that don't exist in the repo: forgejo/server-config/gitconfig-ifcmerge and forgejo/server-config/gitattributes. Both are required for the ifcmerge git merge driver to work in bare Forgejo repos. The README even includes 'sudo cp forgejo/server-config/gitattributes /etc/gitattributes' and 'sudo git config --system include.path .../gitconfig-ifcmerge', but the files themselves are absent. Anyone following the deployment instructions will hit a 'file not found' error. Need to create both files with the content described in the README.","status":"closed","priority":1,"issue_type":"bug","assignee":"Bruno Postle","owner":"bruno@postle.net","created_at":"2026-04-24T09:04:31Z","created_by":"Bruno Postle","updated_at":"2026-04-24T10:51:47Z","started_at":"2026-04-24T10:50:15Z","closed_at":"2026-04-24T10:51:47Z","close_reason":"Files already exist: forgejo/server-config/gitconfig-ifcmerge and gitattributes are both present and correct. Missed in initial review.","dependency_count":0,"dependent_count":0,"comment_count":0}
|
||||
{"_type":"issue","id":"ifcurl-k0x","title":"Server: add /clash endpoint for geometry intersection detection","description":"Add GET and POST /clash endpoints to service.py. The endpoint accepts an ifc:// URL with two selectors (selector_a and selector_b query parameters; if selector_b is omitted, test selector_a elements against all other model elements). It runs IfcOpenShell geometry intersection detection in the sandbox: bounding-box pre-filter to find candidate pairs, then mesh-level intersection test for confirmed clashes. Returns JSON {pairs: [[guidA, guidB], ...]} listing every clashing element pair. The combined set of clashing GUIDs can then be used to construct a visibility=clash URL. Sandbox the detection via a new _sandboxed_clash(ifc_bytes, selector_a, selector_b) function in render_service.py. Results for immutable refs may be cached at Tier 4.","status":"open","priority":2,"issue_type":"feature","owner":"noreply@anthropic.com","created_at":"2026-05-09T08:28:49Z","created_by":"Claude","updated_at":"2026-05-09T08:28:49Z","dependency_count":0,"dependent_count":1,"comment_count":0}
|
||||
{"_type":"issue","id":"ifcurl-k0x","title":"Server: add /clash endpoint for geometry intersection detection","description":"Add GET and POST /clash endpoints to service.py. The endpoint accepts an ifc:// URL with two selectors (selector_a and selector_b query parameters; if selector_b is omitted, test selector_a elements against all other model elements). It runs IfcOpenShell geometry intersection detection in the sandbox: bounding-box pre-filter to find candidate pairs, then mesh-level intersection test for confirmed clashes. Returns JSON {pairs: [[guidA, guidB], ...]} listing every clashing element pair. The combined set of clashing GUIDs can then be used to construct a visibility=clash URL. Sandbox the detection via a new _sandboxed_clash(ifc_bytes, selector_a, selector_b) function in render_service.py. Results for immutable refs may be cached at Tier 4.","status":"closed","priority":2,"issue_type":"feature","assignee":"Claude","owner":"noreply@anthropic.com","created_at":"2026-05-09T08:28:49Z","created_by":"Claude","updated_at":"2026-05-09T08:53:40Z","started_at":"2026-05-09T08:52:02Z","closed_at":"2026-05-09T08:53:40Z","close_reason":"Closed","dependency_count":0,"dependent_count":1,"comment_count":0}
|
||||
{"_type":"issue","id":"ifcurl-19h","title":"Renderer: implement clash visibility mode","description":"In render.py _add_shape, add a clash branch between the ghost and isolate/else cases. Clash should render selected elements in a distinct red colour (define _CLASH_COLOR e.g. (220, 50, 50)) and non-selected elements in their normal material colours (same as highlight mode but for non-selected). Currently the clash value falls through to the else/isolate branch incorrectly. Update the _add_shape docstring to list clash as a supported mode. Also update the render() docstring to mention clash in the visibility parameter description.","status":"closed","priority":2,"issue_type":"feature","assignee":"Claude","owner":"noreply@anthropic.com","created_at":"2026-05-09T08:08:32Z","created_by":"Claude","updated_at":"2026-05-09T08:45:01Z","started_at":"2026-05-09T08:44:22Z","closed_at":"2026-05-09T08:45:01Z","close_reason":"Closed","dependency_count":0,"dependent_count":0,"comment_count":0}
|
||||
{"_type":"issue","id":"ifcurl-8rf","title":"Server: add /query endpoint for attribute/property retrieval","description":"Add GET and POST /query endpoints to service.py (mirroring the /select pattern). The endpoint resolves an ifc:// URL's selector, then for each matched element retrieves the attribute or property value named by the query parameter (dot-notation: Name, Pset_WallCommon.FireRating). Returns JSON {GlobalId: value, ...}, excluding elements with no GlobalId and attributes that resolve to entity references rather than scalars. Add _sandboxed_query(ifc_bytes, selector, query_path) to render_service.py and a matching _query_via_socket() delegation path. Reuse Tier 2/3 caches for IFC bytes and GUID sets. No Tier 4 caching — responses depend on the query path, not just the URL hash.","status":"closed","priority":2,"issue_type":"feature","assignee":"Claude","owner":"noreply@anthropic.com","created_at":"2026-05-09T08:08:29Z","created_by":"Claude","updated_at":"2026-05-09T08:46:31Z","started_at":"2026-05-09T08:45:02Z","closed_at":"2026-05-09T08:46:31Z","close_reason":"Closed","dependency_count":0,"dependent_count":1,"comment_count":0}
|
||||
{"_type":"issue","id":"ifcurl-b1c","title":"Implement OpenCDE BCF API on Forgejo","description":"Expose a BCF 3.0 REST API as a Python route group in the preview service, proxied at /bcf/3.0/ on the Forgejo hostname via nginx/Caddy.\n\n## Architecture\n\nPython routes added to service.py alongside the existing /preview and /bcf endpoints. No new Forgejo Go code — the service forwards the user's Authorization: Bearer header verbatim to Forgejo's REST API on localhost, so Forgejo's own auth middleware enforces per-user permissions. No service account or machine token required.\n\nBCF \u003c-\u003e ifc:// conversion stays entirely in Python: bcf.py (ifc:// -\u003e BCF, already exists) and the reverse direction implemented in ifcurl-l50.\n\n## Design\n\nThe BCF API is a stateless translation layer over Forgejo's REST API. No Forgejo recompilation, no schema changes, no new Go code.\n\n**Storage:** ifc:// URLs in issue and comment bodies are the viewpoint format. This is already what the viewer Issue button produces. The BCF\u003c-\u003eifc:// conversion is specified in SPECIFICATION.md §6.\n\n**Mapping:**\n\n| BCF resource | Forgejo |\n|---|---|\n| Project | Repository (project_id = owner/repo) |\n| Topic | Issue |\n| Topic guid | Derived from issue ID |\n| Comment | Issue comment |\n| Viewpoint | ifc:// URL found in issue/comment body |\n| Viewpoint guid | Derived from comment ID |\n| Snapshot | ifc:// URL proxied through preview service |\n\n**Auth:** BCF client sends Authorization: Bearer \u003cforgejo-token\u003e. Service forwards it to Forgejo REST API. No credential storage, no service token.\n\n**Read viewpoints:** scan issue/comment bodies for ifc:// URLs, convert each to a BCF viewpoint object on the fly via the §6 mapping.\n\n**Write viewpoints:** convert incoming BCF viewpoint to an ifc:// URL (ifcurl-l50), post as a new Forgejo comment.\n\n**Snapshot:** GET .../viewpoints/{guid}/snapshot proxies the stored ifc:// URL through the existing /preview endpoint.\n\n## Minimum viable endpoints\n\n- GET /bcf/3.0/projects\n- GET /bcf/3.0/projects/{id}\n- GET/POST /bcf/3.0/projects/{id}/topics\n- GET/PUT /bcf/3.0/projects/{id}/topics/{guid}\n- GET/POST /bcf/3.0/projects/{id}/topics/{guid}/comments\n- GET/POST /bcf/3.0/projects/{id}/topics/{guid}/viewpoints\n- GET /bcf/3.0/projects/{id}/topics/{guid}/viewpoints/{guid}\n- GET /bcf/3.0/projects/{id}/topics/{guid}/viewpoints/{guid}/snapshot\n- GET /bcf/3.0/projects/{id}/extensions (static minimal response)\n\n## Prerequisites\n\n- ifcurl-lwl: Foundation API discovery so BCF clients can locate this endpoint via OpenCDE auto-discovery\n- ifcurl-l50: BCF -\u003e ifc:// URL conversion needed for POST /viewpoints","status":"closed","priority":2,"issue_type":"feature","owner":"bruno@postle.net","created_at":"2026-04-28T22:55:11Z","created_by":"Bruno Postle","updated_at":"2026-04-29T18:39:11Z","closed_at":"2026-04-29T18:39:11Z","close_reason":"Closed","dependencies":[{"issue_id":"ifcurl-b1c","depends_on_id":"ifcurl-l50","type":"blocks","created_at":"2026-04-29T18:44:06Z","created_by":"Claude","metadata":"{}"},{"issue_id":"ifcurl-b1c","depends_on_id":"ifcurl-lwl","type":"blocks","created_at":"2026-04-29T18:44:05Z","created_by":"Claude","metadata":"{}"}],"dependency_count":2,"dependent_count":0,"comment_count":0}
|
||||
|
|
|
|||
|
|
@ -106,6 +106,59 @@ def _sandboxed_select(ifc_bytes: bytes, selector: str) -> list[str]:
|
|||
return [e.GlobalId for e in matched if hasattr(e, "GlobalId") and e.GlobalId]
|
||||
|
||||
|
||||
def _sandboxed_clash(
|
||||
ifc_bytes: bytes, selector_a: str, selector_b: str | None
|
||||
) -> list[list[str]]:
|
||||
"""Detect geometric clashes between two sets of IFC elements.
|
||||
|
||||
Uses ifcopenshell.geom.tree.clash_collision_many for mesh-level
|
||||
interpenetration detection (hard clashes only, touching excluded).
|
||||
Returns [[guidA, guidB], ...] for every clashing pair. Elements with no
|
||||
GlobalId or no renderable geometry are silently skipped.
|
||||
"""
|
||||
import ifcopenshell
|
||||
import ifcopenshell.geom
|
||||
import ifcopenshell.util.selector
|
||||
|
||||
model = ifcopenshell.file.from_string(ifc_bytes.decode())
|
||||
settings = ifcopenshell.geom.settings()
|
||||
settings.set("use-world-coords", True)
|
||||
|
||||
elems_a = list(ifcopenshell.util.selector.filter_elements(model, selector_a))
|
||||
ids_a = {e.id() for e in elems_a}
|
||||
|
||||
if selector_b:
|
||||
elems_b = list(ifcopenshell.util.selector.filter_elements(model, selector_b))
|
||||
else:
|
||||
elems_b = [
|
||||
e
|
||||
for e in model.by_type("IfcProduct")
|
||||
if e.id() not in ids_a and getattr(e, "GlobalId", None)
|
||||
]
|
||||
|
||||
if not elems_a or not elems_b:
|
||||
return []
|
||||
|
||||
tree = ifcopenshell.geom.tree()
|
||||
tree.add_file(model, settings)
|
||||
|
||||
clashes = tree.clash_collision_many(elems_a, elems_b, allow_touching=False)
|
||||
|
||||
pairs: list[list[str]] = []
|
||||
seen: set[frozenset[str]] = set()
|
||||
for c in clashes:
|
||||
guid_a = getattr(c.a, "GlobalId", None)
|
||||
guid_b = getattr(c.b, "GlobalId", None)
|
||||
if not guid_a or not guid_b:
|
||||
continue
|
||||
key = frozenset((guid_a, guid_b))
|
||||
if key not in seen:
|
||||
seen.add(key)
|
||||
pairs.append([guid_a, guid_b])
|
||||
|
||||
return pairs
|
||||
|
||||
|
||||
def _sandboxed_query(ifc_bytes: bytes, selector: str, query_path: str) -> dict[str, str]:
|
||||
"""Parse model, run selector, retrieve query_path value for each element.
|
||||
|
||||
|
|
@ -265,6 +318,33 @@ async def select_endpoint(
|
|||
)
|
||||
|
||||
|
||||
@app.post("/clash")
|
||||
async def clash_endpoint(
|
||||
ifc: UploadFile = File(...),
|
||||
selector_a: str = Form(...),
|
||||
selector_b: str = Form(""),
|
||||
) -> Response:
|
||||
"""Detect clashing element pairs.
|
||||
|
||||
Returns JSON ``{"pairs": [["guidA", "guidB"], ...]}``.
|
||||
An empty ``selector_b`` means test set A against all other model elements.
|
||||
"""
|
||||
ifc_bytes = await ifc.read()
|
||||
|
||||
try:
|
||||
pairs = run_sandboxed(
|
||||
_sandboxed_clash, ifc_bytes, selector_a, selector_b or None
|
||||
)
|
||||
except SandboxCrashError as exc:
|
||||
raise HTTPException(status_code=422, detail=f"IFC clash detection crashed: {exc}") from exc
|
||||
except SandboxTimeoutError as exc:
|
||||
raise HTTPException(status_code=503, detail=f"Clash detection timed out: {exc}") from exc
|
||||
except Exception as exc:
|
||||
raise HTTPException(status_code=422, detail=f"Clash detection failed: {exc}") from exc
|
||||
|
||||
return Response(content=json.dumps({"pairs": pairs}), media_type="application/json")
|
||||
|
||||
|
||||
@app.post("/query")
|
||||
async def query_endpoint(
|
||||
ifc: UploadFile = File(...),
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ from ifcurl.bcf_api import router as bcf_router
|
|||
from ifcurl.documents_api import router as documents_router
|
||||
from ifcurl.git import diff_text as git_diff_text
|
||||
from ifcurl.git import fetch_ifc
|
||||
from ifcurl.render_service import _sandboxed_diff, _sandboxed_pipeline, _sandboxed_query, _sandboxed_select
|
||||
from ifcurl.render_service import _sandboxed_clash, _sandboxed_diff, _sandboxed_pipeline, _sandboxed_query, _sandboxed_select
|
||||
from ifcurl.sandbox import SandboxCrashError, SandboxTimeoutError, run_sandboxed
|
||||
from ifcurl.url import IfcUrl
|
||||
|
||||
|
|
@ -126,6 +126,26 @@ def _select_via_socket(ifc_bytes: bytes, selector: str) -> list[str]:
|
|||
return resp.json()["guids"]
|
||||
|
||||
|
||||
def _clash_via_socket(
|
||||
ifc_bytes: bytes, selector_a: str, selector_b: str | None
|
||||
) -> list[list[str]]:
|
||||
"""Delegate clash detection to the render service over the Unix socket."""
|
||||
import httpx
|
||||
|
||||
try:
|
||||
with httpx.Client(transport=httpx.HTTPTransport(uds=_RENDER_SOCKET)) as client:
|
||||
resp = client.post(
|
||||
"http://render/clash",
|
||||
files={"ifc": ifc_bytes},
|
||||
data={"selector_a": selector_a, "selector_b": selector_b or ""},
|
||||
timeout=_RENDER_TIMEOUT,
|
||||
)
|
||||
except httpx.TransportError as exc:
|
||||
raise HTTPException(status_code=503, detail=f"Render service unavailable: {exc}") from exc
|
||||
_check_render_response(resp)
|
||||
return resp.json()["pairs"]
|
||||
|
||||
|
||||
def _query_via_socket(ifc_bytes: bytes, selector: str, query_path: str) -> dict[str, str]:
|
||||
"""Delegate query execution to the render service over the Unix socket."""
|
||||
import httpx
|
||||
|
|
@ -428,6 +448,13 @@ class QueryRequest(BaseModel):
|
|||
token: str | None = None
|
||||
|
||||
|
||||
class ClashRequest(BaseModel):
|
||||
url: str
|
||||
selector_b: str | None = None
|
||||
"""Second element set to test against. When omitted, set A is tested against all other model elements."""
|
||||
token: str | None = None
|
||||
|
||||
|
||||
class BcfRequest(BaseModel):
|
||||
url: str
|
||||
title: str = "IFC View"
|
||||
|
|
@ -801,6 +828,76 @@ def query(request: QueryRequest) -> JSONResponse:
|
|||
return JSONResponse(result)
|
||||
|
||||
|
||||
@app.get("/clash")
|
||||
def clash_get(url: str, selector_b: str | None = None, token: str | None = None) -> JSONResponse:
|
||||
"""GET variant of POST /clash."""
|
||||
return clash(ClashRequest(url=url, selector_b=selector_b, token=token))
|
||||
|
||||
|
||||
@app.post("/clash")
|
||||
def clash(request: ClashRequest) -> JSONResponse:
|
||||
"""Detect geometric clashes between two sets of elements.
|
||||
|
||||
Set A is defined by the URL's ``selector=`` parameter. Set B is defined
|
||||
by ``selector_b``; when omitted, set A is tested against all other
|
||||
model elements.
|
||||
|
||||
Uses ifcopenshell hard-clash (interpenetration) detection. Returns
|
||||
``{"pairs": [["<guidA>", "<guidB>"], …]}``.
|
||||
"""
|
||||
try:
|
||||
ifc_url = IfcUrl.parse(request.url)
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=400, detail=str(exc)) from exc
|
||||
|
||||
if ifc_url.path is None:
|
||||
raise HTTPException(status_code=400, detail="URL has no 'path' parameter")
|
||||
if not ifc_url.selector:
|
||||
raise HTTPException(status_code=400, detail="URL has no 'selector' parameter")
|
||||
|
||||
_ssrf_check(ifc_url)
|
||||
|
||||
token = request.token
|
||||
if token is None and ifc_url.host:
|
||||
token = get_token_for_host(ifc_url.host)
|
||||
|
||||
try:
|
||||
hexsha, ifc_bytes, _ = fetch_ifc(ifc_url, token=token)
|
||||
except ImportError as exc:
|
||||
raise HTTPException(status_code=503, detail=str(exc)) from exc
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=404, detail=str(exc)) from exc
|
||||
|
||||
_check_ifc_size(ifc_bytes)
|
||||
|
||||
cached_bytes = _t2_get(hexsha, ifc_url.path)
|
||||
ifc_bytes = cached_bytes if cached_bytes is not None else ifc_bytes
|
||||
if cached_bytes is None:
|
||||
_t2_put(hexsha, ifc_url.path, ifc_bytes)
|
||||
|
||||
try:
|
||||
if _RENDER_SOCKET:
|
||||
pairs = _clash_via_socket(ifc_bytes, ifc_url.selector, request.selector_b)
|
||||
else:
|
||||
pairs = run_sandboxed(
|
||||
_sandboxed_clash, ifc_bytes, ifc_url.selector, request.selector_b
|
||||
)
|
||||
except SandboxCrashError as exc:
|
||||
raise HTTPException(
|
||||
status_code=422, detail=f"IFC clash detection crashed: {exc}"
|
||||
) from exc
|
||||
except SandboxTimeoutError as exc:
|
||||
raise HTTPException(
|
||||
status_code=503, detail=f"Clash detection timed out: {exc}"
|
||||
) from exc
|
||||
except Exception as exc:
|
||||
raise HTTPException(
|
||||
status_code=422, detail=f"Clash detection failed: {exc}"
|
||||
) from exc
|
||||
|
||||
return JSONResponse({"pairs": pairs})
|
||||
|
||||
|
||||
@app.get("/foundation/versions")
|
||||
def foundation_versions(request: Request) -> JSONResponse:
|
||||
"""OpenCDE Foundation API discovery endpoint.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue