pydevd-pycharm 253.17525.96__tar.gz → 253.24325.40__tar.gz

{pydevd_pycharm-253.17525.96/pydevd_pycharm.egg-info → pydevd_pycharm-253.24325.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 253.17525.96
+Version: 253.24325.40
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd_pycharm-253.24325.40/VERSION

@@ -0,0 +1 @@
+253.24325.40

{pydevd_pycharm-253.17525.96 → pydevd_pycharm-253.24325.40}/_pydev_bundle/pydev_console_utils.py

@@ -13,6 +13,7 @@ from _pydevd_bundle.pydevd_comm import InternalDataViewerAction
 from _pydevd_bundle.pydevd_constants import IS_JYTHON, dict_iter_items
 from _pydevd_bundle.pydevd_tables import exec_table_command
 from _pydevd_bundle.pydevd_tables import exec_image_table_command
+from _pydevd_bundle.pydevd_tables import exec_raw
 from _pydevd_bundle.pydevd_user_type_renderers import parse_set_type_renderers_message
 from pydev_console.pydev_protocol import CompletionOption, CompletionOptionType, \
     PythonUnhandledException, PythonTableException
@@ -432,6 +433,17 @@ class BaseInterpreterInterface(BaseCodeExecutor):
         if not success:
             raise PythonTableException(str(res))
 
+    #
+    def execRaw(self, command):
+        try:
+            success, res = exec_raw(command, self.get_namespace(), self.get_namespace())
+            if success:
+                return res
+        except:
+            traceback.print_exc()
+            raise PythonUnhandledException(traceback.format_exc())
+        if not success:
+            raise PythonUnhandledException(str(res))
 
     #
     def execTableImageCommand(self, command, command_type, offset, image_id):

{pydevd_pycharm-253.17525.96 → pydevd_pycharm-253.24325.40}/_pydevd_bundle/pydevd_comm.py

@@ -151,7 +151,7 @@ from _pydevd_bundle.pydevd_comm_constants import (
 MAX_IO_MSG_SIZE = 1000  #if the io is too big, we'll not send all (could make the debugger too non-responsive)
 #this number can be changed if there's need to do so
 
-VERSION_STRING = "253.17525.96"
+VERSION_STRING = "253.24325.40"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
 file_system_encoding = getfilesystemencoding()

{pydevd_pycharm-253.17525.96 → pydevd_pycharm-253.24325.40}/_pydevd_bundle/pydevd_tables.py

@@ -5,7 +5,7 @@ from _pydevd_bundle import pydevd_vars
 from _pydevd_bundle.pydevd_constants import NEXT_VALUE_SEPARATOR
 from _pydevd_bundle.pydevd_xml import ExceptionOnEvaluate
 from _pydevd_bundle.tables.images.pydevd_image_loader import load_image_chunk
-
+from _pydev_bundle.pydev_imports import Exec
 
 class TableCommandType:
     DF_INFO = "DF_INFO"
@@ -42,6 +42,13 @@ def exec_image_table_command(init_command, command_type, offset, image_id, f_glo
     return True, load_image_chunk(offset, image_id)
 
 
+def exec_raw(command, f_globals, f_locals):
+    try:
+        res = Exec(command, f_globals, f_locals)
+        return True, str(res)
+    except:
+        return False, pydevd_vars.get_eval_exception_msg(command, f_locals).result
+
 def exec_table_command(init_command, command_type, start_index, end_index, format, f_globals,
                        f_locals):
     table = pydevd_vars.eval_in_context(init_command, f_globals, f_locals)

{pydevd_pycharm-253.17525.96 → pydevd_pycharm-253.24325.40}/_pydevd_bundle/pydevd_thrift.py

@@ -16,7 +16,7 @@ from _pydevd_bundle.pydevd_constants import dict_iter_items, dict_keys, IS_PY3K,
 from _pydevd_bundle.pydevd_extension_api import TypeResolveProvider, StrPresentationProvider
 from _pydevd_bundle.pydevd_user_type_renderers_utils import try_get_type_renderer_for_var
 from _pydevd_bundle.pydevd_utils import is_string, should_evaluate_full_value, \
-    should_evaluate_shape, is_container_with_shape_dtype
+    should_evaluate_shape, has_attribute_safe
 from _pydevd_bundle.pydevd_vars import get_label, array_default_format, is_able_to_format_number, MAXIMUM_ARRAY_SIZE, \
     get_column_formatter_by_type, get_formatted_row_elements, IAtPolarsAccessor, DEFAULT_DF_FORMAT, DATAFRAME_HEADER_LOAD_MAX_SIZE
 from pydev_console.pydev_protocol import DebugValue, GetArrayResponse, ArrayData, ArrayHeaders, ColHeader, RowHeader, \
@@ -334,10 +334,10 @@ def var_to_struct(val, name, format='%s', do_trim=True, evaluate_full_value=True
 
     # shape to struct
     try:
-        if should_evaluate_shape() and is_container_with_shape_dtype(type_qualifier, typeName, v):
-            if hasattr(v, 'shape') and not callable(v.shape):
+        if should_evaluate_shape():
+            if has_attribute_safe(v, 'shape') and not callable(v.shape):
                 debug_value.shape = str(tuple(v.shape))
-            elif hasattr(v, '__len__') and not is_string(v):
+            elif has_attribute_safe(v, '__len__') and not is_string(v):
                 debug_value.shape = str(len(v))
     except:
         pass
@@ -345,7 +345,7 @@ def var_to_struct(val, name, format='%s', do_trim=True, evaluate_full_value=True
     # data type info to xml (for arrays and tensors)
     debug_value.arrayElementType = ''
     try:
-        if is_container_with_shape_dtype(type_qualifier, typeName, v) and hasattr(v, 'dtype'):
+        if has_attribute_safe(v, 'shape') and has_attribute_safe(v, 'dtype'):
             debug_value.arrayElementType = str(v.dtype)
     except:
         pass

{pydevd_pycharm-253.17525.96 → pydevd_pycharm-253.24325.40}/_pydevd_bundle/pydevd_user_type_renderers_utils.py

@@ -1,8 +1,41 @@
 #  Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 import inspect
-
 from _pydevd_bundle import pydevd_utils
 
+try:
+    # IDE's own module importer (handles namespace packages, zip, etc.)
+    from _pydevd_bundle import pydevd_import_class as _pydevd_import_class
+except Exception:
+    _pydevd_import_class = None
+
+def _resolve_type(path):
+    """Resolve 'pkg.mod.Class' -> class object, or None."""
+    if not path:
+        return None
+    # Prefer pydevd's own importer so future understandings
+    # over runtime module imports may propagate seamlessly
+    if _pydevd_import_class is not None:
+        for attr in ('import_name', 'ImportName'):
+            fn = getattr(_pydevd_import_class, attr, None)
+            if callable(fn):
+                try:
+                    return fn(path)
+                except:
+                    pass
+    return None
+
+def _by_type_entities(cls, renderers_dict):
+    """Resolve names into types for entity-bound type matching criteria"""
+    for render in [render for renders in renderers_dict.values() for render in renders]:
+        try:
+            for name_type in ('type_canonical_import_path','type_qualified_name'):
+                target = _resolve_type(getattr(render, name_type, None))
+                if cls is target:
+                    return render
+        except:
+            pass
+    return None
+
 
 class TypeRenderersConstants:
     new_line = "@_@NEW_LINE_CHAR@_@"
@@ -15,7 +48,8 @@ def try_get_type_renderer_for_var(var, renderers_dict):
         cls_name = cls.__name__
         renderers_for_name = renderers_dict.get(cls_name)
         if renderers_for_name is None:
-            return None
+            # by class type entities
+            return _by_type_entities(cls, renderers_dict)
 
         module_name = cls.__module__
         qualified_name = module_name + "." + cls_name
@@ -37,12 +71,8 @@ def try_get_type_renderer_for_var(var, renderers_dict):
             for render in renderers_for_name:
                 if render.type_src_file == src_file:
                     return render
-            return None
-
-        # by qualified name
-        for render in renderers_for_name:
-            if render.type_qualified_name == qualified_name:
-                return render
+            # by class type entities
+            return _by_type_entities(cls, renderers_dict)
 
         # by module root and class name
         # (if module contains only one class with the same name)
@@ -52,6 +82,10 @@ def try_get_type_renderer_for_var(var, renderers_dict):
                 renderer_module_root = render.type_canonical_import_path.split(".")[0]
                 if renderer_module_root == module_root:
                     return render
+
+        # by qualified name
+        return _by_type_entities(cls, renderers_dict)
+
     except:
         pass
 

{pydevd_pycharm-253.17525.96 → pydevd_pycharm-253.24325.40}/_pydevd_bundle/pydevd_utils.py

@@ -4,17 +4,6 @@ import ctypes
 import os
 import signal
 import traceback
-
-try:
-    import torch
-except Exception:
-    pass
-
-try:
-    import tensorflow as tf
-except Exception:
-    pass
-
 import pydevd_file_utils
 
 try:
@@ -616,24 +605,6 @@ def is_pandas_container(type_qualifier, var_type, var):
 def is_numpy_container(type_qualifier, var_type, var):
     return var_type == "ndarray" and type_qualifier == "numpy" and hasattr(var, "shape")
 
-def is_pytorch_tensor(type_qualifier, var):
-    try:
-        import torch
-        return type_qualifier == "torch" and torch.is_tensor(var)
-    except ImportError:
-        return False # Can't be torch if it is not installed
-
-def is_tf_tensor(type_qualifier, var):
-    try:
-        import tensorflow as tf
-        return type_qualifier.startswith("tensorflow") and tf.is_tensor(var)
-    except ImportError:
-        return False # Can't be tensorflow if it is not installed
-
-def is_container_with_shape_dtype(type_qualifier, var_type, var):
-    return (is_numpy_container(type_qualifier, var_type, var)
-            or is_pytorch_tensor(type_qualifier, var)
-            or is_tf_tensor(type_qualifier, var))
 
 def is_builtin(x):
     return getattr(x, '__module__', None) == BUILTINS_MODULE_NAME
@@ -659,6 +630,12 @@ def should_evaluate_shape():
     return LOAD_VALUES_POLICY != ValuesPolicy.ON_DEMAND
 
 
+def has_attribute_safe(obj, attr_name):
+    """Evaluates the existence of attribute without accessing it."""
+    attr = inspect.getattr_static(obj, attr_name, None)
+    return attr is not None
+
+
 def is_safe_to_access(obj, attr_name):
     """Evaluates the safety of attribute accessibility via `obj.attr_name`.
 

{pydevd_pycharm-253.17525.96 → pydevd_pycharm-253.24325.40}/_pydevd_bundle/pydevd_xml.py

@@ -21,7 +21,7 @@ from _pydevd_bundle.pydevd_repr_utils import get_value_repr
 from _pydevd_bundle.pydevd_user_type_renderers_utils import \
     try_get_type_renderer_for_var
 from _pydevd_bundle.pydevd_utils import is_string, should_evaluate_full_value, \
-    should_evaluate_shape, is_safe_to_access, is_container_with_shape_dtype
+    should_evaluate_shape, has_attribute_safe
 
 try:
     import types
@@ -344,10 +344,10 @@ def var_to_xml(val, name, do_trim=True, additional_in_xml='', evaluate_full_valu
     # shape to xml
     xml_shape = ''
     try:
-        if should_evaluate_shape() and is_container_with_shape_dtype(type_qualifier, typeName, v):
-            if hasattr(v, 'shape') and not callable(v.shape):
+        if should_evaluate_shape():
+            if has_attribute_safe(v, 'shape') and not callable(v.shape):
                 xml_shape = ' shape="%s"' % make_valid_xml_value(str(tuple(v.shape)))
-            elif hasattr(v, '__len__') and not is_string(v):
+            elif has_attribute_safe(v, '__len__') and not is_string(v):
                 xml_shape = ' shape="%s"' % make_valid_xml_value("%s" % str(len(v)))
     except:
         pass
@@ -356,7 +356,7 @@ def var_to_xml(val, name, do_trim=True, additional_in_xml='', evaluate_full_valu
     # we use it for view as image
     xml_data_type = ''
     try:
-        if is_container_with_shape_dtype(type_qualifier, typeName, v):
+        if has_attribute_safe(v, "dtype"):
             xml_data_type = ' arrayElementType="%s"' % make_valid_xml_value(str(v.dtype))
     except:
         pass

{pydevd_pycharm-253.17525.96 → pydevd_pycharm-253.24325.40/pydevd_pycharm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 253.17525.96
+Version: 253.24325.40
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd_pycharm-253.17525.96/VERSION

@@ -1 +0,0 @@
-253.17525.96