MultiPyVu 3.1.2__tar.gz → 3.3.0__tar.gz

{multipyvu-3.1.2/src/MultiPyVu.egg-info → multipyvu-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MultiPyVu
-Version: 3.1.2
+Version: 3.3.0
 Summary: Control MultiVu using Python
 Author-email: Damon D Jackson <djackson@qdusa.com>
 Maintainer-email: "Quantum Design, Inc." <apps@qdusa.com>
@@ -435,6 +435,18 @@ client = mpv.Client(port=6000)
 - A log file named QdMultiVu.log shows the traffic between the server and client which can also be useful during troubleshooting.
 
 ## Changelog<a class="anchor" id="changelog"></a>
+**3.3.0**
+- April 2025
+- Bugfix which didn't allow this to be run on Mac or Linux platforms.
+- Refactored mpv.DataFile() so that if a script is saving data to a file,
+it can later load the file into a Pandas Dataframe without specifying the
+filename.  This means the file path is now optional in 
+.parse_MVu_data_file().
+
+**3.2.0**
+- November 2024
+- Improvements in determining the running version of MultiVu.
+
 **3.1.2**
 - October 2024
 - Fixed a bug which truncated numbers

{multipyvu-3.1.2 → multipyvu-3.3.0}/README.md

@@ -390,6 +390,18 @@ client = mpv.Client(port=6000)
 - A log file named QdMultiVu.log shows the traffic between the server and client which can also be useful during troubleshooting.
 
 ## Changelog<a class="anchor" id="changelog"></a>
+**3.3.0**
+- April 2025
+- Bugfix which didn't allow this to be run on Mac or Linux platforms.
+- Refactored mpv.DataFile() so that if a script is saving data to a file,
+it can later load the file into a Pandas Dataframe without specifying the
+filename.  This means the file path is now optional in 
+.parse_MVu_data_file().
+
+**3.2.0**
+- November 2024
+- Improvements in determining the running version of MultiVu.
+
 **3.1.2**
 - October 2024
 - Fixed a bug which truncated numbers

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/BRT.py

@@ -2,8 +2,8 @@
 BRT.py is an abstraction of the BRT module.
 """
 
-from typing import Tuple
 import time
+from typing import Tuple
 
 from .sdo_object import SdoObject, val_type
 

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/CommandChamber.py

@@ -9,16 +9,12 @@ Created on Tue May 18 13:14:28 2021
 
 from abc import abstractmethod
 from enum import IntEnum
-from typing import Union, Dict, Tuple, List
-
-from .ICommand import (ICommand,
-                       ICommandImp,
-                       ISimulateChange,
-                       ICommandObserverSim,
-                       catch_thread_error,
-                       )
-from .IEventManager import IObserver
+from typing import Dict, List, Tuple, Union
+
 from .exceptions import MultiPyVuError
+from .ICommand import (ICommand, ICommandImp, ICommandObserverSim,
+                       ISimulateChange, catch_thread_error)
+from .IEventManager import IObserver
 
 
 class modeEnum(IntEnum):

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/CommandField.py

@@ -8,20 +8,16 @@ Created on Tue May 18 13:14:28 2021
 """
 
 import time
-from enum import IntEnum
 from abc import abstractmethod
-from typing import Union, Dict, Tuple, List
+from enum import IntEnum
+from typing import Dict, List, Tuple, Union
 
 from .check_windows_esc import _check_windows_esc
-from .ICommand import (ICommand,
-                       ICommandImp,
-                       ISimulateChange,
-                       ICommandObserverSim,
-                       catch_thread_error,
-                       )
+from .exceptions import MultiPyVuError
+from .ICommand import (ICommand, ICommandImp, ICommandObserverSim,
+                       ISimulateChange, catch_thread_error)
 from .IEventManager import IObserver
 from .project_vars import CLOCK_TIME
-from .exceptions import MultiPyVuError
 
 
 class ApproachEnum(IntEnum):

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/CommandMultiVu.py

@@ -10,20 +10,19 @@ Created on Sat June 12 17:35:28 2021
 @author: djackson
 """
 
-from sys import platform
-from abc import abstractmethod
-from typing import Tuple, Dict
 import logging
+from abc import abstractmethod
+from sys import platform
+from typing import Dict, Tuple
 
+from .exceptions import MultiPyVuError, PythoncomImportError
 from .ICommand import ICommand
 from .project_vars import SERVER_NAME
-from .exceptions import MultiPyVuError, PythoncomImportError
-
 
 if platform == 'win32':
     try:
-        import win32com.client as win32
         import pythoncom
+        import win32com.client as win32
     except ImportError:
         raise PythoncomImportError
 

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/CommandSdo.py

@@ -4,29 +4,23 @@ CommandSdo.py is used to read and write SDOs
 @author: djackson
 """
 
-from sys import platform
-import struct
-import re
 import logging
+import re
+import struct
 from abc import abstractmethod
-from typing import Union, Tuple, Dict
-
-from .exceptions import (MultiPyVuError,
-                         PwinComError,
-                         CanError,
-                         can_err_enum,
-                         abort_err_enum,
-                         )
+from sys import platform
+from typing import Dict, Tuple, Union
+
+from .exceptions import (CanError, MultiPyVuError, PwinComError,
+                         PythoncomImportError, abort_err_enum, can_err_enum)
 from .ICommand import ICommand
+from .project_vars import CLIENT_NAME, SERVER_NAME
 from .sdo_object import SdoObject, val_type
-from .project_vars import SERVER_NAME, CLIENT_NAME
-from .exceptions import PythoncomImportError
-
 
 if platform == 'win32':
     try:
-        import win32com.client as win32
         import pythoncom
+        import win32com.client as win32
         from pywintypes import com_error as pywin_com_error
     except ImportError:
         raise PythoncomImportError
@@ -85,9 +79,9 @@ class CommandSdoBase(ICommand):
             can_err_as_str, abort_err_as_str = search_rslt
             can_err_as_int = int(can_err_as_str)
             abort_err_as_int = int(abort_err_as_str)
-        except BaseException:
+        except BaseException as e:
             msg = 'String can not be converted into two numbers'
-            raise ValueError(f'{msg}:  {err_str}')
+            raise ValueError(f'{msg}:  {err_str}') from e
         return can_err_as_int, abort_err_as_int
 
     def convert_result(self, response: Dict) -> Tuple:
@@ -189,8 +183,8 @@ class CommandSdoImp(CommandSdoBase):
 
     def _binary_to_value(self,
                          sdo: SdoObject,
-                         length: win32.VARIANT,
-                         val: win32.VARIANT) -> Union[str, int, float]:
+                         length,
+                         val) -> Union[str, int, float]:
         """
         Convert a binary value from reading an SDO into its correct
         type.

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/CommandTemperature.py

@@ -7,21 +7,17 @@ Created on Tue May 18 13:14:28 2021
 @author: djackson
 """
 
