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

update to elements 2.2.0-alpha.21 and function 1.11.0-alpha.18 #160

Merged
merged 1 commit into from
Jan 9, 2024
Merged

update to elements 2.2.0-alpha.21 and function 1.11.0-alpha.18 #160

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
4 changes: 2 additions & 2 deletions Grids/Grid/dependencies/Grid.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Hypar.Elements" Version="2.0.0-alpha.18" />
<PackageReference Include="Hypar.Functions" Version="1.6.0" />
<PackageReference Include="Hypar.Elements" Version="2.2.0-alpha.21" />
<PackageReference Include="Hypar.Functions" Version="1.11.0-alpha.18" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions Grids/Grid/dependencies/GridInputs.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ public Grid1dInput(Polyline @curve, IList<Vector3> @splitPoints, Grid1dInputSubd

[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")]

public class GridInputs : S3Args
public class GridInputs : ArgsBase

{
[Newtonsoft.Json.JsonConstructor]

public GridInputs(GridInputsMode @mode, double @bubbleRadius, IList<GridAreas> @gridAreas, bool @showDebugGeometry, Overrides @overrides, string bucketName, string uploadsBucket, Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
base(bucketName, uploadsBucket, modelInputKeys, gltfKey, elementsKey, ifcKey)
public GridInputs(GridInputsMode @mode, double @bubbleRadius, IList<GridAreas> @gridAreas, bool @showDebugGeometry, Overrides @overrides, Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
base(modelInputKeys, gltfKey, elementsKey, ifcKey)
{
var validator = Validator.Instance.GetFirstValidatorForType<GridInputs>();
if(validator != null)
Expand Down
8 changes: 7 additions & 1 deletion Grids/Grid/dependencies/LevelVolume.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace Elements
public partial class LevelVolume : GeometricElement
{
[JsonConstructor]
public LevelVolume(Profile @profile, double @height, double @area, string @buildingName, System.Guid? @level, System.Guid? @mass, System.Guid? @planView, Transform @transform = null, Material @material = null, Representation @representation = null, bool @isElementDefinition = false, System.Guid @id = default, string @name = null)
public LevelVolume(Profile @profile, double @height, double @area, string @buildingName, System.Guid? @level, System.Guid? @mass, System.Guid? @planView, IList<Profile> @profiles, Transform @transform = null, Material @material = null, Representation @representation = null, bool @isElementDefinition = false, System.Guid @id = default, string @name = null)
: base(transform, material, representation, isElementDefinition, id, name)
{
this.Profile = @profile;
Expand All @@ -37,8 +37,10 @@ public LevelVolume(Profile @profile, double @height, double @area, string @build
this.Level = @level;
this.Mass = @mass;
this.PlanView = @planView;
this.Profiles = @profiles;
}


// Empty constructor
public LevelVolume()
: base()
Expand Down Expand Up @@ -73,6 +75,10 @@ public LevelVolume()
[JsonProperty("Plan View", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public System.Guid? PlanView { get; set; }

/// <summary>Multiple profiles used for a collection of volumes</summary>
[JsonProperty("Profiles", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public IList<Profile> Profiles { get; set; }


}
}
10 changes: 5 additions & 5 deletions Grids/Grid/src/Function.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Edits to this code will be overwritten the next time you run 'hypar init'.
// DO NOT EDIT THIS FILE.

using Amazon;
using Amazon.Lambda.Core;
using Hypar.Functions.Execution;
using Hypar.Functions.Execution.AWS;
Expand All @@ -19,9 +18,9 @@ public class Function
{
// Cache the model store for use by subsequent
// executions of this lambda.
private IModelStore<GridInputs> store;
private UrlModelStore<GridInputs> store;

public async Task<GridOutputs> Handler(GridInputs args, ILambdaContext context)
public async Task<GridOutputs> Handler(GridInputs args)
{
// Preload dependencies (if they exist),
// so that they are available during model deserialization.
Expand Down Expand Up @@ -62,10 +61,11 @@ public async Task<GridOutputs> Handler(GridInputs args, ILambdaContext context)

if(this.store == null)
{
this.store = new S3ModelStore<GridInputs>(RegionEndpoint.GetBySystemName("us-west-1"));
this.store = new UrlModelStore<GridInputs>();
}


var l = new InvocationWrapper<GridInputs,GridOutputs>(store, Grid.Execute);
var l = new InvocationWrapper<GridInputs,GridOutputs> (store, Grid.Execute);
var output = await l.InvokeAsync(args);
return output;
}
Expand Down
Loading