Skip to content

Python service level parameters #477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 28, 2022
Merged

Python service level parameters #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions templates/python/package/services/service.py.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,52 @@ from ..exception import AppwriteException

class {{ service.name | caseUcfirst }}(Service):

{% if service.globalParams | length %}
def __init__(self, client,{% for parameter in service.globalParams %} {{ parameter.name | caseSnake | escapeKeyword }}{% if not parameter.required %} = None{% endif %}{% if not loop.last %},{% endif %}{% endfor %}):
super({{ service.name | caseUcfirst }}, self).__init__(client)
{% for parameter in service.globalParams %}
self.{{ parameter.name | caseSnake | escapeKeyword }} = {{ parameter.name | caseSnake | escapeKeyword }}
{% endfor %}
{% else %}
def __init__(self, client):
super({{ service.name | caseUcfirst }}, self).__init__(client)
{% endif %}
{% for method in service.methods %}

def {{ method.name | caseSnake }}(self{% if method.parameters.all|length > 0 %}, {% endif %}{% for parameter in method.parameters.all %}{{ parameter.name | escapeKeyword | caseSnake }}{% if not parameter.required %} = None{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in method.consumes %}, on_progress = None{% endif %}):
def {{ method.name | caseSnake }}(self{% if method.parameters.all|length > 0 %}, {% endif %}{% for parameter in method.parameters.all | filter((param) => not param.isGlobal) %}{{ parameter.name | escapeKeyword | caseSnake }}{% if not parameter.required %} = None{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in method.consumes %}, on_progress = None{% endif %}):
{% if method.title %}
"""{{ method.title }}"""

{% endif %}
{% for parameter in method.parameters.all %}
{% for parameter in method.parameters.all %}
{% if parameter.required %}
if {{ parameter.name | escapeKeyword | caseSnake }} is None:
if {% if parameter.isGlobal %}self.{% endif %}{{ parameter.name | escapeKeyword | caseSnake }} is None:
raise {{spec.title | caseUcfirst}}Exception('Missing required parameter: "{{ parameter.name | escapeKeyword | caseSnake }}"')

{% endif %}
{% endfor %}
params = {}
path = '{{ method.path }}'
{% for parameter in method.parameters.path %}
path = path.replace('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {{ parameter.name | escapeKeyword | caseSnake }})
path = path.replace('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {% if parameter.isGlobal %}self.{% endif %}{{ parameter.name | escapeKeyword | caseSnake }})
{% endfor %}

{% for parameter in method.parameters.query %}
if {{ parameter.name | escapeKeyword | caseSnake }} is not None:
params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }}

params['{{ parameter.name }}'] = {% if parameter.isGlobal %}self.{% endif %}{{ parameter.name | escapeKeyword | caseSnake }}
{% endfor %}
{% for parameter in method.parameters.body %}
if {{ parameter.name | escapeKeyword | caseSnake }} is not None:
{% if method.consumes[0] == "multipart/form-data" and ( parameter.type != "string" and parameter.type != "array" ) %}
params['{{ parameter.name }}'] = str({{ parameter.name | escapeKeyword | caseSnake }}).lower() if type({{ parameter.name | escapeKeyword | caseSnake }}) is bool else {{ parameter.name | escapeKeyword | caseSnake }}
params['{{ parameter.name }}'] = str({{ parameter.name | escapeKeyword | caseSnake }}).lower() if type({{ parameter.name | escapeKeyword | caseSnake }}) is bool else {{ parameter.name | escapeKeyword | caseSnake }}
{% else %}
params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }}
params['{{ parameter.name }}'] = {% if parameter.isGlobal %}self.{% endif %}{{ parameter.name | escapeKeyword | caseSnake }}
{% endif %}
{% endfor %}
{% for parameter in method.parameters.formData %}
if {{ parameter.name | escapeKeyword | caseSnake }} is not None:
{% if method.consumes[0] == "multipart/form-data" and ( parameter.type != "string" and parameter.type != "array" ) %}
params['{{ parameter.name }}'] = str({{ parameter.name | escapeKeyword | caseSnake }}).lower() if type({{ parameter.name | escapeKeyword | caseSnake }}) is bool else {{ parameter.name | escapeKeyword | caseSnake }}
params['{{ parameter.name }}'] = str({{ parameter.name | escapeKeyword | caseSnake }}).lower() if type({{ parameter.name | escapeKeyword | caseSnake }}) is bool else {{ parameter.name | escapeKeyword | caseSnake }}
{% else %}
params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }}
params['{{ parameter.name }}'] = {% if parameter.isGlobal %}self.{% endif %}{{ parameter.name | escapeKeyword | caseSnake }}
{% endif %}

{% endfor %}
{% if 'multipart/form-data' in method.consumes %}
{% for parameter in method.parameters.all %}
Expand All @@ -71,6 +74,7 @@ class {{ service.name | caseUcfirst }}(Service):
{% endfor %}
}, params, param_name, on_progress, upload_id)
{% else %}

return self.client.call('{{ method.method | caseLower }}', path, {
{% for parameter in method.parameters.header %}
'{{ parameter.name }}': {{ parameter.name | escapeKeyword | caseSnake }},
Expand Down
12 changes: 6 additions & 6 deletions tests/languages/python/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


client = Client()
foo = Foo(client)
foo = Foo(client, 'string')
bar = Bar(client)
general = General(client)

Expand All @@ -18,19 +18,19 @@

# Foo Tests

response = foo.get('string',123, ['string in array'])
response = foo.get(123, ['string in array'])
print(response['result'])

response = foo.post('string', 123, ['string in array'])
response = foo.post( 123, ['string in array'])
print(response['result'])

response = foo.put('string', 123, ['string in array'])
response = foo.put( 123, ['string in array'])
print(response['result'])

response = foo.patch('string', 123, ['string in array'])
response = foo.patch( 123, ['string in array'])
print(response['result'])

response = foo.delete('string', 123, ['string in array'])
response = foo.delete( 123, ['string in array'])
print(response['result'])

# Bar Tests
Expand Down