pydevd-pycharm 251.17181.23__tar.gz → 251.20015.54__tar.gz

{pydevd_pycharm-251.17181.23/pydevd_pycharm.egg-info → pydevd_pycharm-251.20015.54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 251.17181.23
+Version: 251.20015.54
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others
@@ -60,6 +60,24 @@ To generate a distribution to upload to PyPi, `python setup.py sdist bdist_wheel
 which should have a wheel and afterwards `twine upload -s dist/pydevd-*` should be run to actually upload the contents
 to PyPi.
 
+## Dependencies
+
+CI dependencies are stored in `ci-requirements/`. These are high-level dependencies required to initialize tests execution.
+Basically `tox` and it's transient requirements.
+
+Test dependencies are stored in `test-requirements/`. These dependencies are required for successful execution of all the tests.
+
+For local development you only need CI dependencies. Test dependencies are completely handled by `tox`, assuming you are running tests
+through it.
+
+Dependencies are pinned and split by supported Python version. It is done ...
+
+- to avoid rogue dependency update crashing the tests and consequently safe-push overnight if the test is in the aggregator,
+- to have reproducible builds,
+- to avoid finding a set of dependencies which satisfy all the supported Python version simultaneously.
+
+For more details on the current dependency declaration approach see [PCQA-914][PCQA-914] and [PCQA-904][PCQA-904].
+
 ## Tests
 
 Tests are executed via `tox` with the help of `pytest`.
@@ -83,3 +101,7 @@ tox -e py313 -- pydev_tests/test_pyserver.py::TestCPython::test_message
 ```
 
 [pydevd]: https://github.com/fabioz/PyDev.Debugger
+
+[PCQA-904]: https://youtrack.jetbrains.com/issue/PCQA-904
+
+[PCQA-914]: https://youtrack.jetbrains.com/issue/PCQA-914

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.20015.54}/README.md

@@ -28,6 +28,24 @@ To generate a distribution to upload to PyPi, `python setup.py sdist bdist_wheel
 which should have a wheel and afterwards `twine upload -s dist/pydevd-*` should be run to actually upload the contents
 to PyPi.
 
+## Dependencies
+
+CI dependencies are stored in `ci-requirements/`. These are high-level dependencies required to initialize tests execution.
+Basically `tox` and it's transient requirements.
+
+Test dependencies are stored in `test-requirements/`. These dependencies are required for successful execution of all the tests.
+
+For local development you only need CI dependencies. Test dependencies are completely handled by `tox`, assuming you are running tests
+through it.
+
+Dependencies are pinned and split by supported Python version. It is done ...
+
+- to avoid rogue dependency update crashing the tests and consequently safe-push overnight if the test is in the aggregator,
+- to have reproducible builds,
+- to avoid finding a set of dependencies which satisfy all the supported Python version simultaneously.
+
+For more details on the current dependency declaration approach see [PCQA-914][PCQA-914] and [PCQA-904][PCQA-904].
+
 ## Tests
 
 Tests are executed via `tox` with the help of `pytest`.
@@ -51,3 +69,7 @@ tox -e py313 -- pydev_tests/test_pyserver.py::TestCPython::test_message
 ```
 
 [pydevd]: https://github.com/fabioz/PyDev.Debugger
+
+[PCQA-904]: https://youtrack.jetbrains.com/issue/PCQA-904
+
+[PCQA-914]: https://youtrack.jetbrains.com/issue/PCQA-914

pydevd_pycharm-251.20015.54/VERSION

@@ -0,0 +1 @@
+251.20015.54

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.20015.54}/_pydevd_bundle/pydevd_comm.py

@@ -96,7 +96,7 @@ import pydevd_tracing
 from _pydevd_bundle import pydevd_xml
 from _pydevd_bundle import pydevd_vm_type
 from _pydevd_bundle.smart_step_into import find_stepping_variants
-from pydevd_file_utils import get_abs_path_real_path_and_base_from_frame, norm_file_to_client, is_real_file
+from pydevd_file_utils import get_abs_path_real_path_and_base_from_frame, norm_file_to_client, is_real_file, is_jupyter_cell
 import pydevd_file_utils
 import sys
 import traceback
