irie 0.0.49__py3-none-any.whl → 0.0.51__py3-none-any.whl

irie/apps/prediction/views.py

@@ -29,15 +29,6 @@ from irie.apps.prediction.predictor import PREDICTOR_TYPES
 from irie.apps.prediction.models import PredictorModel
 from .forms import PredictorForm
 
-@login_required(login_url="/login/")
-def new_prediction(request):
-    context = {}
-
-    page_template = "form-submission.html"
-    context["segment"] = page_template
-    html_template = loader.get_template("prediction/" + page_template)
-    return HttpResponse(html_template.render(context, request))
-
 
 @login_required(login_url="/login/")
 def asset_predictors(request, calid):
@@ -67,11 +58,51 @@ def asset_predictors(request, calid):
     return HttpResponse(html_template.render(context, request))
 
 
+@login_required(login_url="/login/")
+def predictor_profile_detail(request, calid, preid):
+    print(preid)
+    try:
+        predictor = PredictorModel.objects.get(pk=int(preid))
+    except ObjectDoesNotExist:
+        return raise404(request, {})
+    
+    sname = request.GET.get("section", None)
+
+    runner = PREDICTOR_TYPES[predictor.protocol](predictor) 
+
+    try:
+        data, mesh = runner.structural_section(sname)
+    except Exception as e:
+        raise e
+        return HttpResponse(
+            json.dumps({"error": "Section not found"}),
+            content_type="application/json",
+            status=404
+        )
+    from veux.plane import PlaneModel
+    art = veux.create_artist(mesh, ndf=1, canvas="gltf")
+    art.draw_surfaces()
+    art.draw_outlines()
+
+    glb = art.canvas.to_glb()
+    return HttpResponse(glb, content_type="application/binary")
+    glb64 = base64.b64encode(glb).decode("utf-8")
+    # rendering = f"data:application/octet-stream;base64,{glb64}"
+    # rendering = art._repr_html_()
+    r = dict(
+        properties = {
+            "Area": 1.0,
+            "Inertia": 2.0
+        },
+        rendering = glb64 #rendering
+    )
+    return HttpResponse(json.dumps(r), content_type="application/json")
+    
+
 @login_required(login_url="/login/")
 def predictor_profile(request, calid, preid):
 
     context = {}
-    html_template = loader.get_template("prediction/predictor-profile.html")
     context["segment"] = "inventory"
 
     try:
@@ -85,13 +116,19 @@ def predictor_profile(request, calid, preid):
         return raise404(request, context)
 
     context["asset"] = asset
-    context["predictor"] = PREDICTOR_TYPES[predictor.protocol](predictor)
+    context["runner"] = PREDICTOR_TYPES[predictor.protocol](predictor)
+    context["predictor"] = predictor
+    context["sensors"] = predictor.sensorassignment_set.all()
 
-    try:
-        return HttpResponse(html_template.render(context, request))
+    if predictor.protocol == PredictorModel.Protocol.TYPE1:
+        html_template = loader.get_template("prediction/xara-profile.html")
+        context["members"] = context["runner"].structural_members()
 
-    except TemplateDoesNotExist:
-        context["rendering"] = None
+    else:
+        html_template = loader.get_template("prediction/predictor-profile.html")
+
+
+    try:
         return HttpResponse(html_template.render(context, request))
 
     except Exception as e:
@@ -118,13 +155,13 @@ def asset_map(request, calid):
         context["render_src"] = asset.rendering
 
     elif request.method == "POST":
-        from openbim.csi import load, create_model, collect_outlines
         # context["offset"] = json.dumps(list(reversed(list(asset.coordinates))))
         context["rotate"] = "[0, 0, 0]"
         context["scale"]  = 1/3.2808 # TODO
 
         uploaded_file = request.FILES.get('config_file')
 
+        from openbim.csi import load, create_model, collect_outlines
         try:
             csi = load((str(line.decode()).replace("\r\n","\n") for line in uploaded_file.readlines()))
         except Exception as e:
@@ -155,12 +192,22 @@ def asset_map(request, calid):
 
 
 
+@login_required(login_url="/login/")
+def create_mdof(request):
+    "Create system id"
+    context = {}
+
+    page_template = "create-mdof.html"
+    context["segment"] = page_template
+    html_template = loader.get_template("prediction/" + page_template)
+    return HttpResponse(html_template.render(context, request))
+
 
 @login_required(login_url="/login/")
-def predictor_upload(request, calid):
+def create_model(request, calid):
 
     asset = Asset.objects.get(calid=calid)
-    html_template = loader.get_template("prediction/predictor-upload.html")
+    html_template = loader.get_template("prediction/create-model.html")
     r400 = loader.get_template("site/page-400.html")
     context = {
         "asset": asset,
@@ -170,24 +217,33 @@ def predictor_upload(request, calid):
     }
 
     if request.method == "POST":
