Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

uplift function activator interface #1953

Merged
merged 1 commit into from
Jun 26, 2023
Merged

uplift function activator interface #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 37 additions & 12 deletions ...api/src/main/java/org/finos/legend/engine/functionActivator/api/FunctionActivatorAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,8 @@ public Response validate(FunctionActivatorInput input, @ApiParam(hidden = true)
String clientVersion = input.clientVersion == null ? PureClientVersions.production : input.clientVersion;
PureModel pureModel = modelManager.loadModel(input.model, clientVersion, profiles, null);
Root_meta_external_functionActivator_FunctionActivator activator = (Root_meta_external_functionActivator_FunctionActivator) pureModel.getPackageableElement(input.functionActivator);
FunctionActivatorService<Root_meta_external_functionActivator_FunctionActivator> service = FunctionActivatorLoader.extensions().select(c -> c.supports(activator)).getFirst();
if (service == null)
{
throw new RuntimeException(activator.getClass().getSimpleName() + "is not supported!");
}
return Response.ok(objectMapper.writeValueAsString(service.validate(pureModel, activator, routerExtensions))).type(MediaType.APPLICATION_JSON_TYPE).build();
FunctionActivatorService<Root_meta_external_functionActivator_FunctionActivator> service = getActivatorService(activator, pureModel);
return Response.ok(objectMapper.writeValueAsString(service.validate(pureModel, activator, input.model, routerExtensions))).type(MediaType.APPLICATION_JSON_TYPE).build();
}
catch (Exception ex)
{
Expand All @@ -117,17 +113,46 @@ public Response publishToSandbox(FunctionActivatorInput input, @ApiParam(hidden
String clientVersion = input.clientVersion == null ? PureClientVersions.production : input.clientVersion;
PureModel pureModel = modelManager.loadModel(input.model, clientVersion, profiles, null);
Root_meta_external_functionActivator_FunctionActivator activator = (Root_meta_external_functionActivator_FunctionActivator) pureModel.getPackageableElement(input.functionActivator);
FunctionActivatorService<Root_meta_external_functionActivator_FunctionActivator> service = FunctionActivatorLoader.extensions().select(c -> c.supports(activator)).getFirst();
if (service == null)
{
throw new RuntimeException(activator.getClass().getSimpleName() + "is not supported!");
}
return Response.ok(objectMapper.writeValueAsString(service.publishToSandbox(pureModel, activator, routerExtensions))).type(MediaType.APPLICATION_JSON_TYPE).build();
FunctionActivatorService<Root_meta_external_functionActivator_FunctionActivator> service = getActivatorService(activator,pureModel);
return Response.ok(objectMapper.writeValueAsString(service.publishToSandbox(pureModel, activator, input.model, routerExtensions))).type(MediaType.APPLICATION_JSON_TYPE).build();
}
catch (Exception ex)
{
ex.printStackTrace();
return ExceptionTool.exceptionManager(ex, LoggingEventType.CATCH_ALL, profiles);
}
}

@POST
@Path("renderArtifact")
@ApiOperation(value = "Display generated artifact as text where applicable")
@Consumes({MediaType.APPLICATION_JSON, APPLICATION_ZLIB})
@Produces(MediaType.APPLICATION_JSON)
public Response renderArtifact(FunctionActivatorInput input, @ApiParam(hidden = true) @Pac4JProfileManager ProfileManager<CommonProfile> pm)
{
MutableList<CommonProfile> profiles = ProfileManagerHelper.extractProfiles(pm);
try
{
String clientVersion = input.clientVersion == null ? PureClientVersions.production : input.clientVersion;
PureModel pureModel = modelManager.loadModel(input.model, clientVersion, profiles, null);
Root_meta_external_functionActivator_FunctionActivator activator = (Root_meta_external_functionActivator_FunctionActivator) pureModel.getPackageableElement(input.functionActivator);
FunctionActivatorService<Root_meta_external_functionActivator_FunctionActivator> service = getActivatorService(activator, pureModel);
return Response.ok(objectMapper.writeValueAsString(service.renderArtifact(pureModel, activator, input.model, routerExtensions))).type(MediaType.APPLICATION_JSON_TYPE).build();
}
catch (Exception ex)
{
ex.printStackTrace();
return ExceptionTool.exceptionManager(ex, LoggingEventType.CATCH_ALL, profiles);
}
}

public FunctionActivatorService<Root_meta_external_functionActivator_FunctionActivator> getActivatorService(Root_meta_external_functionActivator_FunctionActivator activator, PureModel pureModel)
{
FunctionActivatorService<Root_meta_external_functionActivator_FunctionActivator> service = FunctionActivatorLoader.extensions().select(c -> c.supports(activator)).getFirst();
if (service == null)
{
throw new RuntimeException(activator.getClass().getSimpleName() + "is not supported!");
}
return service;
}
}
19 changes: 19 additions & 0 deletions ...ain/java/org/finos/legend/engine/functionActivator/service/FunctionActivatorArtifact.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright 2023 Goldman Sachs
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package org.finos.legend.engine.functionActivator.service;

public class FunctionActivatorArtifact
{
}
7 changes: 5 additions & 2 deletions ...main/java/org/finos/legend/engine/functionActivator/service/FunctionActivatorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.eclipse.collections.api.list.MutableList;
import org.finos.legend.engine.functionActivator.api.output.FunctionActivatorInfo;
import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContext;
import org.finos.legend.pure.generated.Root_meta_external_functionActivator_FunctionActivator;
import org.finos.legend.pure.generated.Root_meta_pure_extension_Extension;

Expand All @@ -28,7 +29,9 @@ public interface FunctionActivatorService<T extends Root_meta_external_functionA