@@ -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 = "251.17181.23"
+VERSION_STRING = "251.20015.54"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
 file_system_encoding = getfilesystemencoding()
@@ -733,9 +733,13 @@ class NetCommandFactory:
                         curr_frame = curr_frame.f_back
                         continue
 
-                my_file = abs_path_real_path_and_base[0]
+                is_jup_cell = is_jupyter_cell(curr_frame)
+                if is_jup_cell:
+                    my_file = abs_path_real_path_and_base
+                else:
+                    my_file = abs_path_real_path_and_base[0]
 
-                if is_real_file(my_file):
+                if is_real_file(my_file) and not is_jup_cell:
                     # if filename is Jupyter cell id
                     my_file = pydevd_file_utils.norm_file_to_client(abs_path_real_path_and_base[0])
 

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.20015.54}/_pydevd_bundle/pydevd_dont_trace_files.py

@@ -149,6 +149,11 @@ DONT_TRACE = {
     'test_pydev_numpy_without_pandas.py': PYDEV_FILE,
     'test_pydev_pandas.py': PYDEV_FILE,
     'test_pydev_polars.py': PYDEV_FILE,
+    'test_pydev_tensorflow_with_pandas.py': PYDEV_FILE,
+    'test_pydev_torch_with_pandas.py': PYDEV_FILE,
+    'test_pydev_tensorflow_without_pandas.py': PYDEV_FILE,
+    'test_pydev_torch_without_pandas.py': PYDEV_FILE,
+    'test_pydev_dataset.py': PYDEV_FILE,
 }
 
 DONT_TRACE['pydev_jupyter_plugin.py'] = PYDEV_FILE

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.20015.54}/_pydevd_bundle/pydevd_process_net_command.py

@@ -367,13 +367,13 @@ def process_net_command(py_db, cmd_id, seq, text):
                 if py_db._set_breakpoints_with_id:
                     try:
                         try:
-                            breakpoint_id, type, file, line, func_name, condition, expression, hit_condition, is_logpoint, suspend_policy = text.split('\t', 9)
+                            breakpoint_id, breakpoint_type, file, line, func_name, condition, expression, hit_condition, is_logpoint, suspend_policy = text.split('\t', 9)
                         except ValueError: # not enough values to unpack
                             # No suspend_policy passed (use default).
-                            breakpoint_id, type, file, line, func_name, condition, expression, hit_condition, is_logpoint = text.split('\t', 8)
+                            breakpoint_id, breakpoint_type, file, line, func_name, condition, expression, hit_condition, is_logpoint = text.split('\t', 8)
                         is_logpoint = is_logpoint == 'True'
                     except ValueError: # not enough values to unpack
-                        breakpoint_id, type, file, line, func_name, condition, expression = text.split('\t', 6)
+                        breakpoint_id, breakpoint_type, file, line, func_name, condition, expression = text.split('\t', 6)
 
                     breakpoint_id = int(breakpoint_id)
                     line = int(line)
@@ -388,7 +388,7 @@ def process_net_command(py_db, cmd_id, seq, text):
                 else:
                     # Note: this else should be removed after PyCharm migrates to setting
                     # breakpoints by id (and ideally also provides func_name).
-                    type, file, line, func_name, suspend_policy, condition, expression = text.split('\t', 6)
+                    breakpoint_type, file, line, func_name, suspend_policy, condition, expression = text.split('\t', 6)
                     # If we don't have an id given for each breakpoint, consider
                     # the id to be the line.
                     breakpoint_id = line = int(line)
@@ -402,7 +402,7 @@ def process_net_command(py_db, cmd_id, seq, text):
                 if not IS_PY3K:  # In Python 3, the frame object will have unicode for the file, whereas on python 2 it has a byte-array encoded with the filesystem encoding.
                     file = file.encode(file_system_encoding)
 
-                if pydevd_file_utils.is_real_file(file):
+                if pydevd_file_utils.is_real_file(file) and breakpoint_type != 'jupyter-line':
                     file = pydevd_file_utils.norm_file_to_server(file)
 
                     if not pydevd_file_utils.exists(file):
