pydevd-pycharm 242.19890.32__tar.gz → 242.20224.86__tar.gz

{pydevd-pycharm-242.19890.32/pydevd_pycharm.egg-info → pydevd-pycharm-242.20224.86}/PKG-INFO

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

pydevd-pycharm-242.20224.86/VERSION

@@ -0,0 +1 @@
+242.20224.86

{pydevd-pycharm-242.19890.32 → pydevd-pycharm-242.20224.86}/_pydevd_bundle/pydevd_comm.py

@@ -148,7 +148,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 = "242.19890.32"
+VERSION_STRING = "242.20224.86"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
 file_system_encoding = getfilesystemencoding()

{pydevd-pycharm-242.19890.32 → pydevd-pycharm-242.20224.86}/_pydevd_bundle/pydevd_frame_type_handler.py

@@ -1,4 +1,6 @@
 #  Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+import threading
+
 from _pydevd_bundle.pydevd_constants import RETURN_VALUES_DICT, dict_iter_items, \
     GET_FRAME_NORMAL_GROUP, GET_FRAME_SPECIAL_GROUP
 
@@ -172,19 +174,36 @@ THRIFT_COMMUNICATION_VARS_HANDLER = 1
 
 
 class VarsHandlerContainer:
-    _instance_xml_handler = None
-    _instance_thrift_handler = None
+    instance_xml_handler = None
+    instance_thrift_handler = None
+
+
+_vars_handler_initialization_lock = threading.RLock()
+
+
+def _init_xml_communication_vars_handler(func, handler_type):
+    with _vars_handler_initialization_lock:
+        if VarsHandlerContainer.instance_xml_handler is None:
+            VarsHandlerContainer.instance_xml_handler = \
+                VarsHandler(func, handler_type)
+
+
+def _init_thrift_communication_var_handler(func, handler_type):
+    with _vars_handler_initialization_lock:
+        if VarsHandlerContainer.instance_thrift_handler is None:
+            VarsHandlerContainer.instance_thrift_handler = \
+                VarsHandler(func, handler_type)
 
 
 def get_vars_handler(func, handler_type, group_type):
     if handler_type == XML_COMMUNICATION_VARS_HANDLER:
-        if VarsHandlerContainer._instance_xml_handler is None:
-            VarsHandlerContainer._instance_xml_handler = VarsHandler(func, handler_type)
-        return VarsHandlerContainer._instance_xml_handler.get_instance(group_type)
+        if VarsHandlerContainer.instance_xml_handler is None:
+            _init_xml_communication_vars_handler(func, handler_type)
+        return VarsHandlerContainer.instance_xml_handler.get_instance(group_type)
     elif handler_type == THRIFT_COMMUNICATION_VARS_HANDLER:
-        if VarsHandlerContainer._instance_thrift_handler is None:
-            VarsHandlerContainer._instance_thrift_handler = VarsHandler(func, handler_type)
-        return VarsHandlerContainer._instance_thrift_handler.get_instance(group_type)
+        if VarsHandlerContainer.instance_thrift_handler is None:
+            _init_thrift_communication_var_handler(func, handler_type)
+        return VarsHandlerContainer.instance_thrift_handler.get_instance(group_type)
 
 
 class VarsHandler:
@@ -194,23 +213,26 @@ class VarsHandler:
         self._instance_special = None
         self._instance_return = None
         self.handler_type = handler_type
+        self._lock = threading.RLock()
 
     def get_instance(self, group_type):
-        if group_type == GET_FRAME_NORMAL_GROUP:
-            if self._instance_normal is None:
-                self._init_normal()
-            instance = self._instance_normal
-        elif group_type == GET_FRAME_SPECIAL_GROUP:
-            if self._instance_special is None:
-                self._init_special()
-            instance = self._instance_special
-        else:
-            if self._instance_return is None:
-                self._init_return()
-            instance = self._instance_return
+        with self._lock:
+            if group_type == GET_FRAME_NORMAL_GROUP:
+                if self._instance_normal is None:
+                    self._init_normal()
+                instance = self._instance_normal
+            elif group_type == GET_FRAME_SPECIAL_GROUP:
+                if self._instance_special is None:
+                    self._init_special()
+                instance = self._instance_special
+            else:
+                if self._instance_return is None:
+                    self._init_return()
+                instance = self._instance_return
+
+            instance.update_handlers()
 
