From 431c41a615e0daf9e406daa5b06af4fa5103dda9 Mon Sep 17 00:00:00 2001
From: Yeicor <4929005+Yeicor@users.noreply.github.com>
Date: Sun, 10 Mar 2024 18:56:45 +0100
Subject: [PATCH] fix CI deployment 12

---
 .github/workflows/build.yml | 10 +++++++++-
 yacv_server/__init__.py     |  2 +-
 yacv_server/myhttp.py       |  2 +-
 yacv_server/yacv.py         |  6 +++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e11acc7..0455f5e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,6 +19,8 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v4"
+        with:
+          ref: "${{ inputs.ref }}"
       - uses: "actions/setup-node@v4"
         with:
           cache: "yarn"
@@ -35,6 +37,8 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v4"
+        with:
+          ref: "${{ inputs.ref }}"
       - run: "pipx install poetry"
       - uses: "actions/setup-python@v5"
         with:
@@ -48,6 +52,8 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v4"
+        with:
+          ref: "${{ inputs.ref }}"
       - run: "pipx install poetry"
       - uses: "actions/setup-python@v5"
         with:
@@ -66,13 +72,15 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v4"
+        with:
+          ref: "${{ inputs.ref }}"
       - run: "pipx install poetry"
       - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
           cache: "poetry"
       - run: "SKIP_BUILD_FRONTEND=true poetry install"
-      - run: "PYTHONPATH=yacv_server YACV_DISABLE_SERVER=true poetry run python example/object.py"
+      - run: "YACV_DISABLE_SERVER=true poetry run python example/object.py"
       - uses: "actions/upload-artifact@v4"
         with:
           name: "example"
diff --git a/yacv_server/__init__.py b/yacv_server/__init__.py
index 182a33f..f567dc6 100644
--- a/yacv_server/__init__.py
+++ b/yacv_server/__init__.py
@@ -1,6 +1,6 @@
 import os
 
-from cad import image_to_gltf
+from yacv_server.cad import image_to_gltf
 from yacv_server.yacv import YACV
 
 yacv = YACV()
diff --git a/yacv_server/myhttp.py b/yacv_server/myhttp.py
index b1a0f27..6b2377a 100644
--- a/yacv_server/myhttp.py
+++ b/yacv_server/myhttp.py
@@ -7,7 +7,7 @@ from http.server import SimpleHTTPRequestHandler
 
 from iterators import TimeoutIterator
 
-from mylogger import logger
+from yacv_server.mylogger import logger
 
 # Find the frontend folder (optional, but recommended)
 FILE_DIR = os.path.dirname(__file__)
diff --git a/yacv_server/yacv.py b/yacv_server/yacv.py
index d7b4ad2..1280fcd 100644
--- a/yacv_server/yacv.py
+++ b/yacv_server/yacv.py
@@ -18,8 +18,8 @@ from OCP.TopoDS import TopoDS_Shape
 from build123d import Shape, Axis, Location, Vector
 from dataclasses_json import dataclass_json
 
-from myhttp import HTTPHandler
 from yacv_server.cad import get_shape, grab_all_cad, CADCoreLike, CADLike
+from yacv_server.myhttp import HTTPHandler
 from yacv_server.mylogger import logger
 from yacv_server.pubsub import BufferedPubSub
 from yacv_server.tessellate import _hashcode, tessellate
@@ -302,10 +302,10 @@ def _preprocess_cad(obj: CADLike, **kwargs) -> CADCoreLike:
 _find_var_name_count = 0
 
 
-def _find_var_name(obj: any) -> str:
+def _find_var_name(obj: any, avoid_levels: int = 2) -> str:
     """A hacky way to get a stable name for an object that may change over time"""
     global _find_var_name_count
-    for frame in inspect.stack():
+    for frame in inspect.stack()[avoid_levels:]:
         for key, value in frame.frame.f_locals.items():
             if value is obj:
                 return key