-from enum import IntEnum
 import time
-from typing import Union, Tuple, Dict, List
 from abc import abstractmethod
+from enum import IntEnum
+from typing import Dict, List, Tuple, Union
 
 from .check_windows_esc import _check_windows_esc
-from .ICommand import (ICommand,
-                       ICommandImp,
-                       ISimulateChange,
-                       ICommandObserverSim,
-                       catch_thread_error,
-                       )
+from .exceptions import MultiPyVuError
+from .ICommand import (ICommand, ICommandImp, ICommandObserverSim,
+                       ISimulateChange, catch_thread_error)
 from .IEventManager import IObserver
 from .project_vars import CLOCK_TIME
-from .exceptions import MultiPyVuError
 
 
 class ApproachEnum(IntEnum):

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/CommandWaitFor.py

@@ -6,32 +6,26 @@ Created on Tue May 18 13:14:28 2021
 @author: djackson
 """
 
-from sys import platform
-from enum import IntEnum
 import time
-from typing import Union, Tuple, Dict, List
 from abc import abstractmethod
+from enum import IntEnum
+from sys import platform
+from typing import Dict, List, Tuple, Union
 
 from .check_windows_esc import _check_windows_esc
-from .IEventManager import IObserver
-from .ICommand import (ICommand,
-                       ICommandImp,
-                       ISimulateChange
-                       )
-from .CommandTemperature import SimulateTemperatureChange
-from .CommandField import SimulateFieldChange
 from .CommandChamber import SimulateChamberChange
+from .CommandField import SimulateFieldChange
+from .CommandTemperature import SimulateTemperatureChange
+from .exceptions import (CanError, MultiPyVuError, PythoncomImportError,
+                         can_err_enum)
+from .ICommand import ICommand, ICommandImp, ISimulateChange
+from .IEventManager import IObserver
 from .project_vars import CLOCK_TIME
-from .exceptions import (MultiPyVuError,
-                         PythoncomImportError,
-                         CanError,
-                         can_err_enum,
-                         )
 
 if platform == 'win32':
     try:
-        import win32com.client as win32
         import pythoncom
+        import win32com.client as win32
     except ImportError:
         raise PythoncomImportError
 

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/Command_factory.py

@@ -5,12 +5,12 @@ simulated ICommand classes.
 
 from typing import Union
 
-from .CommandMultiVu import CommandMultiVuImp, CommandMultiVuSim
-from . import CommandTemperature as temperature
-from . import CommandField as field
 from . import CommandChamber as chamber
+from . import CommandField as field
 from . import CommandSdo as sdo
+from . import CommandTemperature as temperature
 from . import CommandWaitFor as wait_for
+from .CommandMultiVu import CommandMultiVuImp, CommandMultiVuSim
 
 
 def create_command_mv(mvu_flavor,

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/ICommand.py

@@ -13,20 +13,20 @@ Created on Tue May 18 12:59:24 2021
 @author: djackson
 """
 