-        instance.update_handlers()
-        return instance
+            return instance
 
     def _init_normal(self):
         self._instance_normal = DummyVarHandler(

{pydevd-pycharm-242.19890.32 → pydevd-pycharm-242.20224.86}/_pydevd_bundle/pydevd_tables.py

@@ -10,7 +10,7 @@ class TableCommandType:
     DF_INFO = "DF_INFO"
     SLICE = "SLICE"
     DESCRIBE = "DF_DESCRIBE"
-    HISTOGRAM_DATA = "HISTOGRAM_DATA"
+    VISUALIZATION_DATA = "VISUALIZATION_DATA"
 
 
 def is_error_on_eval(val):
@@ -47,10 +47,8 @@ def exec_table_command(init_command, command_type, start_index, end_index, f_glo
 
     elif command_type == TableCommandType.DESCRIBE:
         res.append(table_provider.get_column_descriptions(table))
-        res.append(NEXT_VALUE_SEPARATOR)
-        res.append(table_provider.get_value_counts(table))
 
-    elif command_type == TableCommandType.HISTOGRAM_DATA:
+    elif command_type == TableCommandType.VISUALIZATION_DATA:
         res.append(table_provider.get_value_occurrences_count(table))
         res.append(NEXT_VALUE_SEPARATOR)
 
@@ -70,6 +68,7 @@ def __get_table_provider(output):
     if type_qualified_name in ['pandas.core.frame.DataFrame',
                                'pandas.core.series.Series',
                                'geopandas.geoseries.GeoSeries',
+                               'geopandas.geodataframe.GeoDataFrame',
                                'pandera.typing.pandas.DataFrame']:
         import _pydevd_bundle.tables.pydevd_pandas as table_provider
     # dict is needed for sort commands

{pydevd-pycharm-242.19890.32 → pydevd-pycharm-242.20224.86}/_pydevd_bundle/pydevd_thrift.py

@@ -17,7 +17,7 @@ from _pydevd_bundle.pydevd_extension_api import TypeResolveProvider, StrPresenta
 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
 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, DEFAULT_DF_FORMAT, DATAFRAME_HEADER_LOAD_MAX_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, \
     UnsupportedArrayTypeException, ExceedingArrayDimensionsException
 from _pydevd_bundle.pydevd_xml import ExceptionOnEvaluate
@@ -505,7 +505,7 @@ def dataframe_to_thrift_struct(df, name, roffset, coffset, rows, cols, format):
 
     """
     original_df = df
-    dim = len(df.axes)
+    dim = len(df.axes) if hasattr(df, 'axes') else -1
     num_rows = df.shape[0]
     num_cols = df.shape[1] if dim > 1 else 1
     array_chunk = GetArrayResponse()
@@ -523,7 +523,7 @@ def dataframe_to_thrift_struct(df, name, roffset, coffset, rows, cols, format):
             except AttributeError:
                 try:
                     kind = df.dtypes[0].kind
-                except (IndexError, KeyError):
+                except (IndexError, KeyError, AttributeError):
                     kind = "O"
             format = array_default_format(kind)
         else:
@@ -556,19 +556,34 @@ def dataframe_to_thrift_struct(df, name, roffset, coffset, rows, cols, format):
             else:
                 bounds = (0, 0)
             col_bounds[col] = bounds
+    elif dim == -1:
+        dtype = '0'
+        dtypes[0] = dtype
+        col_bounds[0] = (df.min(), df.max()) if dtype in NUMPY_NUMERIC_TYPES and df.size != 0 else (0, 0)
     else:
         dtype = df.dtype.kind
         dtypes[0] = dtype
         col_bounds[0] = (df.min(), df.max()) if dtype in NUMPY_NUMERIC_TYPES and df.size != 0 else (0, 0)
 
-    df = df.iloc[roffset: roffset + rows, coffset: coffset + cols] if dim > 1 else df.iloc[roffset: roffset + rows]
+    if dim > 1:
+        df = df.iloc[roffset: roffset + rows, coffset: coffset + cols]
+    elif dim == -1:
+        df = df[roffset: roffset + rows]
+    else:
+        df.iloc[roffset: roffset + rows]
+
     rows = df.shape[0]
     cols = df.shape[1] if dim > 1 else 1
 
     def col_to_format(c):
         return get_column_formatter_by_type(format, dtypes[c])
 
-    iat = df.iat if dim == 1 or len(df.columns.unique()) == len(df.columns) else df.iloc
+    if dim == -1:
+        iat = IAtPolarsAccessor(df)
+    elif dim == 1 or len(df.columns.unique()) == len(df.columns):
+        iat = df.iat
+    else:
+        iat = df.iloc
 
     def formatted_row_elements(row):
         return get_formatted_row_elements(row, iat, dim, cols, format, dtypes)
@@ -610,7 +625,7 @@ def header_data_to_thrift_struct(rows, cols, dtypes, col_bounds, col_to_format,
     for row in range(rows):
         row_header = RowHeader()
         row_header.index = row
-        row_header.label = get_label(df.axes[0].values[row])
+        row_header.label = get_label(df.axes[0].values[row] if dim != -1 else str(row))
         row_headers.append(row_header)
     array_headers.colHeaders = col_headers
     array_headers.rowHeaders = row_headers

{pydevd-pycharm-242.19890.32 → pydevd-pycharm-242.20224.86}/_pydevd_bundle/pydevd_utils.py

@@ -627,6 +627,25 @@ def should_evaluate_shape():
     return LOAD_VALUES_POLICY != ValuesPolicy.ON_DEMAND
 
 
+def is_safe_to_access(obj, attr_name):
+    """Evaluates the safety of attribute accessibility via `obj.attr_name`.
+
+    Direct attribute access can occasionally lead to unsafe conditions. A typical
+    scenario is when an extension class contains a property that might attempt to
+    access a field before its initialization. This function aims to verify the safety
+    of attribute access in the most risk-free manner. As an example, it leverages the
+    `inspect` module, facilitating attribute retrieval without triggering any
+    descriptor functionality.
+    """
+    attr = inspect.getattr_static(obj, attr_name, None)
+
+    # Should we check for other descriptor types here?
+    if inspect.isgetsetdescriptor(attr):
+        return False
+
+    return True
+
+
 def is_in_unittests_debugging_mode():
     debugger = get_global_debugger()
     if debugger:

{pydevd-pycharm-242.19890.32 → pydevd-pycharm-242.20224.86}/_pydevd_bundle/pydevd_vars.py

@@ -693,6 +693,13 @@ def get_label(label):
 
 DATAFRAME_HEADER_LOAD_MAX_SIZE = 100
 
+class IAtPolarsAccessor:
+    def __init__(self, ps):
+        self.ps = ps
+
+    def __getitem__(self, row):
+        return self.ps[row]
+
 
 def dataframe_to_xml(df, name, roffset, coffset, rows, cols, format):
     """
@@ -707,7 +714,7 @@ def dataframe_to_xml(df, name, roffset, coffset, rows, cols, format):
 
     """
     original_df = df
-    dim = len(df.axes)
+    dim = len(df.axes) if hasattr(df, 'axes') else -1
     num_rows = df.shape[0]
     num_cols = df.shape[1] if dim > 1 else 1
     format = format.replace('%', '')
@@ -719,7 +726,7 @@ def dataframe_to_xml(df, name, roffset, coffset, rows, cols, format):
             except AttributeError:
                 try:
                     kind = df.dtypes[0].kind
-                except (IndexError, KeyError):
+                except (IndexError, KeyError, AttributeError):
                     kind = 'O'
             format = array_default_format(kind)
         else:
@@ -752,19 +759,34 @@ def dataframe_to_xml(df, name, roffset, coffset, rows, cols, format):
             else:
                 bounds = (0, 0)
             col_bounds[col] = bounds
+    elif dim == -1:
+        dtype = '0'
+        dtypes[0] = dtype
+        col_bounds[0] = (df.min(), df.max()) if dtype in NUMPY_NUMERIC_TYPES and df.size != 0 else (0, 0)
     else:
         dtype = df.dtype.kind
         dtypes[0] = dtype
         col_bounds[0] = (df.min(), df.max()) if dtype in NUMPY_NUMERIC_TYPES and df.size != 0 else (0, 0)
 
-    df = df.iloc[roffset: roffset + rows, coffset: coffset + cols] if dim > 1 else df.iloc[roffset: roffset + rows]
+    if dim > 1:
+        df = df.iloc[roffset: roffset + rows, coffset: coffset + cols]
+    elif dim == -1:
+        df = df[roffset: roffset + rows]
+    else:
+        df.iloc[roffset: roffset + rows]
+
     rows = df.shape[0]
     cols = df.shape[1] if dim > 1 else 1
 
     def col_to_format(column_type):
         return get_column_formatter_by_type(format, column_type)
 
-    iat = df.iat if dim == 1 or len(df.columns.unique()) == len(df.columns) else df.iloc
+    if dim == -1:
+        iat = IAtPolarsAccessor(df)
+    elif dim == 1 or len(df.columns.unique()) == len(df.columns):
+        iat = df.iat
+    else:
+        iat = df.iloc
 
     def formatted_row_elements(row):
         return get_formatted_row_elements(row, iat, dim, cols, format, dtypes)
@@ -801,7 +823,7 @@ def header_data_to_xml(rows, cols, dtypes, col_bounds, col_to_format, df, dim):
         xml += '<colheader index=\"%s\" label=\"%s\" type=\"%s\" format=\"%s\" max=\"%s\" min=\"%s\" />\n' % \
                (str(col), col_label, dtypes[col], col_to_format(dtypes[col]), quote(str(col_format % bounds[1])), quote(str(col_format % bounds[0])))
     for row in range(rows):
-        xml += "<rowheader index=\"%s\" label = \"%s\"/>\n" % (str(row), quote(get_label(df.axes[0][row])))
+        xml += "<rowheader index=\"%s\" label = \"%s\"/>\n" % (str(row), quote(get_label(df.axes[0][row] if dim != -1 else str(row))))
     xml += "</headerdata>\n"
     return xml
 

{pydevd-pycharm-242.19890.32 → pydevd-pycharm-242.20224.86}/_pydevd_bundle/pydevd_xml.py

@@ -11,14 +11,18 @@ from _pydev_bundle import pydev_log
 from _pydev_bundle.pydev_imports import quote
 from _pydevd_bundle import pydevd_extension_utils
 from _pydevd_bundle import pydevd_resolver
-from _pydevd_bundle.pydevd_constants import dict_iter_items, dict_keys, IS_PY3K, \
-    MAXIMUM_VARIABLE_REPRESENTATION_SIZE, RETURN_VALUES_DICT, LOAD_VALUES_POLICY, DEFAULT_VALUES_DICT, \
-    GET_FRAME_RETURN_GROUP
-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
-from _pydevd_bundle.pydevd_frame_type_handler import get_vars_handler, DO_NOT_PROCESS_VARS, XML_COMMUNICATION_VARS_HANDLER
+from _pydevd_bundle.pydevd_constants import dict_keys, IS_PY3K, \
+    LOAD_VALUES_POLICY, DEFAULT_VALUES_DICT
+from _pydevd_bundle.pydevd_extension_api import TypeResolveProvider, \
+    StrPresentationProvider
+from _pydevd_bundle.pydevd_frame_type_handler import get_vars_handler, \
+    DO_NOT_PROCESS_VARS, XML_COMMUNICATION_VARS_HANDLER
 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
+
 try:
     import types
 
@@ -340,7 +344,7 @@ 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():
+        if should_evaluate_shape() and is_safe_to_access(v, 'shape'):
             if hasattr(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):

{pydevd-pycharm-242.19890.32 → pydevd-pycharm-242.20224.86/pydevd_pycharm.egg-info}/PKG-INFO

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

pydevd-pycharm-242.19890.32/VERSION

@@ -1 +0,0 @@
-242.19890.32