Skip to content

Commit e5b858a

Browse files
authored
Merge pull request #82 from Onemind-Services-LLC/feat/app_id
App ID Added for development.Scripting
2 parents 43c493a + 9e49ec9 commit e5b858a

File tree

3 files changed

+100
-18
lines changed

3 files changed

+100
-18
lines changed

jelastic/api/development/__init__.py

+44-7
Original file line numberDiff line numberDiff line change
@@ -616,32 +616,41 @@ class _Scripting(Development):
616616
def Build(
617617
self,
618618
script: str,
619+
app_id: str = None,
619620
):
620621
return self._get(
621622
"Build",
622623
params={
623624
"script": script,
625+
"appid": app_id,
624626
},
625627
)
626628

627-
def BuildStubs(self):
629+
def BuildStubs(
630+
self,
631+
app_id: str = None,
632+
):
628633
return self._get(
629634
"BuildStubs",
630-
params={},
635+
params={
636+
"appid": app_id,
637+
},
631638
)
632639

633640
def ChangeScript(
634641
self,
635642
name: str,
636643
field: str,
637644
value: str = None,
645+
app_id: str = None,
638646
):
639647
return self._get(
640648
"ChangeScript",
641649
params={
642650
"name": name,
643651
"field": field,
644652
"value": value,
653+
"appid": app_id,
645654
},
646655
)
647656

@@ -651,6 +660,7 @@ def CreateScript(
651660
type: str,
652661
code: str = None,
653662
annotations: str = None,
663+
app_id: str = None,
654664
):
655665
return self._get(
656666
"CreateScript",
@@ -659,27 +669,35 @@ def CreateScript(
659669
"type": type,
660670
"code": code,
661671
"annotations": annotations,
672+
"appid": app_id,
662673
},
663674
)
664675

665-
def DeleteScript(self, name: str):
676+
def DeleteScript(
677+
self,
678+
name: str,
679+
app_id: str = None,
680+
):
666681
return self._get(
667682
"DeleteScript",
668683
params={
669684
"name": name,
685+
"appid": app_id,
670686
},
671687
)
672688

673689
def Eval(
674690
self,
675691
script: str,
676692
params: Any = None,
693+
app_id: str = None,
677694
):
678695
return self._get(
679696
"Eval",
680697
params={
681698
"script": script,
682699
"params": params,
700+
"appid": app_id,
683701
},
684702
)
685703

@@ -689,6 +707,7 @@ def EvalCode(
689707
type: str,
690708
annotations: str = None,
691709
params: Any = None,
710+
app_id: str = None,
692711
):
693712
return self._get(
694713
"EvalCode",
@@ -697,28 +716,44 @@ def EvalCode(
697716
"type": type,
698717
"annotations": annotations,
699718
"params": params,
719+
"appid": app_id,
700720
},
701721
)
702722

703-
def ExportScripts(self, overwrite: bool = None):
723+
def ExportScripts(
724+
self,
725+
overwrite: bool = None,
726+
app_id: str = None,
727+
):
704728
return self._get(
705729
"ExportScripts",
706730
params={
707731
"overwrite": overwrite,
732+
"appid": app_id,
708733
},
709734
)
710735

711-
def GetEngineInfo(self):
736+
def GetEngineInfo(
737+
self,
738+
app_id: str = None,
739+
):
712740
return self._get(
713741
"GetEngineInfo",
714-
params={},
742+
params={
743+
"appid": app_id,
744+
},
715745
)
716746

717-
def GetScript(self, name: str):
747+
def GetScript(
748+
self,
749+
name: str,
750+
app_id: str = None,
751+
):
718752
return self._get(
719753
"GetScript",
720754
params={
721755
"name": name,
756+
"appid": app_id,
722757
},
723758
)
724759

@@ -727,12 +762,14 @@ def GetScripts(
727762
type: str = None,
728763
From: int = None,
729764
count: int = None,
765+
app_id: str = None,
730766
):
731767
return self._get(
732768
"GetScripts",
733769
params={
734770
"type": type,
735771
"from": From,
736772
"count": count,
773+
"appid": app_id,
737774
},
738775
)

tests/unit/test_api/test_development/test_scripting.py

+53-10
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,30 @@
33

44
def test_build(client):
55
client._get.return_value = success_response
6-
response = client.Scripting.Build("script")
6+
response = client.Scripting.Build(
7+
"script",
8+
"app_id",
9+
)
710
client._get.assert_called_once_with(
811
"Build",
912
params={
1013
"script": "script",
14+
"appid": "app_id",
1115
},
1216
)
1317
assert response == success_response
1418

1519

1620
def test_build_stubs(client):
1721
client._get.return_value = success_response
18-
response = client.Scripting.BuildStubs()
22+
response = client.Scripting.BuildStubs(
23+
"app_id",
24+
)
1925
client._get.assert_called_once_with(
2026
"BuildStubs",
21-
params={},
27+
params={
28+
"appid": "app_id",
29+
},
2230
)
2331
assert response == success_response
2432

