Merge pull request #64 from diffo-dev/63-update-to-refactored-ashneo4j

63 update to refactored ashneo4j

Author: matt-beanland

config/config.exs

@@ -36,5 +36,7 @@ config :spark,
     ]
   ]
 
+config :ash, :custom_expressions, [Diffo.Unwrap.AshCustomExpression]
+
 config :diffo, ash_domains: [Diffo.Provider]
 import_config "#{config_env()}.exs"

config/dev.exs

@@ -23,5 +23,6 @@ level =
   end
 
 config :logger, :console,
-  level: level,
+  # level: level,
+  level: :debug,
   format: "$date $time [$level] $metadata$message\n"

config/test.exs

@@ -4,7 +4,6 @@
 
 import Config
 
-config :logger, level: :warning
 config :ash, disable_async?: true
 config :ash, :missed_notifications, :ignore
 
@@ -16,8 +15,8 @@ config :bolty, Bolt,
   max_overflow: 3,
   prefix: :default,
   name: Bolt,
-  log: true,
-  log_hex: true
+  log: false,
+  log_hex: false
 
 level =
   if System.get_env("DEBUG") do
@@ -26,6 +25,8 @@ level =
     :info
   end
 
+config :logger, level: level
+
 config :logger, :console,
   level: level,
   format: "$date $time [$level] $metadata$message\n"

documentation/how_to/use_diffo_provider_instance_extension.livemd

