880 Data Provider Framework in Intersection Module (#948)

Author: jorgenherje

backend_py/primary/primary/routers/surface/router.py

@@ -217,7 +217,7 @@ async def post_get_surface_intersection(
         real_num=realization_num, name=name, attribute=attribute, time_or_interval_str=time_or_interval_str
     )
     if surface is None:
-        raise HTTPException(status_code=404, detail="Surface '{name}' not found")
+        raise HTTPException(status_code=404, detail=f"Surface '{name}' not found")
 
     # Ensure name is applied
     surface.name = name

backend_py/primary/primary/routers/well/converters.py

@@ -46,6 +46,7 @@ def convert_wellbore_pick_to_schema(wellbore_pick: WellborePick) -> schemas.Well
         depthReferencePoint=wellbore_pick.depth_reference_point,
         mdUnit=wellbore_pick.md_unit,
         interpreter=wellbore_pick.interpreter,
+        obsNo=wellbore_pick.obs_no,
     )
 
 

backend_py/primary/primary/routers/well/schemas.py

@@ -56,6 +56,7 @@ class WellborePick(BaseModel):
     depthReferencePoint: str
     mdUnit: str
     interpreter: str | None
+    obsNo: int
 
 
 class WellboreCompletion(BaseModel):

backend_py/primary/primary/services/smda_access/drogon/_drogon_well_data.py

@@ -67,6 +67,7 @@ def get_drogon_well_trajectories() -> List[WellboreTrajectory]:
 def get_drogon_well_picks() -> List[WellborePick]:
     return [
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_STAT",
             easting=462480.0,
             northing=5934232.0,
@@ -82,6 +83,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_STAT",
             easting=462480.0,
             northing=5934232.0,
@@ -97,6 +99,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_STAT",
             easting=462480.0,
             northing=5934232.0,
@@ -112,6 +115,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_STAT",
             easting=462480.0,
             northing=5934232.0,
@@ -127,6 +131,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_STAT",
             easting=462480.0,
             northing=5934232.0,
@@ -142,6 +147,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_STAT",
             easting=463256.9114,
             northing=5930542.2944,
@@ -157,6 +163,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_STAT",
             easting=464220.0686875976,
             northing=5932289.733486914,
@@ -172,6 +179,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_STAT",
             easting=463849.68880478514,
             northing=5931573.151211523,
@@ -187,6 +195,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_STAT",
             easting=464220.0686875976,
             northing=5932289.733486914,
@@ -202,6 +211,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_STAT",
             easting=463256.9114,
             northing=5930542.2944,
@@ -217,6 +227,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_FMU",
             easting=464220.0686875976,
             northing=5932289.733486914,
@@ -232,6 +243,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_STAT",
             easting=463849.68880478514,
             northing=5931573.151211523,
@@ -247,6 +259,7 @@ def get_drogon_well_picks() -> List[WellborePick]:
             md_unit="m",
         ),
         WellborePick(
+            obs_no=1,
             interpreter="DROGON_FMU",
             easting=464220.0686875976,
             northing=5932289.733486914,

backend_py/primary/primary/services/smda_access/types.py

@@ -23,6 +23,7 @@ class WellborePick(BaseModel):
     depth_reference_point: str
     md_unit: str
     interpreter: str | None
+    obs_no: int
 
 
 class WellboreTrajectory(BaseModel):

frontend/src/api/autogen/types.gen.ts

@@ -1172,6 +1172,7 @@ export type WellborePick_api = {
     depthReferencePoint: string;
     mdUnit: string;
     interpreter: string | null;
+    obsNo: number;
 };
 
 export type WellboreTrajectory_api = {

frontend/src/framework/types/viewport.ts

@@ -1 +1,10 @@
+/**
+ * Viewport type definition
+ *
+ * Viewport: [cx, cy, displacement]
+ *
+ * cx: x-coordinate of the center of the viewport
+ * cy: y-coordinate of the center of the viewport
+ * displacement: distance from the center of the viewport to the edge of the viewport in x-direction (horizontal width)
+ */
 export type Viewport = [number, number, number];

frontend/src/lib/components/ToggleButton/toggleButton.tsx

@@ -14,13 +14,19 @@ export type ToggleButtonProps = ButtonUnstyledProps & {
 function ToggleButtonComponent(props: ToggleButtonProps, ref: React.ForwardedRef<HTMLDivElement>) {
     const { active, onToggle, ...other } = props;
     const [isActive, setIsActive] = React.useState<boolean>(active);
+    const [prevIsActive, setPrevIsActive] = React.useState<boolean>(active);
 
     const buttonRef = React.useRef<HTMLButtonElement>(null);
     React.useImperativeHandle<HTMLButtonElement | null, HTMLButtonElement | null>(
         props.buttonRef,
         () => buttonRef.current,
     );
 
+    if (active !== prevIsActive) {
+        setIsActive(active);
+        setPrevIsActive(isActive);
+    }
+
     const handleClick = React.useCallback(() => {
         setIsActive(!isActive);
         onToggle(!active);

frontend/src/lib/utils/ColorSet.ts

@@ -1,4 +1,9 @@
-import type { ColorPalette } from "@lib/utils/ColorPalette";
+import type { ColorPaletteSerialization } from "@lib/utils/ColorPalette";
+import { ColorPalette } from "@lib/utils/ColorPalette";
+
+export type ColorSetSerialization = {
+    colorPalette: ColorPaletteSerialization;
+};
 
 export class ColorSet {
     private _colorPalette: ColorPalette;
@@ -50,4 +55,15 @@ export class ColorSet {
         this._runningIndex = (this._runningIndex + 1) % this._colorPalette.getColors().length;
         return color;
     }
+
+    serialize(): ColorSetSerialization {
+        return {
+            colorPalette: this._colorPalette.serialize(),
+        };
+    }
+
+    static fromSerialized(serialized: ColorSetSerialization): ColorSet {
+        const colorPalette = ColorPalette.fromSerialized(serialized.colorPalette);
+        return new ColorSet(colorPalette);
+    }
 }

frontend/src/lib/utils/assertNonNull.ts

@@ -0,0 +1,7 @@
+export function assertNonNull<T>(value: T | null | undefined, message?: string): T {
+    if (value === null || value === undefined) {
+        message = message || "Value cannot be null or undefined";
+        throw new Error(message);
+    }
+    return value;
+}