@@ -419,7 +419,7 @@ def process_net_command(py_db, cmd_id, seq, text):
                 if hit_condition is not None and (len(hit_condition) <= 0 or hit_condition == "None"):
                     hit_condition = None
 
-                if type == 'python-line':
+                if breakpoint_type == 'python-line':
                     breakpoint = LineBreakpoint(line, condition, func_name, expression, suspend_policy, hit_condition=hit_condition, is_logpoint=is_logpoint)
                     breakpoints = py_db.breakpoints
                     file_to_id_to_breakpoint = py_db.file_to_id_to_line_breakpoint
@@ -428,7 +428,7 @@ def process_net_command(py_db, cmd_id, seq, text):
                     result = None
                     plugin = py_db.get_plugin_lazy_init()
                     if plugin is not None:
-                        result = plugin.add_breakpoint('add_line_breakpoint', py_db, type, file, line, condition, expression, func_name, hit_condition=hit_condition, is_logpoint=is_logpoint)
+                        result = plugin.add_breakpoint('add_line_breakpoint', py_db, breakpoint_type, file, line, condition, expression, func_name, hit_condition=hit_condition, is_logpoint=is_logpoint)
                     if result is not None:
                         supported_type = True
                         breakpoint, breakpoints = result
@@ -437,10 +437,10 @@ def process_net_command(py_db, cmd_id, seq, text):
                         supported_type = False
 
                 if not supported_type:
-                    if type == 'jupyter-line':
+                    if breakpoint_type == 'jupyter-line':
                         return
                     else:
-                        raise NameError(type)
+                        raise NameError(breakpoint_type)
 
                 if DebugInfoHolder.DEBUG_TRACE_BREAKPOINTS > 0:
                     pydev_log.debug('Added breakpoint:%s - line:%s - func_name:%s\n' % (file, line, func_name.encode('utf-8')))
@@ -466,13 +466,13 @@ def process_net_command(py_db, cmd_id, seq, text):
 
             elif cmd_id == CMD_REMOVE_BREAK:
                 #command to remove some breakpoint
-                #text is type\file\tid. Remove from breakpoints dictionary
+                #text is breakpoint_type\file\tid. Remove from breakpoints dictionary
                 breakpoint_type, file, breakpoint_id = text.split('\t', 2)
 
                 if not IS_PY3K:  # In Python 3, the frame object will have unicode for the file, whereas on python 2 it has a byte-array encoded with the filesystem encoding.
                     file = file.encode(file_system_encoding)
 
-                if pydevd_file_utils.is_real_file(file):
+                if pydevd_file_utils.is_real_file(file) and breakpoint_type != 'jupyter-line':
                     file = pydevd_file_utils.norm_file_to_server(file)
 
                 try:

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.20015.54}/_pydevd_bundle/pydevd_tables.py

@@ -1,4 +1,4 @@
-#  Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+#  Copyright 2000-2025 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 
 from _pydevd_bundle import pydevd_vars
