Skip to content

Commit 9bb6b13

Browse files
committed
fix
Signed-off-by: laminar <[email protected]>
1 parent 62a772f commit 9bb6b13

File tree

3 files changed

+13
-25
lines changed

3 files changed

+13
-25
lines changed

src/functions_framework/context/function_context.py

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def __init__(self, name="", version="", dapr_triggers=None, http_trigger=None,
3636
def from_json(json_dct):
3737
name = json_dct.get('name')
3838
version = json_dct.get('version')
39-
inputs_list = json_dct.get('inputs')
40-
outputs_list = json_dct.get('outputs')
39+
inputs_map = json_dct.get('inputs')
40+
outputs_map = json_dct.get('outputs')
4141
_dapr_triggers = json_dct.get('triggers', {}).get('dapr', [])
4242
http_trigger = json_dct.get('triggers', {}).get('http', None)
4343
states = json_dct.get('states', {})
@@ -47,16 +47,16 @@ def from_json(json_dct):
4747
port = json_dct.get('port', 0)
4848

4949
inputs = None
50-
if inputs_list:
50+
if inputs_map:
5151
inputs = {}
52-
for k, v in inputs_list.items():
53-
input = Component.from_json(v)
54-
inputs[k] = input
52+
for k, v in inputs_map.items():
53+
_input = Component.from_json(v)
54+
inputs[k] = _input
5555

5656
outputs = None
57-
if outputs_list:
57+
if outputs_map:
5858
outputs = {}
59-
for k, v in outputs_list.items():
59+
for k, v in outputs_map.items():
6060
output = Component.from_json(v)
6161
outputs[k] = output
6262

@@ -112,24 +112,18 @@ def from_json(json_dct):
112112
class HTTPRoute(object):
113113
"""HTTP route."""
114114

115-
def __init__(self, port="", hostname="", rules=None):
115+
def __init__(self, port=""):
116116
self.port = port
117-
self.hostname = hostname
118-
self.rules = rules
119117

120118
def __str__(self):
121-
return "{port: %s, hostname: %s, rules: %s}" % (
122-
self.port,
123-
self.hostname,
124-
self.rules
119+
return "{port: %s}" % (
120+
self.port
125121
)
126122

127123
@staticmethod
128124
def from_json(json_dct):
129125
port = json_dct.get('port', '')
130-
hostnames = json_dct.get('route', {}).get('hostnames', '')
131-
rules = json_dct.get('route', {}).get('rules', [])
132-
return HTTPRoute(port, hostnames, rules)
126+
return HTTPRoute(port)
133127

134128

135129
class DaprTrigger(object):

src/functions_framework/context/user_context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class UserContext(object):
2626
"""Context for user."""
2727

2828
def __init__(self, runtime_context: RuntimeContext = None,
29-
binding_request=None, topic_event=None, http_request=None, logger=None):
29+
binding_request=None, topic_event=None, http_request=None, logger=None):
3030
self.runtime_context = runtime_context
3131
self.logger = logger
3232
self.out = FunctionOut(0, None, "", {})

src/functions_framework/triggers/dapr_trigger/dapr.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
import logging
15-
1614
from copy import deepcopy
1715

1816
from cloudevents.sdk.event import v1
@@ -45,17 +43,13 @@ def start(self, context: RuntimeContext, logger=None):
4543
def binding_handler(request: BindingRequest):
4644
rt_ctx = deepcopy(context)
4745
user_ctx = UserContext(runtime_context=rt_ctx, binding_request=request, logger=logger)
48-
logging.basicConfig(level=logging.DEBUG)
49-
logging.info('Received Message : ' + request.text())
5046
self.user_function(user_ctx)
5147

5248
if trigger.component_type.startswith("pubsub"):
5349
@self.app.subscribe(pubsub_name=trigger.name, topic=trigger.topic)
5450
def topic_handler(event: v1.Event):
5551
rt_ctx = deepcopy(context)
5652
user_ctx = UserContext(runtime_context=rt_ctx, topic_event=event, logger=logger)
57-
logging.basicConfig(level=logging.DEBUG)
58-
logging.info('Received Message : ' + event.data.__str__())
5953
self.user_function(user_ctx)
6054

6155
self.app.run(self.port)

0 commit comments

Comments
 (0)