Skip to content

Commit d22ae78

Browse files
author
Istemi Ekin Akkus
authored
Merge pull request #58 from knix-microfunctions/release/0.8.5
Release/0.8.5
2 parents 8d3f0ed + 5a5e722 commit d22ae78

File tree

139 files changed

+5480
-11457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+5480
-11457
lines changed

‎FunctionWorker/Makefile

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Copyright 2020 The KNIX Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
SHELL := /bin/bash
16+
-include ../proxy.mk
17+
include ../docker.mk
18+
include ../build_env.mk
19+
UID:=`id -u`
20+
GID:=`id -g`
21+
22+
default: python_api_doc
23+
24+
thrift_data_layer: ../build_env.mk \
25+
../DataLayerService/thrift/DataLayerMessage.thrift \
26+
../DataLayerService/thrift/DataLayerService.thrift
27+
docker run --user $(UID):$(GID) --rm -v $(CURDIR)/..:/root -w /root $(THRIFT_IMAGE_NAME):$(THRIFT_VERSION) bash -c '\
28+
thrift --gen py -out FunctionWorker/python/ DataLayerService/thrift/DataLayerMessage.thrift; \
29+
thrift --gen py -out FunctionWorker/python/ DataLayerService/thrift/DataLayerService.thrift'
30+
31+
python_api_doc: thrift_data_layer
32+
docker run --user $(UID):$(GID) --rm -it \
33+
--name mfnapi_doc_gen \
34+
-v $(CURDIR):/opt/mfnapi \
35+
-w /opt/mfnapi \
36+
python:3.6 \
37+
/bin/bash -c '\
38+
pip3 install pdoc3 --target /opt/mfnapi/tmppip/pdoc3; \
39+
pip3 install requests --target /opt/mfnapi/tmppip/requests; \
40+
pip3 install thrift --target /opt/mfnapi/tmppip/thrift; \
41+
PYTHONPATH=/opt/mfnapi/tmppip/pdoc3:/opt/mfnapi/tmppip/requests:/opt/mfnapi/tmppip/thrift tmppip/pdoc3/bin/pdoc3 --html --output-dir doc --force /opt/mfnapi/python/MicroFunctionsAPI.py'; \
42+
rm -rf tmppip
43+
clean:
44+
rm -rf doc
45+

‎FunctionWorker/python/MicroFunctionsAPI.py

Lines changed: 239 additions & 17 deletions
Large diffs are not rendered by default.

‎FunctionWorker/python/StateUtils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1730,7 +1730,8 @@ def evaluateNextState(self, function_input):
17301730
# this should be called for Choice state only
17311731
# for the rest the next values are statically defined and are parsed by hostagent
17321732

1733-
nextfunc = self.default_next_choice[-1]
1733+
if len(self.default_next_choice) > 0:
1734+
nextfunc = self.default_next_choice[-1]
17341735

17351736
self._logger.debug("[StateUtils] choice_function_input: " + str(function_input))
17361737

‎GUI/Makefile

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,39 @@
1313
# limitations under the License.
1414

1515
SHELL := /bin/bash
16+
-include ../proxy.mk
17+
include ../docker.mk
18+
19+
default: app/pages/docs/sdk/cli.md \
20+
app/pages/docs/sdk/sdk.md \
21+
app/pages/docs/api/java \
22+
app/pages/docs/api/python
23+
24+
app/pages/docs/api/python:
25+
mkdir -p app/pages/docs/api/python; \
26+
cd ../FunctionWorker; \
27+
make python_api_doc; \
28+
cd -; \
29+
cp ../FunctionWorker/doc/MicroFunctionsAPI.html app/pages/docs/api/python/; \
30+
sed -i 's/<body>/<body bgcolor="#fff">/g' app/pages/docs/api/python/MicroFunctionsAPI.html
1631

17-
default: app/pages/docs/sdk/cli.md app/pages/docs/sdk/sdk.md
32+
app/pages/docs/api/java:
33+
mkdir -p app/pages/docs/api/javadoc; \
34+
cd ../JavaRequestHandler; \
35+
make java_api_doc; \
36+
cd -; \
37+
cp -r ../JavaRequestHandler/target/site/apidocs/* app/pages/docs/api/javadoc
1838

1939
app/pages/docs/sdk/sdk.md: ../mfn_sdk/README.md
2040
cp ../mfn_sdk/README.md app/pages/docs/sdk/sdk.md
2141

2242
app/pages/docs/sdk/cli.md: ../mfn_cli/README.md
2343
cp ../mfn_cli/README.md app/pages/docs/sdk/cli.md
2444

25-
-include ../proxy.mk
26-
include ../docker.mk
27-
28-
image: $(shell find ./ -type f|grep -v -e Makefile -e app/pages/docs/sdk/sdk.md -e app/pages/docs/sdk/cli.md) \
29-
app/pages/docs/sdk/cli.md \
30-
app/pages/docs/sdk/sdk.md
45+
image: app/pages/docs/sdk/cli.md \
46+
app/pages/docs/sdk/sdk.md \
47+
app/pages/docs/api/java \
48+
app/pages/docs/api/python
3149
$(call build_image,Dockerfile,microfn/nginx)
3250

3351
push: image

‎GUI/app/pages/docs/api/javadoc/allclasses-frame.html

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎GUI/app/pages/docs/api/javadoc/allclasses-noframe.html

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎GUI/app/pages/docs/api/javadoc/constant-values.html

Lines changed: 0 additions & 137 deletions
This file was deleted.

0 commit comments

Comments
 (0)