-from sys import platform
-from typing import Union, Dict, Tuple, Type
 from abc import ABC, abstractmethod
-from threading import Thread, Lock, enumerate
-from time import time, sleep
+from sys import platform
+from threading import Lock, Thread, enumerate
+from time import sleep, time
+from typing import Dict, Tuple, Type, Union
 
-from .IEventManager import Publisher, IObserver
-from .project_vars import CLOCK_TIME
 from .exceptions import PythoncomImportError
+from .IEventManager import IObserver, Publisher
+from .project_vars import CLOCK_TIME
 
 if platform == 'win32':
     try:
-        import win32com.client as win32
         import pythoncom
+        import win32com.client as win32
         from pywintypes import com_error as pywin_com_error
     except ImportError:
         raise PythoncomImportError
@@ -61,7 +61,7 @@ class ICommand(ABC):
         self.units = ''
 
     @abstractmethod
-    def convert_result(self, result: Dict) -> Tuple:
+    def convert_result(self, response: Dict) -> Tuple:
         raise NotImplementedError
 
     @abstractmethod
@@ -74,8 +74,8 @@ class ICommand(ABC):
 
     @abstractmethod
     def get_state_server(self,
-                         statusCode,
-                         stateValue,
+                         value_variant,
+                         state_variant,
                          params: str = '') -> Tuple[float, int]:
         raise NotImplementedError
 

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/IServer.py

@@ -7,8 +7,8 @@ It requires ABCplus (Abstract Base Class plus), which is found here:
 @author: djackson
 """
 
-from typing import Union, Tuple
 from abc import ABC, abstractmethod
+from typing import Tuple, Union
 
 from .project_vars import PORT
 

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/MultiVuClient.py

@@ -13,36 +13,29 @@ with MultiVu.
 @author: D. Jackson
 """
 
-from sys import exc_info
-from enum import IntEnum
 import traceback
-from typing import Union, Tuple
+from enum import IntEnum
+from sys import exc_info
+from typing import Tuple, Union
 
-from .MultiVuClient_base import ClientBase as _ClientBase
-from .instrument import InstrumentList
 from . import Command_factory as _Command_factory
-from .CommandTemperature import STATE_DICT as _temperature_state_dict
-from .CommandTemperature import ApproachEnum as _temperature_approach_mode
-from .CommandTemperature import units as _temperature_units
+from .BRT import Brt as _brt
+from .CommandChamber import modeEnum as _chamber_mode
+from .CommandChamber import units as _chamber_units
 from .CommandField import ApproachEnum as _field_approach_mode
 from .CommandField import drivenEnum as _field_driven_mode
 from .CommandField import units as _field_units
-from .CommandChamber import modeEnum as _chamber_mode
-from .CommandChamber import units as _chamber_units
+from .CommandTemperature import STATE_DICT as _temperature_state_dict
+from .CommandTemperature import ApproachEnum as _temperature_approach_mode
+from .CommandTemperature import units as _temperature_units
 from .CommandWaitFor import MaskEnum as _wait_for_enum
