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

hypar-io · Jan 5, 2024 · 8eaffdc · 8eaffdc
1 parent 6af83aa
commit 8eaffdc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/Grids/Grid/dependencies/Grid.Dependencies.csproj b/Grids/Grid/dependencies/Grid.Dependencies.csproj
@@ -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>
diff --git a/Grids/Grid/dependencies/GridInputs.g.cs b/Grids/Grid/dependencies/GridInputs.g.cs
@@ -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)

diff --git a/Grids/Grid/dependencies/LevelVolume.g.cs b/Grids/Grid/dependencies/LevelVolume.g.cs
@@ -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;
@@ -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()
@@ -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; }
+
 
     }
 }
diff --git a/Grids/Grid/src/Function.g.cs b/Grids/Grid/src/Function.g.cs
@@ -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;
@@ -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.
@@ -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;
         }