@@ -535,7 +535,7 @@ We need to define each GPU instance, in this case defining the gpu Characteristi
 ```elixir
 updates = [
   gpu: [family: :nvidia, model: "GeForce RTX5090", technology: :blackwell],
-  cores: [first: 1, last: 680, free: 680, type: "tensor"]
+  cores: [first: 1, last: 680, free: 680, assignable_type: "tensor"]
 ]
 
 gpu_1 = Compute.define_gpu!(gpu_1, %{characteristic_value_updates: updates})

lib/diffo/helpers/uuid.ex

@@ -102,10 +102,10 @@ defmodule Diffo.Uuid do
   @doc """
   Returns trailing uuid4 if valid, or nil.
   ## Examples
-    iex> Diffo.Uuid.trailing_uuid4("serviceInventoryManagement/v4/service/accessEvc/d2566874-d5ee-400b-9983-10d63ec52f32")
+    iex> Diffo.Uuid.trailing_uuid4("serviceInventoryManagement/v4/service/d2566874-d5ee-400b-9983-10d63ec52f32")
     "d2566874-d5ee-400b-9983-10d63ec52f32"
 
-    iex> Diffo.Uuid.trailing_uuid4("serviceInventoryManagement/v4/service/accessEvc/d2566874-d5ee-400b-9983")
+    iex> Diffo.Uuid.trailing_uuid4("serviceInventoryManagement/v4/service/d2566874-d5ee-400b-9983")
     nil
 
     iex> Diffo.Uuid.trailing_uuid4("d2566874-d5ee-400b-9983-10d63ec52f32")
@@ -136,7 +136,7 @@ defmodule Diffo.Uuid do
     iex> Diffo.Uuid.expect_uuid4("d2566874-d5ee-400b-9983-10d63ec52f32")
     nil
 
-    iex> Diffo.Uuid.expect_uuid4("serviceInventoryManagement/v4/service/accessEvc/d2566874-d5ee-400b-9983-10d63ec52f32")
+    iex> Diffo.Uuid.expect_uuid4("serviceInventoryManagement/v4/service/d2566874-d5ee-400b-9983-10d63ec52f32")
     :uuid4
 
     iex> Diffo.Uuid.expect_uuid4(nil)
@@ -154,10 +154,10 @@ defmodule Diffo.Uuid do
   @doc """
   Callback function for outstanding to expect trailing uuid4.
   ## Examples
-    iex> Diffo.Uuid.expect_trailing_uuid4("serviceInventoryManagement/v4/service/accessEvc/d2566874-d5ee-400b-9983-10d63ec52f32")
+    iex> Diffo.Uuid.expect_trailing_uuid4("serviceInventoryManagement/v4/service/d2566874-d5ee-400b-9983-10d63ec52f32")
     nil
 
-    iex> Diffo.Uuid.expect_trailing_uuid4("serviceInventoryManagement/v4/service/accessEvc/d2566874-d5ee-400b-9983")
+    iex> Diffo.Uuid.expect_trailing_uuid4("serviceInventoryManagement/v4/service/d2566874-d5ee-400b-9983")
     :trailing_uuid4
 
     iex> Diffo.Uuid.expect_trailing_uuid4("d2566874-d5ee-400b-9983-10d63ec52f32")

lib/diffo/provider/assigner/assignable_value.ex

@@ -11,8 +11,9 @@ defmodule Diffo.Provider.AssignableValue do
   use Ash.TypedStruct, extensions: [AshJason.TypedStruct]
 
   jason do
-    pick [:first, :last, :free, :type, :algorithm]
+    pick [:first, :last, :free, :assignable_type, :algorithm]
     compact true
+    rename assignable_type: :type
   end
 
   typed_struct do
@@ -31,7 +32,7 @@ defmodule Diffo.Provider.AssignableValue do
       default: 1,
       constraints: [min: 0]
 
-    field :type, :atom, description: "the type of the assignable thing"
+    field :assignable_type, :string, description: "the type of the assignable thing"
 
     field :algorithm, :atom,
       description: "the assignment algorithm",

lib/diffo/provider/assigner/assigner.ex

@@ -10,6 +10,7 @@ defmodule Diffo.Provider.Assigner do
   """
 
   alias Diffo.Provider.AssignableValue
+  alias Diffo.Type.Value
 
   @doc """
   Assign a thing using the instance changeset assignment
@@ -53,7 +54,11 @@ defmodule Diffo.Provider.Assigner do
   defp relate_is_assigned(result, things, thing, value, assignee_id)
        when is_struct(result) and is_atom(things) and is_atom(thing) and is_integer(value) and
               is_bitstring(assignee_id) do
-    case Diffo.Provider.create_characteristic(%{name: thing, value: value, type: :relationship}) do
+    case Diffo.Provider.create_characteristic(%{
+           name: thing,
+           value: Value.primitive("integer", value),
+           type: :relationship
+         }) do
       {:ok, characteristic} ->
         case Diffo.Provider.create_relationship(%{
                type: :assignedTo,
@@ -62,7 +67,6 @@ defmodule Diffo.Provider.Assigner do
                characteristics: [characteristic.id]
              }) do
           {:ok, _relationship} ->
-            # we haven't refreshed the result there will be a new forward_relationship and an updated things characteristic
             case decrement_free(result, things) do
               :ok ->
                 {:ok, result}
@@ -91,7 +95,7 @@ defmodule Diffo.Provider.Assigner do
                                                    } ->
         type == :assignedTo and target_id == assignee_id and
           Enum.any?(characteristics, fn %{name: name, value: v} ->
-            name == thing and v == value
+            name == thing and Diffo.Unwrap.unwrap(v) == value
           end)
       end)
 
@@ -105,16 +109,13 @@ defmodule Diffo.Provider.Assigner do
         characteristic =
           Enum.find(relationship.characteristics, fn %{name: n} -> n == thing end)
 
-        # unrelate the relationship characterisitic
         relationship =
           Diffo.Provider.unrelate_relationship_characteristics!(relationship, %{
             characteristics: [characteristic.id]
           })
 
-        # delete the relationship characteristic
         Diffo.Provider.delete_characteristic(characteristic.id)
 
-        # delete the relationship
         case Diffo.Provider.delete_relationship(relationship.id) do
           :ok ->
             case increment_free(result, things) do
@@ -148,8 +149,8 @@ defmodule Diffo.Provider.Assigner do
           if characteristic do
             assignment =
               struct(Diffo.Provider.Assignment, %{
-                id: characteristic.value,
-                type: thing,
+                id: Diffo.Unwrap.unwrap(characteristic.value),
+                assignable_type: thing,
                 assignee_id: target_id
               })
 
@@ -168,9 +169,10 @@ defmodule Diffo.Provider.Assigner do
   defp next(instance, things, thing)
        when is_struct(instance) and is_atom(things) and is_atom(thing) do
     characteristic = Enum.find(instance.characteristics, fn %{name: name} -> name == things end)
-    algorithm = Map.get(characteristic.value, :algorithm)
+    assignable_value = Diffo.Unwrap.unwrap(characteristic.value)
+    algorithm = Map.get(assignable_value, :algorithm)
 
-    case free = free(instance, thing, characteristic.value) do
+    case free = free(instance, thing, assignable_value) do
       [] ->
         {:error, "all things are assigned"}
 
@@ -191,7 +193,8 @@ defmodule Diffo.Provider.Assigner do
   defp assignable?(instance, things, thing, value)
        when is_struct(instance) and is_atom(things) and is_atom(thing) and is_integer(value) do
     characteristic = Enum.find(instance.characteristics, fn %{name: name} -> name == things end)
-    free = free(instance, thing, characteristic.value)
+    assignable_value = Diffo.Unwrap.unwrap(characteristic.value)
+    free = free(instance, thing, assignable_value)
 
     value in free
   end
@@ -200,10 +203,15 @@ defmodule Diffo.Provider.Assigner do
     characteristic =
       Enum.find(instance.characteristics, fn %{name: name} -> name == things end)
 
-    {_free, assignable_value} =
-      Map.get_and_update(characteristic.value, :free, fn free -> {free - 1, free - 1} end)
+    assignable_value = Diffo.Unwrap.unwrap(characteristic.value)
 
-    case Diffo.Provider.update_characteristic(characteristic, %{value: assignable_value}) do
+    {_free, updated} =
+      Map.get_and_update(assignable_value, :free, fn free -> {free - 1, free - 1} end)
+
+    {:ok, new_struct} = Ash.Type.cast_input(AssignableValue, Map.from_struct(updated), AssignableValue.subtype_constraints())
+    new_value = Value.dynamic(AssignableValue, new_struct)
+
+    case Diffo.Provider.update_characteristic(characteristic, %{value: new_value}) do
       {:ok, _characteristic} ->
         :ok
 
@@ -216,10 +224,15 @@ defmodule Diffo.Provider.Assigner do
     characteristic =
       Enum.find(instance.characteristics, fn %{name: name} -> name == things end)
 
-    {_free, assignable_value} =
-      Map.get_and_update(characteristic.value, :free, fn free -> {free + 1, free + 1} end)
+    assignable_value = Diffo.Unwrap.unwrap(characteristic.value)
+
+    {_free, updated} =
+      Map.get_and_update(assignable_value, :free, fn free -> {free + 1, free + 1} end)
+
+    {:ok, new_struct} = Ash.Type.cast_input(AssignableValue, Map.from_struct(updated), AssignableValue.subtype_constraints())
+    new_value = Value.dynamic(AssignableValue, new_struct)
 
-    case Diffo.Provider.update_characteristic(characteristic, %{value: assignable_value}) do
+    case Diffo.Provider.update_characteristic(characteristic, %{value: new_value}) do
       {:ok, _characteristic} ->
         :ok
 

lib/diffo/provider/assigner/assignment.ex

@@ -11,16 +11,17 @@ defmodule Diffo.Provider.Assignment do
   use Ash.TypedStruct, extensions: [AshJason.TypedStruct]
 
   jason do
-    pick [:id, :assignee_id, :operation]
+    pick [:id, :assignee_id, :assignable_type, :operation]
     compact true
+    rename assignable_type: :type
   end
 
   typed_struct do
     field :id, :integer,
       constraints: [min: 0],
       description: "the id of the assigned thing"
 
-    field :type, :atom, description: "the type of the assigned thing"
+    field :assignable_type, :string, description: "the type of the assigned thing"
 
     field :assignee_id, :uuid, description: "the id of the assignee Ash resource"
 

lib/diffo/provider/components/base_instance.ex

@@ -504,18 +504,7 @@ defmodule Diffo.Provider.BaseInstance do
   end
 
   calculations do
-    calculate :href,
-              :string,
-              expr(
-                type <>
-                  "InventoryManagement/v" <>
-                  specification.tmf_version <>
-                  "/" <>
-                  type <>
-                  "/" <>
-                  specification.name <>
-                  "/" <> id
-              ) do
+    calculate :href, :string, Diffo.Provider.Calculations.InstanceHref do
       description "the inventory href of the service or resource instance"
     end
   end

lib/diffo/provider/components/calculations/instance_href.ex

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2025 diffo contributors <https://github.com/diffo-dev/diffo/graphs.contributors>
+#
+# SPDX-License-Identifier: MIT
+
+defmodule Diffo.Provider.Calculations.InstanceHref do
+  @moduledoc """
+  Diffo - TMF Service and Resource Management with a difference
+
+  InstanceHref - Ash Resource Calculation for generating instance href
+
+  """
+  use Ash.Resource.Calculation
+
+  @impl true
+  def load(_query, _opts, _context), do: [:specification]
+
+  @impl true
+  def calculate(records, _opts, _context) do
+    Enum.map(records, fn record ->
+      case record.specification do
+        %{tmf_version: tmf_version, type: :serviceSpecification} ->
+          "serviceInventoryManagement/v#{tmf_version}/service/#{record.id}"
+
+        %{tmf_version: tmf_version, type: :resourceSpecification} ->
+          "resourceInventoryManagement/v#{tmf_version}/resource/#{record.id}"
+
+        _ ->
+          nil
+      end
+    end)
+  end
+end