NREL-Sienna · GabrielKS · Nov 14, 2023 · Nov 20, 2023 · Nov 20, 2023 · Nov 20, 2023
diff --git a/src/metrics.jl b/src/metrics.jl
@@ -106,6 +106,18 @@ struct NoResultError <: Exception
 end
 
 # SMALL FUNCTIONS
+"""
+Whether a given `Component` should be included in analytics. Calls `PSY.get_available` if
+possible, else defaults to `true`.
+"""
+is_available_for_analytics(comp::Component) =
+    try
+        PSY.get_available(comp)
+    catch e  # A bit hacky but the alternative is hardcoding which component types don't have a `get_available` (or using `hasmethod`, which is probably worse)
+        (e isa MethodError) && return true
+        rethrow(e)
+    end
+
-is_available_for_analytics(comp::Component) =
-    try
-        PSY.get_available(comp)
-    catch e  # A bit hacky but the alternative is hardcoding which component types don't have a `get_available` (or using `hasmethod`, which is probably worse)
-        (e isa MethodError) && return true
-        rethrow(e)
-    end
+function is_available_for_analytics(comp::T)
+if hasmethod(PSY.get_available, Tuple{T})
+        return PSY.get_available(comp)
+ else
+ return true
+    end
+    
+
-is_available_for_analytics(comp::Component) =
-    try
-        PSY.get_available(comp)
-    catch e  # A bit hacky but the alternative is hardcoding which component types don't have a `get_available` (or using `hasmethod`, which is probably worse)
-        (e isa MethodError) && return true
-        rethrow(e)
-    end
+function is_available_for_analytics(comp::T)
+if hasmethod(PSY.get_available, Tuple{T})
+        return PSY.get_available(comp)
+ else
+ return true
+    end
+    
+
 # Override these if you define Metric subtypes with different implementations
 get_name(m::Metric) = m.name
 get_eval_fn(m::Metric) = m.eval_fn
@@ -253,7 +265,7 @@ function _compute_one(metric::ComponentTimedMetric, results::IS.Results,
     components = get_components(
         selector,
         PowerSimulations.get_system(results);
-        scope_limiter = get_available,
+        scope_limiter = is_available_for_analytics,
     )
     vals = [
         compute(metric, results, com; kwargs...) for
@@ -304,7 +316,7 @@ function compute(metric::ComponentTimedMetric, results::IS.Results,
     subents = PSY.get_groups(
         selector,
         PowerSimulations.get_system(results);
-        scope_limiter = get_available,
+        scope_limiter = is_available_for_analytics,
     )
     subcomputations = [_compute_one(metric, results, sub; kwargs...) for sub in subents]
     return hcat_timed(subcomputations...)