@@ -34,7 +34,7 @@ def exec_table_command(init_command, command_type, start_index, end_index, forma
         return False, table.result
 
     table_provider = __get_table_provider(table)
-    if not table_provider:
+    if not table_provider and command_type != TableCommandType.IMAGE:
         raise RuntimeError('No table data provider for: {}'.format(type(table)))
 
     res = []
@@ -60,22 +60,27 @@ def exec_table_command(init_command, command_type, start_index, end_index, forma
         res.append(table_provider.get_data(table, True, start_index, end_index, format))
 
     elif command_type == TableCommandType.IMAGE:
-        res.append(table_provider.get_bytes(table))
+        image_provider = __get_image_provider(table)
+        res.append(image_provider.get_bytes(table))
 
     return True, ''.join(res)
 
 
+def __get_type_name(table):
+    table_data_type = type(table)
+    table_data_type_name = '{}.{}'.format(table_data_type.__module__, table_data_type.__name__)
+    return table_data_type_name
+
+
 # noinspection PyUnresolvedReferences
 def __get_table_provider(output):
     # type: (str) -> Any
-    output_type = type(output)
-
-    table_provider = None
-    type_qualified_name = '{}.{}'.format(output_type.__module__, output_type.__name__)
+    type_qualified_name = __get_type_name(output)
     numpy_based_type_qualified_names = ['tensorflow.python.framework.ops.EagerTensor',
                                         'tensorflow.python.ops.resource_variable_ops.ResourceVariable',
                                         'tensorflow.python.framework.sparse_tensor.SparseTensor',
                                         'torch.Tensor']
+    table_provider = None
     if type_qualified_name in ['pandas.core.frame.DataFrame',
                                'pandas.core.series.Series',
                                'geopandas.geoseries.GeoSeries',
@@ -84,12 +89,12 @@ def __get_table_provider(output):
         import _pydevd_bundle.tables.pydevd_pandas as table_provider
     # dict is needed for sort commands
     elif type_qualified_name == 'builtins.dict':
-        table_type = '{}.{}'.format(type(output['data']).__module__, type(output['data']).__name__)
-        if table_type in numpy_based_type_qualified_names:
+        table_type_name = __get_type_name(output['data'])
+        if table_type_name in numpy_based_type_qualified_names:
             import _pydevd_bundle.tables.pydevd_numpy_based as table_provider
         else:
             import _pydevd_bundle.tables.pydevd_numpy as table_provider
-    elif type_qualified_name == 'numpy.ndarray':
+    elif type_qualified_name == 'numpy.ndarray' or type_qualified_name == 'numpy.rec.recarray':
         import _pydevd_bundle.tables.pydevd_numpy as table_provider
     elif type_qualified_name in numpy_based_type_qualified_names:
         import _pydevd_bundle.tables.pydevd_numpy_based as table_provider
@@ -101,3 +106,30 @@ def __get_table_provider(output):
         import _pydevd_bundle.tables.pydevd_dataset as table_provider
 
     return table_provider
+
+
+# noinspection PyUnresolvedReferences
+def __get_image_provider(output):
+    # type: (str) -> Any
+    type_qualified_name = __get_type_name(output)
+    numpy_based_type_qualified_names = ['tensorflow.python.framework.ops.EagerTensor',
+                                        'tensorflow.python.ops.resource_variable_ops.ResourceVariable',
+                                        'tensorflow.python.framework.sparse_tensor.SparseTensor',
+                                        'torch.Tensor']
+    image_provider = None
+    if type_qualified_name == 'builtins.dict':
+        table_type_name = __get_type_name(output['data'])
+        if table_type_name in numpy_based_type_qualified_names:
+            import _pydevd_bundle.tables.images.pydevd_numpy_based_image as image_provider
+        else:
+            import _pydevd_bundle.tables.images.pydevd_numpy_image as image_provider
+    elif type_qualified_name in numpy_based_type_qualified_names:
+        import _pydevd_bundle.tables.images.pydevd_numpy_based_image as image_provider
+    elif type_qualified_name == 'numpy.ndarray':
+        import _pydevd_bundle.tables.images.pydevd_numpy_image as image_provider
+    elif type_qualified_name == 'PIL.Image.Image':
+        import _pydevd_bundle.tables.images.pydevd_pillow_image as image_provider
+    elif type_qualified_name == 'matplotlib.figure.Figure':
+        import _pydevd_bundle.tables.images.pydevd_matplotlib_image as image_provider
+
+    return image_provider

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.20015.54}/_pydevd_bundle/pydevd_thrift.py

@@ -630,6 +630,7 @@ def header_data_to_thrift_struct(rows, cols, dtypes, col_bounds, col_to_format,
 
 TYPE_TO_THRIFT_STRUCT_CONVERTERS = {
     "ndarray": array_to_thrift_struct,
+    "recarray": array_to_thrift_struct,
     "EagerTensor": tensor_to_thrift_struct,
     "ResourceVariable": tensor_to_thrift_struct,
     "SparseTensor": sparse_tensor_to_thrift_struct,

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.20015.54}/_pydevd_bundle/pydevd_vars.py

@@ -666,13 +666,13 @@ def get_formatted_row_elements(row, iat, dim, cols, format, dtypes):
     for c in range(cols):
         val = iat[row, c] if dim > 1 else iat[row]
         col_formatter = get_column_formatter_by_type(format, dtypes[c])
-        if val != val:
-            yield "nan"
-        else:
-            try:
+        try:
+            if val != val:
+                yield "nan"
+            else:
                 yield ("%" + col_formatter) % (val,)
-            except TypeError:
-                yield ("%" + DEFAULT_DF_FORMAT) % (val,)
+        except TypeError:
+            yield ("%" + DEFAULT_DF_FORMAT) % (val,)
 
 
 def array_default_format(type):
@@ -836,6 +836,7 @@ def is_able_to_format_number(format):
 
 TYPE_TO_XML_CONVERTERS = {
     "ndarray": array_to_xml,
+    "recarray": array_to_xml,
     "DataFrame": dataframe_to_xml,
     "Series": dataframe_to_xml,
     "GeoDataFrame": dataframe_to_xml,

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.20015.54}/pydevd_file_utils.py

@@ -553,10 +553,16 @@ def _is_int(filename):
     except:
         return False
 
+
 def is_real_file(filename):
     # Check for Jupyter cells
     return not _is_int(filename) and not filename.startswith("<ipython-input")
 
+
+def is_jupyter_cell(frame):
+    return frame.f_code.co_name == '<ipython cell>'
+
+
 # For given file f returns tuple of its absolute path, real path and base name
 def get_abs_path_real_path_and_base_from_file(f):
     try:
@@ -587,6 +593,11 @@ def get_abs_path_real_path_and_base_from_frame(frame):
     except:
         # This one is just internal (so, does not need any kind of client-server translation)
         f = frame.f_code.co_filename
+
+        if is_jupyter_cell(frame):
+            NORM_PATHS_AND_BASE_CONTAINER[frame.f_code.co_filename] = f
+            return f
+
         if f is not None and f.startswith (('build/bdist.', 'build\\bdist.')):
             # files from eggs in Python 2.7 have paths like build/bdist.linux-x86_64/egg/<path-inside-egg>
             f = frame.f_globals['__file__']

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.20015.54/pydevd_pycharm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 251.17181.23
+Version: 251.20015.54
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others
@@ -60,6 +60,24 @@ To generate a distribution to upload to PyPi, `python setup.py sdist bdist_wheel
 which should have a wheel and afterwards `twine upload -s dist/pydevd-*` should be run to actually upload the contents
 to PyPi.
 
+## Dependencies
+
+CI dependencies are stored in `ci-requirements/`. These are high-level dependencies required to initialize tests execution.
+Basically `tox` and it's transient requirements.
+
+Test dependencies are stored in `test-requirements/`. These dependencies are required for successful execution of all the tests.
+
+For local development you only need CI dependencies. Test dependencies are completely handled by `tox`, assuming you are running tests
+through it.
+
+Dependencies are pinned and split by supported Python version. It is done ...
+
+- to avoid rogue dependency update crashing the tests and consequently safe-push overnight if the test is in the aggregator,
+- to have reproducible builds,
+- to avoid finding a set of dependencies which satisfy all the supported Python version simultaneously.
+
+For more details on the current dependency declaration approach see [PCQA-914][PCQA-914] and [PCQA-904][PCQA-904].
+
 ## Tests
 
 Tests are executed via `tox` with the help of `pytest`.
@@ -83,3 +101,7 @@ tox -e py313 -- pydev_tests/test_pyserver.py::TestCPython::test_message
 ```
 
 [pydevd]: https://github.com/fabioz/PyDev.Debugger
+
+[PCQA-904]: https://youtrack.jetbrains.com/issue/PCQA-904
+
+[PCQA-914]: https://youtrack.jetbrains.com/issue/PCQA-914

pydevd_pycharm-251.17181.23/VERSION

@@ -1 +0,0 @@
-251.17181.23