Skip to content

fix: python plugin bindings #1677

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
dOrgJelli merged 2 commits into from
Apr 13, 2023
Merged

fix: python plugin bindings #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82dddb5
fix: python plugin bindings
Niraj-Kamdar Apr 12, 2023
f5faf8d
fix: binding tests
Niraj-Kamdar Apr 12, 2023
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
8 changes: 3 additions & 5 deletions packages/schema/bind/src/bindings/python/plugin/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@ export const generateBinding: GenerateBindingFn = (
name: options.projectName,
type: "plugin",
version: latestWrapManifestVersion,
abi: JSON.stringify(
sort((options.abi as unknown) as Record<string, unknown>),
null,
2
),
abi: Buffer.from(
JSON.stringify(sort((options.abi as unknown) as Record<string, unknown>))
).toString("base64"),
};

output.entries = renderTemplates(templatePath(""), { ...abi, manifest }, {});
Expand Down
1 change: 1 addition & 0 deletions packages/schema/bind/src/bindings/python/plugin/templates/__init__-py.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# NOTE: This is an auto-generated file. All modifications will be overwritten.
# type: ignore

from .types import *
from .module import *
Expand Down
3 changes: 2 additions & 1 deletion packages/schema/bind/src/bindings/python/plugin/templates/module-py.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# NOTE: This is an auto-generated file. All modifications will be overwritten.
# type: ignore
from __future__ import annotations

from abc import abstractmethod
Expand Down Expand Up @@ -38,7 +39,7 @@ class Module(Generic[TConfig], PluginModule[TConfig]):
{{#moduleType}}
{{#methods}}
@abstractmethod
def {{#detectKeyword}}{{#toLower}}{{name}}{{/toLower}}{{/detectKeyword}}(
async def {{#detectKeyword}}{{#toLower}}{{name}}{{/toLower}}{{/detectKeyword}}(
self,
args: Args{{#toUpper}}{{name}}{{/toUpper}},
client: InvokerClient[UriPackageOrWrapper],
Expand Down
9 changes: 5 additions & 4 deletions packages/schema/bind/src/bindings/python/plugin/templates/types-py.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# NOTE: This is an auto-generated file. All modifications will be overwritten.
# type: ignore
from __future__ import annotations

from typing import TypedDict, Optional
Expand Down Expand Up @@ -36,12 +37,12 @@ from polywrap_msgpack import GenericMap
{{#enumTypes}}
class {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}}(IntEnum):
{{#constants}}
{{#detectKeyword}}{{.}}{{/detectKeyword}} = auto() - 1, "{{.}}"
{{#detectKeyword}}{{.}}{{/detectKeyword}} = auto(), "{{.}}"
{{/constants}}

def __new__(cls, value: int, *aliases: str):
obj = int.__new__(cls)
obj._value_ = value
obj._value_ = value - 1
for alias in aliases:
cls._value2member_map_[alias] = obj
return obj
Expand All @@ -68,12 +69,12 @@ class {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}}(IntEn
# URI: "{{uri}}" #
class {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}}(IntEnum):
{{#constants}}
{{#detectKeyword}}{{.}}{{/detectKeyword}} = auto() - 1
{{#detectKeyword}}{{.}}{{/detectKeyword}} = auto()
{{/constants}}

def __new__(cls, value: int, *aliases: str):
obj = int.__new__(cls)
obj._value_ = value
obj._value_ = value - 1
for alias in aliases:
cls._value2member_map_[alias] = obj
return obj
Expand Down
6 changes: 3 additions & 3 deletions packages/schema/bind/src/bindings/python/plugin/templates/wrap_info-py.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# NOTE: This is an auto-generated file. All modifications will be overwritten.
# type: ignore
from __future__ import annotations

import json
from base64 import b64decode

from polywrap_manifest import WrapManifest

{{#manifest}}
abi = json.loads("""
{{abi}}
""")
abi = json.loads(b64decode("{{abi}}").decode("utf-8"))

manifest = WrapManifest.parse_obj({
"name": "{{name}}",
Expand Down
1 change: 1 addition & 0 deletions packages/test-cases/cases/bind/sanity/output/plugin-py/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# NOTE: This is an auto-generated file. All modifications will be overwritten.
# type: ignore

from .types import *
from .module import *
Expand Down
9 changes: 5 additions & 4 deletions packages/test-cases/cases/bind/sanity/output/plugin-py/module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# NOTE: This is an auto-generated file. All modifications will be overwritten.
# type: ignore
from __future__ import annotations

from abc import abstractmethod
Expand Down Expand Up @@ -57,7 +58,7 @@ def __new__(cls, *args, **kwargs):
return instance

@abstractmethod
def module_method(
async def module_method(
self,
args: ArgsModuleMethod,
client: InvokerClient[UriPackageOrWrapper],
Expand All @@ -66,7 +67,7 @@ def module_method(
pass

@abstractmethod
def object_method(
async def object_method(
self,
args: ArgsObjectMethod,
client: InvokerClient[UriPackageOrWrapper],
Expand All @@ -75,7 +76,7 @@ def object_method(
pass

@abstractmethod
def optional_env_method(
async def optional_env_method(
self,
args: ArgsOptionalEnvMethod,
client: InvokerClient[UriPackageOrWrapper],
Expand All @@ -84,7 +85,7 @@ def optional_env_method(
pass

@abstractmethod
def r_if(
async def r_if(
self,
args: ArgsIf,
client: InvokerClient[UriPackageOrWrapper],
Expand Down
25 changes: 13 additions & 12 deletions packages/test-cases/cases/bind/sanity/output/plugin-py/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# NOTE: This is an auto-generated file. All modifications will be overwritten.
# type: ignore
from __future__ import annotations

from typing import TypedDict, Optional
Expand Down Expand Up @@ -83,23 +84,23 @@

### Enums START ###
class CustomEnum(IntEnum):
STRING = auto() - 1, "STRING"
BYTES = auto() - 1, "BYTES"
STRING = auto(), "STRING"
BYTES = auto(), "BYTES"

def __new__(cls, value: int, *aliases: str):
obj = int.__new__(cls)
obj._value_ = value
obj._value_ = value - 1
for alias in aliases:
cls._value2member_map_[alias] = obj
return obj

class While(IntEnum):
r_for = auto() - 1, "for"
r_in = auto() - 1, "in"
r_for = auto(), "for"
r_in = auto(), "in"

def __new__(cls, value: int, *aliases: str):
obj = int.__new__(cls)
obj._value_ = value
obj._value_ = value - 1
for alias in aliases:
cls._value2member_map_[alias] = obj
return obj
Expand Down Expand Up @@ -131,24 +132,24 @@ def __new__(cls, value: int, *aliases: str):

# URI: "testimport.uri.eth" #
class TestImportEnum(IntEnum):
STRING = auto() - 1
BYTES = auto() - 1
STRING = auto()
BYTES = auto()

def __new__(cls, value: int, *aliases: str):
obj = int.__new__(cls)
obj._value_ = value
obj._value_ = value - 1
for alias in aliases:
cls._value2member_map_[alias] = obj
return obj

# URI: "testimport.uri.eth" #
class TestImportEnumReturn(IntEnum):
STRING = auto() - 1
BYTES = auto() - 1
STRING = auto()
BYTES = auto()

def __new__(cls, value: int, *aliases: str):
obj = int.__new__(cls)
obj._value_ = value
obj._value_ = value - 1
for alias in aliases:
cls._value2member_map_[alias] = obj
return obj
Expand Down
Loading