+from .exceptions import (CanError, MultiPyVuError, ServerCloseError,
+                         abort_err_enum, can_err_enum)
+from .instrument import InstrumentList
+from .MultiVuClient_base import ClientBase as _ClientBase
+from .project_vars import HOST_CLIENT, PORT, TIMEOUT_LENGTH
 from .sdo_object import SdoObject
 from .sdo_object import val_type as _sdo_val_type
-from .BRT import Brt as _brt
-from .project_vars import (HOST_CLIENT,
-                           PORT,
-                           TIMEOUT_LENGTH
-                           )
-from .exceptions import (MultiPyVuError,
-                         ServerCloseError,
-                         CanError,
-                         can_err_enum,
-                         abort_err_enum,
-                         )
 
 
 class Client(_ClientBase):

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/MultiVuClient_base.py

@@ -12,29 +12,20 @@ MultiVuClient class has specific commands to be used with this class.
 @author: D. Jackson
 """
 
+import logging
 import sys
+import traceback
 from socket import timeout as sock_timeout
 from time import sleep
-import logging
-import traceback
 from typing import Dict, Union
 
-
-from .SocketMessageClient import ClientMessage as _ClientMessage
-from .logging_config import setup_logging, remove_logs
-from .project_vars import (TIMEOUT_LENGTH,
-                           CLIENT_NAME,
-                           HOST_CLIENT,
-                           PORT,
-                           CLOCK_TIME,
-                           )
-from .exceptions import (MultiPyVuError,
-                         ClientCloseError,
-                         ServerCloseError,
-                         SocketError
-                         )
 from .__version import __version__ as mpv_version
-
+from .exceptions import (ClientCloseError, MultiPyVuError, ServerCloseError,
+                         SocketError)
+from .logging_config import remove_logs, setup_logging
+from .project_vars import (CLIENT_NAME, CLOCK_TIME, HOST_CLIENT, PORT,
+                           TIMEOUT_LENGTH)
+from .SocketMessageClient import ClientMessage as _ClientMessage
 
 MAX_TRIES = 3
 
@@ -100,6 +91,7 @@ class ClientBase():
             raise self.__exit__(*sys.exc_info())
         except BaseException:
             raise self.__exit__(*sys.exc_info())
+        self._logger.debug(f'MultiPyVu Version: {mpv_version}')
         self._logger.info(f'Starting connection to {self.address}')
         # send a request to the sever to confirm a connection
         action = 'START'
@@ -112,7 +104,6 @@ class ClientBase():
         self._instr = self._message.instr
         self.instrument_name = self._message.instr.name
         # self._log_event.show_logger_name(self._instr.run_with_threading)
-        self._logger.debug(f'MultiPyVu Version: {mpv_version}')
         ver = self.get_version()
         if ver != mpv_version:
             self._query_server('CLOSE')

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/MultiVuDataFile/MultiVuDataFile.py

@@ -9,13 +9,14 @@ files.  This code was ported from MultiVuDataFile.vb.
 
 
 import os
-import time
 import re
-import pandas as pd
-from threading import Lock
-from enum import Enum, auto, IntEnum
+import time
 from datetime import datetime
-from typing import Union, Dict
+from enum import Enum, IntEnum, auto
+from threading import Lock
+from typing import Dict, Union
+
+import pandas as pd
 
 from .is_pathname_valid import is_pathname_valid
 

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/MultiVuServer.py

@@ -8,37 +8,30 @@ be used with MultiVuClient.py to control a Quantum Design cryostat.
 @author: D. Jackson
 """
 
-import sys
-import selectors
-import re
-from time import sleep
 import logging
+import re
+import selectors
+import sys
 import traceback
+from time import sleep
 from typing import List, Tuple
 
-
-from .scripts.helper_scripts import force_quit
-from .IServer import IServer as _IServer
+from .CommandChamber import SimulateChamberChange as _SimulateChamberChange
+from .CommandField import SimulateFieldChange as _SimulateFieldChange
+from .CommandTemperature import \
+    SimulateTemperatureChange as _SimulateTemperatureChange
+from .exceptions import (ClientCloseError, MultiPyVuError, ServerCloseError,
+                         SocketError)
 from .IEventManager import IObserver as _IObserver
