flashforge-python-api 1.2.1__py3-none-any.whl → 1.2.3__py3-none-any.whl

flashforge/__init__.py

@@ -127,7 +127,7 @@ from .tcp import (
 )
 
 FiveMClient = FlashForgeClient
-__version__ = "1.1.1"
+__version__ = "1.2.3"
 __author__ = "FlashForge Python API Contributors"
 __email__ = "notghosttypes@gmail.com"
 __description__ = "Python library for controlling FlashForge 3D printers"

flashforge/api/controls/info.py

@@ -14,6 +14,14 @@ if TYPE_CHECKING:
     from ...client import FlashForgeClient
 
 
+# Firmware-reported PIDs from FlashForge's /detail endpoint. These are stable
+# identifiers set by firmware, unlike the user-mutable `name` field.
+PID_5M = 35
+PID_5M_PRO = 36
+PID_AD5X = 38
+KNOWN_HTTP_PIDS = {PID_5M, PID_5M_PRO, PID_AD5X}
+
+
 class MachineInfoParser:
     """
     Transforms printer detail data from the API response format into a structured FFMachineInfo object.
@@ -68,8 +76,17 @@ class MachineInfoParser:
                 or len(getattr(getattr(detail, "matl_station_info", None), "slot_infos", []) or []) > 0
             )
             printer_name = getattr(detail, "name", "") or ""
-            is_ad5x = printer_name.upper() == "AD5X" or has_material_station
-            is_pro = "Pro" in printer_name and not is_ad5x
+            pid = getattr(detail, "pid", None)
+
+            if pid in KNOWN_HTTP_PIDS:
+                is_ad5x = pid == PID_AD5X
+                is_pro = pid == PID_5M_PRO
+            else:
+                # Fallback for firmware that doesn't report pid: legacy
+                # name+capability heuristic. Vulnerable to user renames, which
+                # is why pid-based detection is preferred when available.
+                is_ad5x = printer_name.upper() == "AD5X" or has_material_station
+                is_pro = "Pro" in printer_name and not is_ad5x
 
             # Build the FFMachineInfo object
             machine_info = FFMachineInfo(
@@ -107,6 +124,7 @@ class MachineInfoParser:
                 fill_amount=getattr(detail, "fill_amount", 0) or 0,
                 firmware_version=getattr(detail, "firmware_version", "") or "",
                 name=printer_name,
+                pid=pid,
                 is_pro=is_pro,
                 is_ad5x=is_ad5x,
                 nozzle_size=getattr(detail, "nozzle_model", "") or "",

flashforge/discovery/discovery.py

@@ -12,7 +12,7 @@ from dataclasses import dataclass, field
 from enum import IntEnum, StrEnum
 from typing import Any
 
-import netifaces
+import ifaddr
 
 logger = logging.getLogger(__name__)
 
@@ -535,26 +535,27 @@ class PrinterDiscovery:
         broadcast_addresses: list[str] = []
 
         try:
-            for interface_name in netifaces.interfaces():
-                try:
-                    addresses = netifaces.ifaddresses(interface_name)
-                    if netifaces.AF_INET not in addresses:
+            for adapter in ifaddr.get_adapters():
+                for ip in adapter.ips:
+                    if not ip.is_IPv4:
+                        continue
+
+                    ip_addr = ip.ip
+                    if not isinstance(ip_addr, str) or ip_addr.startswith("127."):
                         continue
 
-                    for addr_info in addresses[netifaces.AF_INET]:
-                        if addr_info.get("addr", "").startswith("127."):
-                            continue
+                    prefix = ip.network_prefix
+                    if not isinstance(prefix, int) or not 0 < prefix <= 32:
+                        continue
 
-                        ip_addr = addr_info.get("addr")
-                        netmask = addr_info.get("netmask")
-                        if not ip_addr or not netmask:
-                            continue
+                    mask_int = (0xFFFFFFFF << (32 - prefix)) & 0xFFFFFFFF
+                    netmask = ".".join(
+                        str((mask_int >> (8 * (3 - i))) & 0xFF) for i in range(4)
+                    )
 
-                        broadcast = self.calculate_broadcast_address(ip_addr, netmask)
-                        if broadcast and broadcast not in broadcast_addresses:
-                            broadcast_addresses.append(broadcast)
-                except Exception as error:
-                    logger.warning("Error processing interface %s: %s", interface_name, error)
+                    broadcast = self.calculate_broadcast_address(ip_addr, netmask)
+                    if broadcast and broadcast not in broadcast_addresses:
+                        broadcast_addresses.append(broadcast)
         except Exception as error:
             logger.error("Error getting network interfaces: %s", error)
             broadcast_addresses = ["255.255.255.255", "192.168.1.255", "192.168.0.255"]

flashforge/models/machine_info.py

@@ -324,6 +324,7 @@ class FFMachineInfo(BaseModel):
     fill_amount: float = 0.0
     firmware_version: str = ""
     name: str = ""
+    pid: int | None = None
     is_pro: bool = False
     is_ad5x: bool = False
     nozzle_size: str = ""

{flashforge_python_api-1.2.1.dist-info → flashforge_python_api-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flashforge-python-api
-Version: 1.2.1
+Version: 1.2.3
 Summary: A comprehensive Python library for controlling FlashForge 3D printers
 Project-URL: Homepage, https://github.com/GhostTypes/ff-5mp-api-py
 Project-URL: Documentation, https://github.com/GhostTypes/ff-5mp-api-py#readme
@@ -16,12 +16,13 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: System :: Hardware :: Hardware Drivers
 Requires-Python: >=3.11
 Requires-Dist: aiohttp>=3.8.0
-Requires-Dist: netifaces>=0.11.0
+Requires-Dist: ifaddr>=0.2.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: requests>=2.31.0
 Provides-Extra: all
@@ -70,14 +71,20 @@ Modern LAN-mode HTTP printers require:
 
 - printer IP address
 - serial number
-- check code
+- check code (per-printer credential, not returned by discovery)
 
 ```python
 import asyncio
-from flashforge import FlashForgeClient, PrinterDiscovery
+import os
+from flashforge import FlashForgeClient, FiveMClientConnectionOptions, PrinterDiscovery
 
 
 async def main():
+    check_code = os.getenv("FLASHFORGE_CHECK_CODE", "").strip()
+    if not check_code:
+        print("Set FLASHFORGE_CHECK_CODE before running this example")
+        return
+
     discovery = PrinterDiscovery()
     printers = await discovery.discover()
 
@@ -86,13 +93,23 @@ async def main():
         return
 
     printer = printers[0]
+    if not printer.serial_number:
+        print("Discovered printer did not report a serial number")
+        return
+
+    options = FiveMClientConnectionOptions(
+        http_port=printer.event_port,
+        tcp_port=printer.command_port,
+    )
 
     async with FlashForgeClient(
         printer.ip_address,
-        printer.serial_number or "SERIAL_NUMBER",
-        "CHECK_CODE",
+        printer.serial_number,
+        check_code,
+        options=options,
     ) as client:
-        if not await client.initialize():
+        status = await client.get_printer_status()
+        if not status:
             return
 
         await client.init_control()

{flashforge_python_api-1.2.1.dist-info → flashforge_python_api-1.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-flashforge/__init__.py,sha256=3fmBeEJ4vFJDSsOQV0Yixb1yLyUw8nHDZKQHbXIbtmo,5336
+flashforge/__init__.py,sha256=TkwDdU0toTFKhbDE6-9P85X8o4_GKwkdFTp4CcdFMt4,5336
 flashforge/client.py,sha256=lplKJxNOLhUJMusm025cj7rZvWRAiv2j5qENdBIctuA,16920
 flashforge/api/__init__.py,sha256=vQz-DkG6LTH39bI4fyiUc0D9jQzemLh45pORLptSOlg,335
 flashforge/api/constants/__init__.py,sha256=Q0HL2tqSBYPd4Oz49VHLS3qUvRuv__GCvTGecaLrQ-Y,163
@@ -7,7 +7,7 @@ flashforge/api/constants/endpoints.py,sha256=zU_ONPyLUATr1KPlk0x8SLrK4ojs4QiiWr1
 flashforge/api/controls/__init__.py,sha256=53s-H25Pjwr0kvPk8MZ2Twy8VHGqGcO6Q6uBphhEOh4,293
 flashforge/api/controls/control.py,sha256=8wK2YOGf9NphWXsjIDapyQEfx-qGZgytXZFsjKeWvSA,11291
 flashforge/api/controls/files.py,sha256=8T9kzgss_2DYFL4WVuEFj8W9sOPPPMIMq3dTq1d551w,6560
-flashforge/api/controls/info.py,sha256=KVExwaeDd1SYiSOBZVVtif3Rf_cJkw4Bizhgm6dbAS8,12398
+flashforge/api/controls/info.py,sha256=CesJXAQZkmF_o9dNKeZmeu_44ysDK4Lj8uHRwAVcv4w,13086
 flashforge/api/controls/job_control.py,sha256=-DglR97DWBzl45mmqGkauYpUM_I-C0tXrbp9SKPYOVs,21814
 flashforge/api/controls/temp_control.py,sha256=TGkX63WHygVA9DeYfLARbktZ0o-bYX6MNyYOX6V_RB4,3034
 flashforge/api/filament/__init__.py,sha256=isT2dl0hzUS0xMTXMm4Tip0GTG1gCsm8LKWa9xPu4Y8,104
@@ -19,9 +19,9 @@ flashforge/api/network/__init__.py,sha256=G5fBoAlq-NQPDkWp579mFIqsj0v7B1Lb2TAzO6
 flashforge/api/network/fnet_code.py,sha256=BR2niVKKk4ZfXtizUDIMXzDhlCxPHzqWg5AQQIcoj3g,402
 flashforge/api/network/utils.py,sha256=hh-9SGI61ii0CRkLVnAp-Eq2E0a9PAKPyNLMGaYPNsI,2065
 flashforge/discovery/__init__.py,sha256=G0WiP70EhfHdjXR1RNlv6xjhyHOdo-HWyOm9J0ds4SM,828
-flashforge/discovery/discovery.py,sha256=lNyD-nDDdYKV23kUOQpuA5ZX4r9T7_Zk3SzXoUwgMPI,26163
+flashforge/discovery/discovery.py,sha256=ka75bIXnn2a14DEpzpmJxUGajF-tpLHUR2EHA88NIGc,26073
 flashforge/models/__init__.py,sha256=MNpnXdS6Yah5kSwBB7cbA2Hd-8azffE62pgUrrKSZk4,984
-flashforge/models/machine_info.py,sha256=t7TJk03PG8kf-g6XnWd3NiWuCVLY1Wuod-aI4zdXu4Y,14976
+flashforge/models/machine_info.py,sha256=HDOzXi9RaYgFPkqtYe8dLyM5c8ZUCFfZ_uefGIj1VYM,15003
 flashforge/models/responses.py,sha256=befMeXAc7XXiK7emF8Ep2cd1GuhZ-zyYPbbPqS2lcQI,7214
 flashforge/tcp/__init__.py,sha256=hpnqoWHeRtTwJPzdsVlwGt1njKbAkrgIHKADkLSIRec,1317
 flashforge/tcp/a3_client.py,sha256=a1jdDcBnTSNrzJFKTuVV13fSLbZmxKEZ94n3cGf3wOA,15603
@@ -39,8 +39,8 @@ flashforge/tcp/parsers/print_status.py,sha256=4q9ZlJfO0c7_t1o15tgxbguMxpDjEW9pMy
 flashforge/tcp/parsers/printer_info.py,sha256=QY6LECfcOhVHSIdsvQZwJago0OjXroUwiX0H-uQaH2A,5411
 flashforge/tcp/parsers/temp_info.py,sha256=9Waf68tt-4QBcChyUwfMHDwWdIzM4mmDpZAKeAzklgs,7908
 flashforge/tcp/parsers/thumbnail_info.py,sha256=ZmxdEbVFOzqR1AfhXXZyjENVI66BdRdE7Q8LQ8an9FY,10201
-flashforge_python_api-1.2.1.dist-info/METADATA,sha256=eMFS4ENMi13-7DADIKwTNTSQyBoFjHrGrLMb_gw4dZw,4194
-flashforge_python_api-1.2.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-flashforge_python_api-1.2.1.dist-info/entry_points.txt,sha256=AkOxlsLvQ7cvMLxn7tlzfKp_DCH2hXhbVceHIXxawpU,66
-flashforge_python_api-1.2.1.dist-info/licenses/LICENSE,sha256=-cTA-hrmvlb3pqlQrBZQXUnKayhUjsLJMPb7TD91frM,1067
-flashforge_python_api-1.2.1.dist-info/RECORD,,
+flashforge_python_api-1.2.3.dist-info/METADATA,sha256=8Gji1l3nedh4E53ZM5AE7wkP0JoPBGOucAoBIK_yEO4,4787
+flashforge_python_api-1.2.3.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+flashforge_python_api-1.2.3.dist-info/entry_points.txt,sha256=AkOxlsLvQ7cvMLxn7tlzfKp_DCH2hXhbVceHIXxawpU,66
+flashforge_python_api-1.2.3.dist-info/licenses/LICENSE,sha256=-cTA-hrmvlb3pqlQrBZQXUnKayhUjsLJMPb7TD91frM,1067
+flashforge_python_api-1.2.3.dist-info/RECORD,,