-        from openbim.csi import load, create_model, collect_outlines
         form = PredictorForm(request.POST, request.FILES)
 
         uploaded_file = request.FILES.get('config_file')
 
+        from openbim.csi import load, create_model, collect_outlines
+        # 1) Parse the CSI file
         try:
             csi = load((str(line.decode()).replace("\r\n","\n") for line in uploaded_file.readlines()))
         except Exception as e:
             return HttpResponse(r400.render({"message": json.dumps({"error": str(e)})}), status=400)
 
-        model = create_model(csi, verbose=True)
+        # 2) Process CSI data into xara model
+        try:
+            model = create_model(csi, verbose=True)
+        except Exception as e:
+            return HttpResponse(r400.render({"message": json.dumps({"error": str(e)})}), status=400)
 
-        # Generate the .glb file using veux
+        # 3) Render the model
         outlines = collect_outlines(csi, model.frame_tags)
-        artist = veux.create_artist(model, canvas="gltf", vertical=3,
-                             model_config={"frame_outlines": outlines}
+        artist = veux.create_artist(model,
+                                    canvas="gltf",
+                                    vertical=3,
+                                    model_config={"frame_outlines": outlines}
         )
         artist.draw_surfaces()
+
+        # Generate the .glb file
         glb = artist.canvas.to_glb()
 
         if request.POST.get("action") == "commit":
@@ -198,7 +254,9 @@ def predictor_upload(request, calid):
             predictor.asset = asset
             predictor.name = form.cleaned_data['name']
             predictor.description = "empty"
+            predictor.protocol = PredictorModel.Protocol.TYPE1
 
+            predictor.config_file.save(uploaded_file.name, ContentFile(uploaded_file.read()), save=True)
             predictor.render_file.save(f"{uuid.uuid4()}.glb", ContentFile(glb), save=True)
             predictor.save()
 
@@ -210,7 +268,6 @@ def predictor_upload(request, calid):
 
     try:
         return HttpResponse(html_template.render(context, request))
-        # return render(request, "prediction/predictor-upload.html", {"form": form})
 
     except Exception as e:
         if "DEBUG" in os.environ and os.environ["DEBUG"]:

irie/apps/static/assets/css/brace.css

@@ -4847,12 +4847,12 @@ textarea.form-control-lg {
 
 .nav-tabs {
   --bs-nav-tabs-border-width: 0.0625rem;
-  --bs-nav-tabs-border-color: #9CA3AF;
-  --bs-nav-tabs-border-radius: 0.5rem;
-  --bs-nav-tabs-link-hover-border-color: #E5E7EB #E5E7EB #9CA3AF;
+  --bs-nav-tabs-border-color: #D1D5DB;
+  --bs-nav-tabs-border-radius: 0.375rem;
+  --bs-nav-tabs-link-hover-border-color: #E5E7EB #E5E7EB #D1D5DB;
   --bs-nav-tabs-link-active-color: #374151;
-  --bs-nav-tabs-link-active-bg: #9CA3AF;
-  --bs-nav-tabs-link-active-border-color: #9CA3AF;
+  --bs-nav-tabs-link-active-bg: #F2F4F6;
+  --bs-nav-tabs-link-active-border-color: #D1D5DB #D1D5DB #F2F4F6;
   border-bottom: var(--bs-nav-tabs-border-width) solid var(--bs-nav-tabs-border-color);
 }
 .nav-tabs .nav-link {
@@ -24245,28 +24245,6 @@ svg.text-dark .color-background {
   margin-top: 7.1875rem !important;
 }
 
-.navbar-vertical .navbar-nav .nav-link[data-bs-toggle=collapse]:after {
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  font-family: "Font Awesome 5 Free";
-  font-weight: 700;
-  content: "\f107";
-  margin-left: auto;
-  color: rgba(206, 212, 218, 0.7);
-  transition: all 0.2s ease;
-}
-@media (prefers-reduced-motion: reduce) {
-  .navbar-vertical .navbar-nav .nav-link[data-bs-toggle=collapse]:after {
-    transition: none;
-  }
-}
-.navbar-vertical .navbar-nav .nav-link[data-bs-toggle=collapse][aria-expanded=true]:after {
-  color: #CED4DA;
-  transform: rotate(180deg);
-}
 .navbar-vertical .navbar-nav .nav-link[data-bs-toggle=collapse].active:after {
   color: #ffffff;
 }
@@ -29952,10 +29930,6 @@ label {
   padding: 1rem 1rem;
   background-color: #ffffff;
 }
-.nav-tabs .nav-link.active {
-  color: #ffffff;
-  background-color: #1F2937;
-}
 .nav-tabs.nav-dark .nav-link.active {
   color: #ffffff;
   background-color: #12358a;