+from .instrument import Instrument as _Instrument
+from .IServer import IServer as _IServer
+from .logging_config import remove_logs, setup_logging
+from .ParseInputs import inputs_from_command_line
+from .project_vars import (CLOCK_TIME, HOST_SERVER, PORT, SERVER_NAME,
+                           TIMEOUT_LENGTH)
+from .scripts.helper_scripts import force_quit
 from .SocketMessageServer import ServerMessage as _ServerMessage
 from .SocketMessageServer import ServerStatus as _ServerStatus
-from .ParseInputs import inputs_from_command_line
-from .instrument import Instrument as _Instrument
-from .CommandTemperature import SimulateTemperatureChange as _SimulateTemperatureChange
-from .CommandField import SimulateFieldChange as _SimulateFieldChange
-from .CommandChamber import SimulateChamberChange as _SimulateChamberChange
-from .exceptions import (MultiPyVuError,
-                         ClientCloseError,
-                         ServerCloseError,
-                         SocketError,
-                         )
-from .logging_config import setup_logging, remove_logs
-from .project_vars import (SERVER_NAME,
-                           HOST_SERVER,
-                           PORT,
-                           TIMEOUT_LENGTH,
-                           CLOCK_TIME,
-                           )
 
 
 class Server(_IServer):

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/ParseInputs.py

@@ -5,15 +5,13 @@ command-line inputs
 
 """
 
-import sys
-import re
 import ntpath
+import re
+import sys
 from typing import List
 
 from .instrument import InstrumentList
-from .project_vars import (HOST_SERVER,
-                           PORT,
-                           )
+from .project_vars import HOST_SERVER, PORT
 
 
 class ParsedInputs():

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/SocketMessage.py

@@ -8,21 +8,20 @@ Created on Mon Jun 7 23:47:19 2021
 @author: D. Jackson
 """
 
-import sys
-from abc import ABC
-import socket
-import json
 import io
+import json
 import logging
-import struct
 import re
-from typing import Union, Dict, Tuple
+import socket
+import struct
+import sys
+import traceback
+from abc import ABC
+from typing import Dict, Tuple, Union
 
-from .project_vars import PORT
-from .exceptions import (ClientCloseError,
-                         SocketError,
-                         )
 from .__version import __version__ as mpv_version
+from .exceptions import ClientCloseError, SocketError
+from .project_vars import PORT
 
 
 class Message(ABC):
@@ -304,7 +303,8 @@ class Message(ABC):
         """
         return json.dumps(dict_obj, ensure_ascii=False).encode(encoding)
 
-    def _json_decode(self, json_bytes: bytes,
+    def _json_decode(self,
+                     json_bytes: bytes,
                      encoding: str = 'utf-8') -> Dict[str, str]:
         """
         Takes a JSON formatted byte string and converts it to a dictionary
@@ -395,8 +395,22 @@ class Message(ABC):
         # be longer if there is data.
         if len(self._recv_buffer) >= header_len:
             # parse the buffer to save the header
