fix

Signed-off-by: laminar <[email protected]>

Author: tpiperatgod

src/functions_framework/context/function_context.py

@@ -19,7 +19,7 @@ class FunctionContext(object):
 
     def __init__(self, name="", version="", dapr_triggers=None, http_trigger=None,
                  inputs=None, outputs=None, states=None,
-                 pre_hooks=None, post_hooks=None, tracing=None, port=8080):
+                 pre_hooks=None, post_hooks=None, tracing=None, port=0):
         self.name = name
         self.version = version
         self.dapr_triggers = dapr_triggers
@@ -44,6 +44,7 @@ def from_json(json_dct):
         pre_hooks = json_dct.get('pre_hooks', [])
         post_hooks = json_dct.get('post_hooks', [])
         tracing = json_dct.get('tracing', {})
+        port = json_dct.get('port', 0)
 
         inputs = None
         if inputs_list:
@@ -59,14 +60,15 @@ def from_json(json_dct):
                 output = Component.from_json(v)
                 outputs[k] = output
 
-        dapr_triggers = [DaprTrigger]
+        dapr_triggers = []
         for trigger in _dapr_triggers:
             dapr_triggers.append(DaprTrigger.from_json(trigger))
 
-        http_trigger = HTTPRoute.from_json(http_trigger)
+        if http_trigger:
+            http_trigger = HTTPRoute.from_json(http_trigger)
 
         return FunctionContext(name, version, dapr_triggers, http_trigger,
-                               inputs, outputs, states, pre_hooks, post_hooks, tracing)
+                               inputs, outputs, states, pre_hooks, post_hooks, tracing, port)
 
 
 class Component(object):

src/functions_framework/context/runtime_context.py

@@ -11,7 +11,12 @@
 # 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.
-from functions_framework.context.function_context import Component, FunctionContext
+from functions_framework.context.function_context import (
+    Component,
+    DaprTrigger,
+    FunctionContext,
+    HTTPRoute,
+)
 
 
 class RuntimeContext:
@@ -29,14 +34,14 @@ def has_http_trigger(self):
         """Check if the function has http trigger."""
         return self.context and self.context.http_trigger
 
-    def get_dapr_triggers(self):
+    def get_dapr_triggers(self) -> [DaprTrigger]:
         """Get dapr trigger."""
         if self.context:
             return self.context.dapr_triggers
         else:
             return []
 
-    def get_http_trigger(self):
+    def get_http_trigger(self) -> HTTPRoute:
         """Get http trigger."""
         if self.context:
             return self.context.http_trigger
@@ -47,4 +52,4 @@ def get_outputs(self) -> [Component]:
         if self.context and self.context.outputs:
             return self.context.outputs
         else:
-            return [Component]
+            return []

src/functions_framework/triggers/dapr_trigger/dapr.py

@@ -18,6 +18,7 @@
 from cloudevents.sdk.event import v1
 from dapr.ext.grpc import App, BindingRequest
 
+from functions_framework import constants
 from functions_framework.context.function_context import DaprTrigger
 from functions_framework.context.runtime_context import RuntimeContext
 from functions_framework.context.user_context import UserContext
@@ -31,6 +32,8 @@ def __init__(self, port, triggers: [DaprTrigger] = None, user_function=None):
         self.triggers = triggers
         self.app = App()
         self.user_function = user_function
+        if self.port == 0:
+            self.port = constants.DEFAULT_DAPR_APP_PORT
 
     def start(self, context: RuntimeContext, logger=None):
         if not self.triggers:

src/functions_framework/triggers/http_trigger/http.py

@@ -32,7 +32,7 @@ def __init__(self, port, trigger: HTTPRoute, source=None, target=None, user_func
         self.route_rules = trigger.rules
         self.user_function = user_function
         self.debug = debug
-        if self.port is None:
+        if self.port == 0:
             self.port = constants.DEFAULT_HTTP_APP_PORT
 
     def start(self, context: RuntimeContext, logger=None):