Use C-level for builtins & classes instances in src/_pythonscript.pyx

Author: touilleMan

src/_pythonscript.pyx

@@ -12,7 +12,7 @@ from godot.hazmat.gdapi cimport *
 from godot.hazmat.extension_class cimport *
 from godot.hazmat cimport gdptrs
 from godot.builtins cimport *
-from godot.classes cimport _load_class, _load_singleton, _cleanup_loaded_classes_and_singletons
+from godot.classes cimport _load_class, _load_singleton, _cleanup_loaded_classes_and_singletons, BaseGDObject
 
 include "_pythonscript_editor.pxi"
 include "_pythonscript_extension_class_language.pxi"
@@ -147,12 +147,12 @@ cdef void _unregister_pythonscript_classes():
 
 cdef void _customize_config():
     import sys
-    ProjectSettings = _load_singleton("ProjectSettings")
-    OS = _load_singleton("OS")
+    cdef BaseGDObject ProjectSettings = <BaseGDObject>_load_singleton("ProjectSettings")
+    cdef BaseGDObject OS = <BaseGDObject>_load_singleton("OS")
 
     # Provide argv arguments
 
-    args = OS.get_cmdline_args()
+    cdef PackedStringArray args = <PackedStringArray?>OS.get_cmdline_args()
     sys.argv = ["godot"]
     # TODO: iteration on `PackedStringArray` not supported yet !
     for i in range(args.size()):
@@ -178,12 +178,13 @@ cdef void _customize_config():
 cdef object _initialize_callback = None
 cdef object _initialize_callback_hook(int p_level):
     global _initialize_callback
+    cdef GDString config
 
     if _initialize_callback is None:
-        config = _setup_config_entry("python/initialize_callback", "")
-
-        if not isinstance(config, GDString):
-            raise ValueError("Invalid value for config `python/initialize_callback`: expected a string in format `<module>:<function>`")
+        try:
+            config = <GDString?>_setup_config_entry("python/initialize_callback", "")
+        except TypeError as exc:
+            raise ValueError("Invalid value for config `python/initialize_callback`: expected a string in format `<module>:<function>`") from exc
 
         if config.is_empty():
             _initialize_callback = lambda _level: None  # Dummy callback
@@ -213,12 +214,13 @@ cdef object _initialize_callback_hook(int p_level):
 cdef object _deinitialize_callback = None
 cdef object _deinitialize_callback_hook(int p_level):
     global _deinitialize_callback
+    cdef GDString config
 
     if _deinitialize_callback is None:
-        config = _setup_config_entry("python/deinitialize_callback", "")
-
-        if not isinstance(config, GDString):
-            raise ValueError("Invalid value for config `python/deinitialize_callback`: expected a string in format `<module>:<function>`")
+        try:
+            config = <GDString?>_setup_config_entry("python/deinitialize_callback", "")
+        except TypeError as exc:
+            raise ValueError("Invalid value for config `python/deinitialize_callback`: expected a string in format `<module>:<function>`") from exc
 
         if config.is_empty():
             _deinitialize_callback = lambda _level: None  # Dummy callback

src/godot/classes.pxd.j2

@@ -105,6 +105,6 @@ cdef class {{ cls.cy_type }}({{ cls.inherits.cy_type if cls.inherits else "" }})
 
 
 cdef object _load_class(str name)
-cpdef object _load_singleton(str name)
+cpdef BaseGDObject _load_singleton(str name)
 cdef void _cleanup_loaded_classes_and_singletons()
 cdef object _object_call(gd_object_t obj, str meth, list args)

src/godot/classes.pyx.j2

@@ -108,9 +108,9 @@ cdef void _cleanup_loaded_classes_and_singletons():
     _loaded_classes.clear()
 
 
-cpdef object _load_singleton(str name):
+cpdef BaseGDObject _load_singleton(str name):
     try:
-        return _loaded_singletons[name]
+        return <BaseGDObject>_loaded_singletons[name]
     except KeyError:
         pass
 
@@ -123,7 +123,7 @@ cpdef object _load_singleton(str name):
     if gdobj == NULL:
         raise RuntimeError(f"Singleton `{name}` doesn't exist in Godot !")
 
-    cdef object singleton = cls._from_ptr(<size_t>gdobj)
+    cdef BaseGDObject singleton = <BaseGDObject>cls._from_ptr(<size_t>gdobj)
 
     _loaded_singletons[name] = singleton
     return singleton
@@ -134,16 +134,16 @@ cpdef object _load_singleton(str name):
 {% endfor %} #}
 
 
-cdef inline object _property_getter(object obj, object name):
-    return _object_call((<BaseGDObject>obj)._gd_ptr, "get", [name])
+cdef inline object _property_getter(BaseGDObject obj, object name):
+    return _object_call(obj._gd_ptr, "get", [name])
 
 
-cdef inline void _property_setter(object obj, object name, object value):
-    _object_call((<BaseGDObject>obj)._gd_ptr, "set", [name, value])
+cdef inline void _property_setter(BaseGDObject obj, object name, object value):
+    _object_call(obj._gd_ptr, "set", [name, value])
 
 
-cdef inline object _meth_call(object obj, object name, object args):
-    return _object_call((<BaseGDObject>obj)._gd_ptr, "call", [name, *args])
+cdef inline object _meth_call(BaseGDObject obj, object name, object args):
+    return _object_call(obj._gd_ptr, "call", [name, *args])
 
 
 cdef object _load_class(str name):