-            self.json_header = self._json_decode(
-                self._recv_buffer[:header_len])
+            try:
+                self.json_header = self._json_decode(
+                                        self._recv_buffer[:header_len])
+            except UnicodeDecodeError as e:
+                msg = f'\nFull received buffer = {self._recv_buffer}'
+                msg += '\nBuffer sent to ._json_decode = '
+                msg += f'{self._recv_buffer[:header_len]}'
+                self.log_message(msg)
+
+                original_traceback = traceback.format_exc()
+                traceback_with_msg = original_traceback + msg
+                raise UnicodeDecodeError(e.encoding,
+                                         e.object,
+                                         e.start,
+                                         e.end,
+                                         traceback_with_msg)
 
             # This ensures that the header has all of the required fields
             for required_header in (

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/SocketMessageClient.py

@@ -8,21 +8,18 @@ Created on Mon Jun 7 23:47:19 2021
 @author: D. Jackson
 """
 
-import re
 import logging
+import re
 import socket
 from time import sleep
-from typing import Union, Tuple, Dict
+from typing import Dict, Tuple, Union
 
 from .check_windows_esc import _check_windows_esc
-from .SocketMessage import Message
+from .exceptions import (ClientCloseError, MultiPyVuError, ServerCloseError,
+                         SocketError)
 from .instrument import Instrument
 from .project_vars import CLIENT_NAME, CLOCK_TIME
-from .exceptions import (MultiPyVuError,
-                         ClientCloseError,
-                         ServerCloseError,
-                         SocketError
-                         )
+from .SocketMessage import Message
 
 
 class ClientMessage(Message):

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/__init__.py

@@ -22,26 +22,28 @@ Import MultiPyVu as mpv
 @author: Damon D Jackson
 """
 
-from sys import exc_info
-from os import path
 import traceback
-from pandas import DataFrame
 from enum import IntEnum as _IntEnum
 from enum import auto as _auto
-from typing import Union
+from os import path
+from sys import exc_info
+from typing import Optional, Union
+
+from pandas import DataFrame
 
 from .__version import __version__
-from .MultiVuServer import Server
+from .exceptions import MultiPyVuError, SocketError
 from .MultiVuClient import Client
-from .MultiVuDataFile.MultiVuDataFile import MultiVuDataFile as _MultiVuDataFile
+from .MultiVuDataFile.MultiVuDataFile import LabelResult
+from .MultiVuDataFile.MultiVuDataFile import \
+    MultiVuDataFile as _MultiVuDataFile
+from .MultiVuDataFile.MultiVuDataFile import MultiVuFileException
 from .MultiVuDataFile.MultiVuDataFile import TScaleType as _TScaleType
-from .MultiVuDataFile.MultiVuDataFile import TStartupAxisType as _TStartupAxisType
-from .MultiVuDataFile.MultiVuDataFile import TTimeUnits as _TTimeUnits
+from .MultiVuDataFile.MultiVuDataFile import \
+    TStartupAxisType as _TStartupAxisType
 from .MultiVuDataFile.MultiVuDataFile import TTimeMode as _TTimeMode
-from .MultiVuDataFile.MultiVuDataFile import LabelResult
-from .MultiVuDataFile.MultiVuDataFile import  MultiVuFileException
-from .exceptions import MultiPyVuError, SocketError
-
+from .MultiVuDataFile.MultiVuDataFile import TTimeUnits as _TTimeUnits
+from .MultiVuServer import Server
 
 __version__ = __version__
 __author__ = 'Damon D Jackson'
@@ -421,7 +423,8 @@ class DataFile():
         """
         return self.data_file.write_data_using_list(data_list, get_time_now)
 
-    def parse_MVu_data_file(self, file_path: str) -> DataFrame:
+    def parse_MVu_data_file(self,
+                            file_path: Optional[str] = None) -> DataFrame:
         """
         Returns a pandas DataFrame of all data points in the given file
 
@@ -440,6 +443,8 @@ class DataFile():
         >>> parse_MVu_data_file('myMvFile.dat')
 
         """
+        if file_path is None:
+            file_path = self.data_file.full_path
         try:
             _df = self.data_file.parse_MVu_data_file(file_path)
         except FileNotFoundError as e:

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/__main__.py

@@ -17,11 +17,11 @@ For example:
 from sys import argv
 
 from MultiPyVu.gui.Controller import Controller
+from MultiPyVu.ParseInputs import parse_input
 from MultiPyVu.scripts.helper_scripts import (get_ip,
                                               run_status,
                                               is_running,
                                               force_quit)
-from MultiPyVu.ParseInputs import parse_input
 
 
 def run_gui():

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/__version.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "3.1.2"
+__version__ = "3.3.0"

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/exceptions.py

@@ -3,8 +3,8 @@ Custom exceptions for MultiPyVu
 """
 
 
-from sys import exit, platform
 from enum import IntEnum
+from sys import exit, platform
 from typing import Tuple
 
 

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/generate_sdo_objects.py

@@ -10,9 +10,9 @@ in the same location as the cop file and will have the same
 name with the .py ending.
 """
 
-from sys import argv, exit
 import os.path
 import re
+from sys import argv, exit
 
 from MultiPyVu.CommandSdo import SdoObject, val_type
 

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/instrument.py

@@ -8,22 +8,23 @@ Created on Tue May 18 13:14:28 2021
 @author: djackson
 """
 
-from sys import platform
-import subprocess
-import time
-import re
 import logging
+import time
 from enum import Enum, auto
+from os import path
+from sys import platform
 from typing import Tuple
 
-from .project_vars import SERVER_NAME, PYWIN32_VERSION, MIN_PYWIN32_VERSION
-from .exceptions import MultiPyVuError, PythoncomImportError
 from .__version import __version__ as mpv_version
+from .exceptions import MultiPyVuError, PythoncomImportError
+from .project_vars import MIN_PYWIN32_VERSION, PYWIN32_VERSION, SERVER_NAME
 
 if platform == 'win32':
     try:
         import pythoncom
+        import win32api
         import win32com.client as win32
+        import win32process
     except ImportError:
         raise PythoncomImportError
 
@@ -218,28 +219,27 @@ class Instrument():
         # declare these variables so that they are available to return
         common_name = ''
         exe_name = ''
+        open_mv_dict = {}
 
-        # Use WMIC to get the list of running programs with 'multivu'
-        # in their path
-        cmd = 'WMIC PROCESS WHERE "COMMANDLINE like \'%multivu%\'" GET '
-        cmd += 'Caption,Commandline,Processid'
-        proc = subprocess.run(cmd, capture_output=True, text=True)
-        if proc.returncode != 0:
-            raise Exception(proc.stderr)
-        # make a dictionary whose key is the MultiVu flavor, and the
+        # Find processes with 'MultiVu' in the name and make
+        # a dictionary whose key is the MultiVu flavor, and the
         # value is a tuple with the exe path and process id
-        exe_search = r'([\w]*).exe[ ]*\"([:\\\w]*.exe)"[ \/\-a-zA-Z]*([0-9]*)'
-        open_mv_dict = {}
-        for i in proc.stdout.split('\n\n'):
-            exe_found = re.findall(exe_search, i)
-            if len(exe_found) > 0:
-                name, location, process_id = exe_found[0]
-                exe_name = name + '.exe'
-                common_name = self._exe_to_common_name(exe_name)
-                open_mv_dict[common_name] = (location,
-                                             exe_name,
-                                             process_id,
-                                             )
+        pids = win32process.EnumProcesses()
+        for pid in pids:
+            try:
+                # Open processes to query its executable path
+                h_process = win32api.OpenProcess(0x0410, False, pid)
+                exe_path = win32process.GetModuleFileNameEx(h_process, 0)
+                win32api.CloseHandle(h_process)
+
+                # Check if the path contains the keyword
+                if 'multivu' in exe_path.lower():
+                    exe_name = path.basename(exe_path)
+                    common_name = self._exe_to_common_name(exe_name)
+                    open_mv_dict[common_name] = (exe_path, exe_name)
+            except Exception:
+                # Ignore processes that we don't have access to
+                pass
 
         # Declare errors if no MultiVu instance is found
         if len(open_mv_dict) == 0:

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/logging_config.py

@@ -1,6 +1,11 @@
-from os import path
+'''
+logging_config.py is used to hold methods to help with the logging module
+'''
+
 import logging.config
 from logging import Logger
+from os import path
+
 import yaml
 
 from .project_vars import LOG_NAME

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/logging_config.yaml

@@ -6,7 +6,8 @@ formatters:
   no_name:
     format: '%(message)s'
   debug:
-    format: '%(asctime)-27s %(name)-20s %(levelname)-8s %(message)s'
+    format: '%(asctime)s.%(msecs)03d       %(name)-20s %(levelname)-8s %(message)s'
+    datefmt: '%Y-%m-%d %H:%M:%S'
   gui:
     format: '%(asctime)s - %(message)s'
     datefmt: '%m-%d %H:%M'

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/project_vars.py

@@ -7,13 +7,12 @@ Created on Mon Sep 27 10:53:06 2021
 @author: D. Jackson
 """
 
-from sys import platform
-import os
 import distutils.sysconfig
+import os
+from sys import platform
 
 from .exceptions import PythoncomImportError
 
-
 py_win_version = 0.0
 if platform == 'win32':
     try:

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/scripts/helper_scripts.py

@@ -2,10 +2,10 @@
 A few helpful scripts used in the MultiPyVu module
 """
 
+import re
+import subprocess
 from os import path
 from sys import platform
-import subprocess
-import re
 
 from MultiPyVu.MultiVuClient import Client
 

{multipyvu-3.1.2 → multipyvu-3.3.0/src/MultiPyVu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MultiPyVu
-Version: 3.1.2
+Version: 3.3.0
 Summary: Control MultiVu using Python
 Author-email: Damon D Jackson <djackson@qdusa.com>
 Maintainer-email: "Quantum Design, Inc." <apps@qdusa.com>
@@ -435,6 +435,18 @@ client = mpv.Client(port=6000)
 - A log file named QdMultiVu.log shows the traffic between the server and client which can also be useful during troubleshooting.
 
 ## Changelog<a class="anchor" id="changelog"></a>
+**3.3.0**
+- April 2025
+- Bugfix which didn't allow this to be run on Mac or Linux platforms.
+- Refactored mpv.DataFile() so that if a script is saving data to a file,
+it can later load the file into a Pandas Dataframe without specifying the
+filename.  This means the file path is now optional in 
+.parse_MVu_data_file().
+
+**3.2.0**
+- November 2024
+- Improvements in determining the running version of MultiVu.
+
 **3.1.2**
 - October 2024
 - Fixed a bug which truncated numbers

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ src/MultiPyVu/MultiVuDataFile/__version.py
 src/MultiPyVu/MultiVuDataFile/is_pathname_valid.py
 src/MultiPyVu/font/Play-Bold.ttf
 src/MultiPyVu/font/Play-Regular.ttf
+src/MultiPyVu/font/__init__.py
 src/MultiPyVu/gui/Controller.py
 src/MultiPyVu/gui/IController.py
 src/MultiPyVu/gui/IView.py
@@ -50,5 +51,7 @@ src/MultiPyVu/gui/ViewTk.py
 src/MultiPyVu/gui/__init__.py
 src/MultiPyVu/images/Q.png
 src/MultiPyVu/images/QD_logo.jpg
+src/MultiPyVu/images/__init__.py
+src/MultiPyVu/scripts/__init__.py
 src/MultiPyVu/scripts/helper_scripts.py
 src/MultiPyVu/scripts/whats_my_ip_address.cmd

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/SocketMessageServer.py

@@ -8,23 +8,19 @@ Created on Mon Jun 7 23:47:19 2021
 @author: D. Jackson
 """
 
-from sys import platform
+import logging
+import re
+import selectors
+import socket
 import threading
-import traceback
 import time
-import socket
-import selectors
-import re
+import traceback
 from enum import IntEnum, auto, IntFlag
-import logging
+from sys import platform
 from typing import Union, Dict, Tuple, List
 
 from .check_windows_esc import _check_windows_esc
 from .Command_factory import create_command_mv
-from .SocketMessage import Message
-from .instrument import Instrument
-from .IEventManager import Publisher as _Publisher
-from .IEventManager import IObserver as _IObserver
 from .exceptions import (MultiPyVuError,
                          ClientCloseError,
                          ServerCloseError,
@@ -32,7 +28,11 @@ from .exceptions import (MultiPyVuError,
                          SocketError,
                          PythoncomImportError,
                          )
+from .IEventManager import Publisher as _Publisher
+from .IEventManager import IObserver as _IObserver
+from .instrument import Instrument
 from .project_vars import SERVER_NAME, CLOCK_TIME
+from .SocketMessage import Message
 
 
 if platform == 'win32':

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/gui/Controller.py

@@ -6,19 +6,19 @@ pattern for MultiPyVu.py
 """
 
 
+import re
+import subprocess
 import os
 from sys import platform
-import subprocess
-import re
-from typing import List
 from types import MethodType
+from typing import List
 
-from ..MultiVuServer import Server
+from .IController import IController
+from .ViewFactory import ViewType, ViewFactory
+from ..IEventManager import IObserver
 from ..instrument import InstrumentList
+from ..MultiVuServer import Server
 from ..ParseInputs import inputs_from_command_line
-from ..IEventManager import IObserver
-from .ViewFactory import ViewType, ViewFactory
-from .IController import IController
 
 
 class ServerInfo(IObserver):

{multipyvu-3.1.2 → multipyvu-3.3.0}/src/MultiPyVu/gui/ViewTk.py

@@ -5,13 +5,13 @@ View.py holds the code for a gui for MultiPyVu.Server
 """
 
 
-import sys
 import io
-from enum import IntEnum, auto
-from threading import Lock
 import logging
 import logging.handlers
+import sys
 import tkinter as tk
+from enum import IntEnum, auto
+from threading import Lock
 from tkinter import font
 try:
     from PIL import ImageTk, Image