Merge pull request #157 from hypar-io/people

Update and stream the People.
hypar-io · Nov 9, 2023 · 9e8fb2d · 9e8fb2d
2 parents eff8ec6 + 9265304
commit 9e8fb2d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/People/dependencies/People.Dependencies.csproj b/People/dependencies/People.Dependencies.csproj
@@ -4,9 +4,9 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Hypar.Elements" Version="1.4.0" />
-    <PackageReference Include="Hypar.Functions" Version="1.3.0" />
-  </ItemGroup>
+    <ItemGroup>
+      <PackageReference Include="Hypar.Elements" Version="2.1.0" />
+      <PackageReference Include="Hypar.Functions" Version="1.10.0" />
+    </ItemGroup>
 
 </Project>
diff --git a/People/dependencies/PeopleInputs.g.cs b/People/dependencies/PeopleInputs.g.cs
@@ -24,13 +24,13 @@ namespace People
 
     [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")]
 
-    public  class PeopleInputs : S3Args
+    public  class PeopleInputs : ArgsBase
 
     {
         [Newtonsoft.Json.JsonConstructor]
 
-        public PeopleInputs(double @peoplePerFloor, bool @includeSeatedPeople, string bucketName, string uploadsBucket, Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
-        base(bucketName, uploadsBucket, modelInputKeys, gltfKey, elementsKey, ifcKey)
+        public PeopleInputs(double @peoplePerFloor, bool @includeSeatedPeople, Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
+        base(modelInputKeys, gltfKey, elementsKey, ifcKey)
         {
             var validator = Validator.Instance.GetFirstValidatorForType<PeopleInputs>();
             if(validator != null)

diff --git a/People/dependencies/PeopleOutputs.g.cs b/People/dependencies/PeopleOutputs.g.cs
@@ -17,16 +17,13 @@ namespace People
     public class PeopleOutputs: SystemResults
     {
 
-
         /// <summary>
         /// Construct a PeopleOutputs with default inputs.
         /// This should be used for testing only.
         /// </summary>
         public PeopleOutputs() : base()
         {
-
         }
 
-
 	}
 }
diff --git a/People/hypar.json b/People/hypar.json
@@ -4,6 +4,7 @@
   "name": "People",
   "description": "Distribute people on all floors.",
   "language": "C#",
+  "stream_model": true,
   "model_dependencies": [
     {
       "autohide": false,

diff --git a/People/src/Function.g.cs b/People/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<PeopleInputs> store;
+        private UrlModelStore<PeopleInputs> store;
 
-        public async Task<PeopleOutputs> Handler(PeopleInputs args, ILambdaContext context)
+        public async Task<PeopleOutputs> Handler(PeopleInputs args)
         {
             // Preload dependencies (if they exist),
             // so that they are available during model deserialization.
@@ -62,10 +61,11 @@ public async Task<PeopleOutputs> Handler(PeopleInputs args, ILambdaContext conte
 
             if(this.store == null)
             {
-                this.store = new S3ModelStore<PeopleInputs>(RegionEndpoint.GetBySystemName("us-west-1"));
+                this.store = new UrlModelStore<PeopleInputs>();
             }
+
 
-            var l = new InvocationWrapper<PeopleInputs,PeopleOutputs>(store, People.Execute);
+            var l = new InvocationWrapper<PeopleInputs,PeopleOutputs> (store, People.Execute);
             var output = await l.InvokeAsync(args);
             return output;
         }