Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 39 additions & 23 deletions src/SDK/Language/Python.php
Original file line number Diff line number Diff line change
Expand Up @@ -235,32 +235,48 @@ public function getFiles(): array
*/
public function getTypeName(array $parameter, array $spec = []): string
{
$typeName = '';

if (isset($parameter['enumName'])) {
return \ucfirst($parameter['enumName']);
}
if (!empty($parameter['enumValues'])) {
return \ucfirst($parameter['name']);
$typeName = \ucfirst($parameter['enumName']);
} elseif (!empty($parameter['enumValues'])) {
$typeName = \ucfirst($parameter['name']);
} else {
switch ($parameter['type'] ?? '') {
case self::TYPE_FILE:
$typeName = 'InputFile';
break;
case self::TYPE_NUMBER:
case self::TYPE_INTEGER:
$typeName = 'float';
break;
case self::TYPE_BOOLEAN:
$typeName = 'bool';
break;
case self::TYPE_STRING:
$typeName = 'str';
break;
case self::TYPE_ARRAY:
if (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type'])) {
$typeName = 'List[' . $this->getTypeName($parameter['array']) . ']';
} else {
$typeName = 'List[Any]';
}
break;
case self::TYPE_OBJECT:
$typeName = 'dict';
break;
default:
$typeName = $parameter['type'];
break;
}
}
switch ($parameter['type'] ?? '') {
case self::TYPE_FILE:
return 'InputFile';
case self::TYPE_NUMBER:
case self::TYPE_INTEGER:
return 'float';
case self::TYPE_BOOLEAN:
return 'bool';
case self::TYPE_STRING:
return 'str';
case self::TYPE_ARRAY:
if (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type'])) {
return 'List[' . $this->getTypeName($parameter['array']) . ']';
}
return 'List[Any]';
case self::TYPE_OBJECT:
return 'dict';
default:
return $parameter['type'];

if (!($parameter['required'] ?? true) || ($parameter['nullable'] ?? false)) {
return 'Optional[' . $typeName . ']';
}

return $typeName;
}

/**
Expand Down
2 changes: 0 additions & 2 deletions templates/python/package/client.py.twig
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ class Client:
if params is None:
params = {}

params = {k: v for k, v in params.items() if v is not None} # Remove None values from params dictionary

data = {}
files = {}
stringify = False
Expand Down
2 changes: 1 addition & 1 deletion templates/python/package/services/service.py.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from ..service import Service
from typing import List, Dict, Any
from typing import List, Dict, Any, Optional
from ..exception import AppwriteException
from appwrite.utils.deprecated import deprecated
{% set added = [] %}
Expand Down
Loading