@@ -29,13 +37,15 @@ def test_change_script(client):
2937
"name",
3038
"field",
3139
"value",
40+
"app_id",
3241
)
3342
client._get.assert_called_once_with(
3443
"ChangeScript",
3544
params={
3645
"name": "name",
3746
"field": "field",
3847
"value": "value",
48+
"appid": "app_id",
3949
},
4050
)
4151
assert response == success_response
@@ -48,6 +58,7 @@ def test_create_script(client):
4858
"type",
4959
"code",
5060
"annotations",
61+
"app_id",
5162
)
5263
client._get.assert_called_once_with(
5364
"CreateScript",
@@ -56,18 +67,23 @@ def test_create_script(client):
5667
"type": "type",
5768
"code": "code",
5869
"annotations": "annotations",
70+
"appid": "app_id",
5971
},
6072
)
6173
assert response == success_response
6274

6375

6476
def test_delete_script(client):
6577
client._get.return_value = success_response
66-
response = client.Scripting.DeleteScript("name")
78+
response = client.Scripting.DeleteScript(
79+
"name",
80+
"app_id",
81+
)
6782
client._get.assert_called_once_with(
6883
"DeleteScript",
6984
params={
7085
"name": "name",
86+
"appid": "app_id",
7187
},
7288
)
7389
assert response == success_response
@@ -78,75 +94,102 @@ def test_eval(client):
7894
response = client.Scripting.Eval(
7995
"script",
8096
"code",
97+
"app_id",
8198
)
8299
client._get.assert_called_once_with(
83100
"Eval",
84101
params={
85102
"script": "script",
86103
"params": "code",
104+
"appid": "app_id",
87105
},
88106
)
89107
assert response == success_response
90108

91109

92110
def test_eval_code(client):
93111
client._get.return_value = success_response
94-
response = client.Scripting.EvalCode("code", "type", "annotations", "params")
112+
response = client.Scripting.EvalCode(
113+
"code",
114+
"type",
115+
"annotations",
116+
"params",
117+
"app_id",
118+
)
95119
client._get.assert_called_once_with(
96120
"EvalCode",
97121
params={
98122
"code": "code",
99123
"type": "type",
100124
"annotations": "annotations",
101125
"params": "params",
126+
"appid": "app_id",
102127
},
103128
)
104129
assert response == success_response
105130

106131

107132
def test_export_scripts(client):
108133
client._get.return_value = success_response
109-
response = client.Scripting.ExportScripts(True)
134+
response = client.Scripting.ExportScripts(
135+
True,
136+
"app_id",
137+
)
110138
client._get.assert_called_once_with(
111139
"ExportScripts",
112140
params={
113141
"overwrite": True,
142+
"appid": "app_id",
114143
},
115144
)
116145
assert response == success_response
117146

118147

119148
def test_get_engine_info(client):
120149
client._get.return_value = success_response
121-
response = client.Scripting.GetEngineInfo()
150+
response = client.Scripting.GetEngineInfo(
151+
"app_id",
152+
)
122153
client._get.assert_called_once_with(
123154
"GetEngineInfo",
124-
params={},
155+
params={
156+
"appid": "app_id",
157+
},
125158
)
126159
assert response == success_response
127160

128161

129162
def test_get_script(client):
130163
client._get.return_value = success_response
131-
response = client.Scripting.GetScript("name")
164+
response = client.Scripting.GetScript(
165+
"name",
166+
"app_id",
167+
)
132168
client._get.assert_called_once_with(
133169
"GetScript",
134170
params={
135171
"name": "name",
172+
"appid": "app_id",
136173
},
137174
)
138175
assert response == success_response
139176

140177

141178
def test_get_scripts(client):
142179
client._get.return_value = success_response
143-
response = client.Scripting.GetScripts("type", 1, 2)
180+
response = client.Scripting.GetScripts(
181+
"type",
182+
1,
183+
2,
184+
"app_id",
185+
)
144186
client._get.assert_called_once_with(
145187
"GetScripts",
146188
params={
147189
"type": "type",
148190
"from": 1,
149191
"count": 2,
192+
"appid": "app_id",
150193
},
151194
)
152195
assert response == success_response

tests/unit/test_api/test_environment/test_control.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -2118,7 +2118,9 @@ def test_remove_app(client):
21182118

21192119
def test_remove_container_env_vars(client):
21202120
client._get.return_value = success_response
2121-
response = client.Control.RemoveContainerEnvVars("env", ["var1", "var2"], "nodeGroup", 1)
2121+
response = client.Control.RemoveContainerEnvVars(
2122+
"env", ["var1", "var2"], "nodeGroup", 1
2123+
)
21222124
client._get.assert_called_once_with(
21232125
"RemoveContainerEnvVars",
21242126
params={

0 commit comments

Comments
 (0)