boolean supports(Root_meta_external_functionActivator_FunctionActivator packageableElement);

MutableList<? extends FunctionActivatorError> validate(PureModel pureModel, T functionActivator, Function<PureModel, RichIterable<? extends Root_meta_pure_extension_Extension>> routerExtensions);
MutableList<? extends FunctionActivatorError> validate(PureModel pureModel, T functionActivator, PureModelContext inputModel, Function<PureModel, RichIterable<? extends Root_meta_pure_extension_Extension>> routerExtensions);

MutableList<? extends FunctionActivatorError> publishToSandbox(PureModel pureModel, T functionActivator, Function<PureModel, RichIterable<? extends Root_meta_pure_extension_Extension>> routerExtensions);
MutableList<? extends FunctionActivatorError> publishToSandbox(PureModel pureModel, T functionActivator, PureModelContext inputModel, Function<PureModel, RichIterable<? extends Root_meta_pure_extension_Extension>> routerExtensions);

FunctionActivatorArtifact renderArtifact(PureModel pureModel, T functionActivator, PureModelContext inputModel, Function<PureModel, RichIterable<? extends Root_meta_pure_extension_Extension>> routerExtensions);
}
30 changes: 30 additions & 0 deletions ...src/main/java/org/finos/legend/engine/language/snowflakeApp/api/SnowflakeAppArtifact.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Copyright 2023 Goldman Sachs
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package org.finos.legend.engine.language.snowflakeApp.api;

import org.eclipse.collections.api.RichIterable;
import org.eclipse.collections.api.factory.Lists;
import org.eclipse.collections.api.list.MutableList;
import org.finos.legend.engine.functionActivator.service.FunctionActivatorArtifact;

public class SnowflakeAppArtifact extends FunctionActivatorArtifact
{
RichIterable<String> sqlExpressions = Lists.mutable.empty();

public SnowflakeAppArtifact(RichIterable<String> sqlExpressions)
{
this.sqlExpressions = sqlExpressions;
}
}
13 changes: 11 additions & 2 deletions .../src/main/java/org/finos/legend/engine/language/snowflakeApp/api/SnowflakeAppService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.finos.legend.engine.plan.execution.stores.relational.connection.manager.ConnectionManagerSelector;
import org.finos.legend.engine.plan.generation.PlanGenerator;
import org.finos.legend.engine.plan.platform.PlanPlatform;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContext;
import org.finos.legend.engine.protocol.snowflakeApp.metamodel.SnowflakeAppProtocolExtension;
import org.finos.legend.pure.generated.Root_meta_external_functionActivator_FunctionActivator;
import org.finos.legend.pure.generated.Root_meta_external_functionActivator_snowflakeApp_SnowflakeApp;
Expand Down Expand Up @@ -77,7 +78,7 @@ public boolean supports(Root_meta_external_functionActivator_FunctionActivator f
}

@Override
public MutableList<? extends FunctionActivatorError> validate(PureModel pureModel, Root_meta_external_functionActivator_snowflakeApp_SnowflakeApp activator, Function<PureModel, RichIterable<? extends Root_meta_pure_extension_Extension>> routerExtensions)
public MutableList<? extends FunctionActivatorError> validate(PureModel pureModel, Root_meta_external_functionActivator_snowflakeApp_SnowflakeApp activator, PureModelContext inputModel, Function<PureModel, RichIterable<? extends Root_meta_pure_extension_Extension>> routerExtensions)
{
RichIterable<String> sqlExpressions = extractSQLExpressions(pureModel, activator, routerExtensions);
return sqlExpressions.size() != 1 ?
Expand All @@ -87,7 +88,7 @@ public MutableList<? extends FunctionActivatorError> validate(PureModel pureMode
}

@Override
public MutableList<? extends FunctionActivatorError> publishToSandbox(PureModel pureModel, Root_meta_external_functionActivator_snowflakeApp_SnowflakeApp activator, Function<PureModel, RichIterable<? extends Root_meta_pure_extension_Extension>> routerExtensions)
public MutableList<? extends FunctionActivatorError> publishToSandbox(PureModel pureModel, Root_meta_external_functionActivator_snowflakeApp_SnowflakeApp activator, PureModelContext inputModel, Function<PureModel, RichIterable<? extends Root_meta_pure_extension_Extension>> routerExtensions)
{
Object[] objects = this.extractSQLExpressionsAndConnectionMetadata(pureModel, activator, routerExtensions);
RichIterable<String> sqlExpressions = (RichIterable<String>) objects[0];
Expand All @@ -108,6 +109,13 @@ public MutableList<? extends FunctionActivatorError> publishToSandbox(PureModel
}
}

@Override
public SnowflakeAppArtifact renderArtifact(PureModel pureModel, Root_meta_external_functionActivator_snowflakeApp_SnowflakeApp activator, PureModelContext inputModel, Function<PureModel, RichIterable<? extends Root_meta_pure_extension_Extension>> routerExtensions)
{
RichIterable<String> sqlExpressions = extractSQLExpressions(pureModel, activator, routerExtensions);
return new SnowflakeAppArtifact(sqlExpressions);
}

private RichIterable<String> extractSQLExpressions(PureModel pureModel, Root_meta_external_functionActivator_snowflakeApp_SnowflakeApp activator, Function<PureModel, RichIterable<? extends Root_meta_pure_extension_Extension>> routerExtensions)
{
PackageableFunction<?> function = activator._function();
Expand Down Expand Up @@ -143,4 +151,5 @@ private RichIterable<Root_meta_pure_executionPlan_ExecutionNode> collectAllNodes
{
return Lists.mutable.with(node).withAll(node._executionNodes().flatCollect(this::collectAllNodes));
}

}
Loading