Rework inference resolution error.

Author: afoucret

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/inference/InferencePlan.java

@@ -10,6 +10,7 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.expression.UnresolvedAttribute;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 import org.elasticsearch.xpack.esql.plan.logical.UnaryPlan;
@@ -58,5 +59,9 @@ public int hashCode() {
 
     public abstract TaskType taskType();
 
-    public abstract LogicalPlan withInferenceResolutionError(String inferenceId, String error);
+    public abstract InferencePlan withInferenceId(Expression newInferenceId);
+
+    public InferencePlan withInferenceResolutionError(String inferenceId, String error) {
+        return withInferenceId(new UnresolvedAttribute(inferenceId().source(), inferenceId, error));
+    }
 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/inference/Rerank.java

@@ -103,8 +103,7 @@ public TaskType taskType() {
     }
 
     @Override
-    public Rerank withInferenceResolutionError(String inferenceId, String error) {
-        Expression newInferenceId = new UnresolvedAttribute(inferenceId().source(), inferenceId, error);
+    public Rerank withInferenceId(Expression newInferenceId) {
         return new Rerank(source(), child(), newInferenceId, queryText, rerankFields, scoreAttribute);
     }