not1mm 25.5.26__py3-none-any.whl → 25.5.31__py3-none-any.whl

not1mm/data/new_contest.ui

@@ -362,6 +362,11 @@
        <string>ES OPEN</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>ES FIELD DAY</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>HELVETIA</string>

not1mm/lib/database.py

@@ -1234,77 +1234,45 @@ class DataBase:
         except sqlite3.OperationalError as exception:
             logger.debug("%s", exception)
             return {}
-
-    def exec_sql(self, query: str) -> dict:
+        
+    def exec_sql_params_mult(self, query: str, params=None) -> dict:
         """Exec one off queries returning one dict"""
         try:
             with sqlite3.connect(self.database) as conn:
                 conn.row_factory = self.row_factory
                 cursor = conn.cursor()
-                cursor.execute(query)
+                cursor.execute(query, params)
                 return cursor.fetchone()
         except sqlite3.OperationalError as exception:
             logger.debug("%s", exception)
             return {}
 
-    def exec_sql_mult(self, query: str) -> list:
-        """Exec one off queries returning list of dicts"""
+    def exec_sql(self, query: str) -> dict:
+        """Exec one off queries returning one dict"""
         try:
             with sqlite3.connect(self.database) as conn:
                 conn.row_factory = self.row_factory
                 cursor = conn.cursor()
                 cursor.execute(query)
-                return cursor.fetchall()
-        except sqlite3.OperationalError as exception:
-            logger.debug("%s", exception)
-            return []
-
-    def check_dupe_on_period_1_mode(
-        self, call, band, mode, contest_start_time, contest_time_period_1
-    ) -> dict:
-        """Checks if a call is dupe on band/mode"""
-        try:
-            with sqlite3.connect(self.database) as conn:
-                conn.row_factory = self.row_factory
-                cursor = conn.cursor()
-                cursor.execute(
-                    f"select count(*) as isdupe from dxlog where Call = '{call}' and Mode = '{mode}' and Band = '{band}' and ContestNR = {self.current_contest} AND TS >= '{contest_start_time}' AND TS <= '{contest_time_period_1}';"
-                )
                 return cursor.fetchone()
         except sqlite3.OperationalError as exception:
             logger.debug("%s", exception)
             return {}
 
-    def check_dupe_on_period_2_mode(
-        self,
-        call,
-        band,
-        mode,
-        contest_start_time,
-        contest_time_period_1,
-        contest_time_period_2,
-    ) -> dict:
-        """Checks if a call is dupe on band/mode"""
+    def exec_sql_mult(self, query: str) -> list:
+        """Exec one off queries returning list of dicts"""
         try:
             with sqlite3.connect(self.database) as conn:
                 conn.row_factory = self.row_factory
                 cursor = conn.cursor()
-                cursor.execute(
-                    f"select count(*) as isdupe from dxlog where Call = '{call}' and Mode = '{mode}' and Band = '{band}' and ContestNR = {self.current_contest} AND TS >= '{contest_time_period_1}' AND TS <= '{contest_time_period_2}';"
-                )
-                return cursor.fetchone()
+                cursor.execute(query)
+                return cursor.fetchall()
         except sqlite3.OperationalError as exception:
             logger.debug("%s", exception)
-            return {}
+            return []
 
-    def check_dupe_on_period_3_mode(
-        self,
-        call,
-        band,
-        mode,
-        contest_start_time,
-        contest_time_period_2,
-        contest_time_period_3,
+    def check_dupe_on_period_mode(
+        self, call, band, mode, period_1, period_2
     ) -> dict:
         """Checks if a call is dupe on band/mode"""
         try:
@@ -1312,9 +1280,10 @@ class DataBase:
                 conn.row_factory = self.row_factory
                 cursor = conn.cursor()
                 cursor.execute(
-                    f"select count(*) as isdupe from dxlog where Call = '{call}' and Mode = '{mode}' and Band = '{band}' and ContestNR = {self.current_contest} AND TS >= '{contest_time_period_2}' AND TS <= '{contest_time_period_3}';"
+                    f"select count(*) as isdupe from dxlog where Call = '{call}' and Mode = '{mode}' and Band = '{band}' and ContestNR = {self.current_contest} AND TS >= '{period_1}' AND TS <= '{period_2}';"
                 )
                 return cursor.fetchone()
         except sqlite3.OperationalError as exception:
             logger.debug("%s", exception)
             return {}
+

not1mm/lib/edit_station.py

@@ -35,11 +35,11 @@ class EditStation(QtWidgets.QDialog):
     def call_changed(self):
         """Populate zones"""
         results = self.cty_lookup()
-        if results:
-            for result in results.items():
-                self.CQZone.setText(str(result[1].get("cq", "")))
-                self.ITUZone.setText(str(result[1].get("itu", "")))
-                self.Country.setText(str(result[1].get("entity", "")))
+        if results is not None:
+            result = results.get(next(iter(results)))
+            self.CQZone.setText(str(result.get("cq", "")))
+            self.ITUZone.setText(str(result.get("itu", "")))
+            self.Country.setText(str(result.get("entity", "")))
 
     def cty_lookup(self):
         """Lookup callsign in cty.dat file"""

not1mm/lib/super_check_partial.py

@@ -10,6 +10,8 @@ import requests
 from rapidfuzz import fuzz
 from rapidfuzz import process
 
+from functools import lru_cache
+
 MASTER_SCP_URL = "https://www.supercheckpartial.com/MASTER.SCP"
 
 if __name__ == "__main__":
@@ -27,6 +29,15 @@ def prefer_prefix_score(query: str, candidate: str, **kwargs) -> int:
         score = 0.8 * score
     return int(round(score))
 
+@lru_cache(maxsize=1024)  # You can adjust this as needed
+def prefix_bias_score(query: str, candidate: str, **kwargs) -> int:
+    """Return a score based on the quality of the match."""
+    score = fuzz.QRatio(query, candidate)
+
+    if candidate[:len(query)] == query:
+        return score
+    return int(score*0.8)
+
 
 class SCP:
     """Super check partial"""
@@ -53,7 +64,7 @@ class SCP:
     def read_scp(self):
         """
         Reads in a list of known contesters into an internal dictionary
-        """
+        """         
         try:
             with open(
                 Path(self.app_data_path) / "MASTER.SCP", "r", encoding="utf-8"
@@ -63,17 +74,22 @@ class SCP:
         except IOError as exception:
             logger.critical("read_scp: read error: %s", exception)
 
+
     def super_check(self, acall: str) -> list:
-        """
-        Performs a supercheck partial on the callsign entered in the field.
-        """
+
         if len(acall) > 1:
-            return list(
-                [
-                    x[0]
-                    for x in process.extract(
-                        acall, self.scp, scorer=prefer_prefix_score, limit=20
-                    )
-                ]
+            # Compute similarity scores between `acall` and all items in `self.scp`
+            similarity_scores = process.cdist(
+                [acall], self.scp, scorer=prefix_bias_score, workers=-1,score_cutoff=60
             )
-        return []
+
+            # Sort and retrieve the top 20 matches with their indices
+            top_matches = sorted(
+                enumerate(similarity_scores[0]), key=lambda x: -x[1]
+            )[:20]
+
+            # Extract the corresponding strings from `self.scp`
+            matches = [self.scp[idx] for idx, score in top_matches if score > 0]
+
+            return matches
+        return []

not1mm/lib/version.py

@@ -1,4 +1,3 @@
 """It's the version"""
 
-__version__ = "25.5.26"
-
+__version__ = "25.5.31"

not1mm/plugins/ari_dx.py

@@ -1,5 +1,11 @@
 """ARI International DX Contest"""
 
+# pylint: disable=invalid-name, c-extension-no-member, unused-import, line-too-long
+# pyright: ignore[reportUndefinedVariable]
+# pylance: disable=reportUndefinedVariable
+# ruff: noqa: F821
+# ruff: noqa: F401
+
 # Status:	            Active
 # Geographic Focus:     Worldwide
 # Participation:        Worldwide
@@ -30,8 +36,6 @@
 # Cabrillo name:	    ARI-DX
 
 
-# pylint: disable=invalid-name, c-extension-no-member, unused-import, line-too-long
-
 import datetime
 import logging
 import platform
@@ -40,6 +44,7 @@ from pathlib import Path
 
 from PyQt6 import QtWidgets
 
+from not1mm.lib.ham_utility import get_logged_band
 from not1mm.lib.plugin_common import gen_adif
 from not1mm.lib.version import __version__
 
@@ -151,19 +156,19 @@ def points(self) -> int:
         return 0
 
     result = self.cty_lookup(self.station.get("Call", ""))
-    if result:
-        for item in result.items():
-            mycountry = item[1].get("primary_pfx", "")
-            myentity = item[1].get("entity", "")
-            mycontinent = item[1].get("continent", "")
+    if result is not None:
+        item = result.get(next(iter(result)))
+        mycountry = item.get("primary_pfx", "")
+        # myentity = item.get("entity", "")
+        mycontinent = item.get("continent", "")
 
     result = self.cty_lookup(self.contact.get("Call", ""))
-
-    if result:
-        for item in result.items():
-            hiscountry = item[1].get("primary_pfx", "")
-            hisentity = item[1].get("entity", "")
-            hiscontinent = item[1].get("continent", "")
+    print(f"{result=}")
+    if result is not None:
+        item = result.get(next(iter(result)))
+        hiscountry = item.get("primary_pfx", "")
+        # hisentity = item.get("entity", "")
+        hiscontinent = item.get("continent", "")
 
     _points = 0
 
@@ -425,7 +430,7 @@ def cabrillo(self, file_encoding):
                     f"{str(contact.get('SentNr', '')).upper().ljust(6)} "
                     f"{contact.get('Call', '').ljust(13)} "
                     f"{str(contact.get('RCV', '')).ljust(3)} "
-                    f"{str(contact.get('Exchange1', '')).upper().ljust(6)}",
+                    f"{str(contact.get('NR', '')).upper().ljust(6)}",
                     "\r\n",
                     file_descriptor,
                     file_encoding,
@@ -556,3 +561,129 @@ def check_call_history(self):
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":
             self.other_2.setText(f"{result.get('Sect', '')}")
+
+
+def set_self(the_outie):
+    """..."""
+    globals()["ALTEREGO"] = the_outie
+
+
+def ft8_handler(the_packet: dict):
+    print(f"{the_packet=}")
+    """Process FT8 QSO packets
+    FT8
+    {
+        'CALL': 'KE0OG',
+        'GRIDSQUARE': 'DM10AT',
+        'MODE': 'FT8',
+        'RST_SENT': '',
+        'RST_RCVD': '',
+        'QSO_DATE': '20210329',
+        'TIME_ON': '183213',
+        'QSO_DATE_OFF': '20210329',
+        'TIME_OFF': '183213',
+        'BAND': '20M',
+        'FREQ': '14.074754',
+        'STATION_CALLSIGN': 'K6GTE',
+        'MY_GRIDSQUARE': 'DM13AT',
+        'CONTEST_ID': 'ARRL-FIELD-DAY',
+        'SRX_STRING': '1D UT',
+        'CLASS': '1D',
+        'ARRL_SECT': 'UT'
+    }
+    FlDigi
+    {
+        'CALL': 'K5TUS', 
+        'MODE': 'RTTY', 
+        'FREQ': '14.068415', 
+        'BAND': '20M', 
+        'QSO_DATE': '20250103', 
+        'TIME_ON': '2359', 
+        'QSO_DATE_OFF': '20250103', 
+        'TIME_OFF': '2359', 
+        'NAME': '', 
+        'QTH': '', 
+        'STATE': 'ORG', 
+        'VE_PROV': '', 
+        'COUNTRY': 'USA', 
+        'RST_SENT': '599', 
+        'RST_RCVD': '599', 
+        'TX_PWR': '0', 
+        'CNTY': '', 
+        'DXCC': '', 
+        'CQZ': '5', 
+        'IOTA': '', 
+        'CONT': '', 
+        'ITUZ': '', 
+        'GRIDSQUARE': '', 
+        'QSLRDATE': '', 
+        'QSLSDATE': '', 
+        'EQSLRDATE': '', 
+        'EQSLSDATE': '', 
+        'LOTWRDATE': '', 
+        'LOTWSDATE': '', 
+        'QSL_VIA': '', 
+        'NOTES': '', 
+        'SRX': '', 
+        'STX': '000', 
+        'SRX_STRING': '', 
+        'STX_STRING': 'CA', 
+
+
+        'SRX': '666', 
+        'STX': '000', 
+        'SRX_STRING': '', 
+        'STX_STRING': 'CA',
+
+        'SRX': '004', 'STX': '000', 'SRX_STRING': '', 'STX_STRING': '#',
+
+        'CLASS': '', 
+        'ARRL_SECT': '', 
+        'OPERATOR': 'K6GTE', 
+        'STATION_CALLSIGN': 'K6GTE', 
+        'MY_GRIDSQUARE': 'DM13AT', 
+        'MY_CITY': 'ANAHEIM, CA', 
+        'CHECK': '', 
+        'AGE': '', 
+        'TEN_TEN': '', 
+        'CWSS_PREC': '', 
+        'CWSS_SECTION': '', 
+        'CWSS_SERNO': '', 
+        'CWSS_CHK': ''
+    }
+
+    """
+    logger.debug(f"{the_packet=}")
+    if ALTEREGO is not None:  # type: ignore
+        ALTEREGO.callsign.setText(the_packet.get("CALL"))  # type: ignore
+        ALTEREGO.contact["Call"] = the_packet.get("CALL", "")  # type: ignore
+        ALTEREGO.contact["SNT"] = the_packet.get("RST_SENT", "599")  # type: ignore
+        ALTEREGO.contact["RCV"] = the_packet.get("RST_RCVD", "599")  # type: ignore
+
+        sent_string = the_packet.get("STX_STRING", "")
+        if sent_string != "":
+            ALTEREGO.contact["SentNr"] = sent_string  # type: ignore
+            ALTEREGO.other_1.setText(str(sent_string))  # type: ignore
+        else:
+            ALTEREGO.contact["SentNr"] = the_packet.get("STX", "000")  # type: ignore
+            ALTEREGO.other_1.setText(str(the_packet.get("STX", "000")))  # type: ignore
+
+        rx_string = the_packet.get("STATE", "")
+        if rx_string != "":
+            ALTEREGO.contact["NR"] = rx_string  # type: ignore
+            ALTEREGO.other_2.setText(str(rx_string))  # type: ignore
+        else:
+            ALTEREGO.contact["NR"] = the_packet.get("SRX", "000")  # type: ignore
+            ALTEREGO.other_2.setText(str(the_packet.get("SRX", "000")))  # type: ignore
+
+        ALTEREGO.contact["Mode"] = the_packet.get("MODE", "ERR")  # type: ignore
+        ALTEREGO.contact["Freq"] = round(float(the_packet.get("FREQ", "0.0")) * 1000, 2)  # type: ignore
+        ALTEREGO.contact["QSXFreq"] = round(  # type: ignore
+            float(the_packet.get("FREQ", "0.0")) * 1000, 2
+        )
+        ALTEREGO.contact["Band"] = get_logged_band(  # type: ignore
+            str(int(float(the_packet.get("FREQ", "0.0")) * 1000000))
+        )
+        logger.debug(f"{ALTEREGO.contact=}")  # type: ignore
+
+        ALTEREGO.save_contact()  # type: ignore

not1mm/plugins/arrl_160m.py

@@ -112,18 +112,18 @@ def points(self):
     if dupe_check.get("isdupe", 0) > 0:
         return 0
     result = self.cty_lookup(self.station.get("Call", ""))
-    if result:
-        for item in result.items():
-            mypfx = item[1].get("primary_pfx", "")
-            # mycountry = item[1].get("entity", "")
-            # mycontinent = item[1].get("continent", "")
+    if result is not None:
+        item = result.get(next(iter(result)))
+        mypfx = item.get("primary_pfx", "")
+        # mycountry = item[1].get("entity", "")
+        # mycontinent = item[1].get("continent", "")
 
     result = self.cty_lookup(self.contact.get("Call", ""))
-    if result:
-        for item in result.items():
-            pfx = item[1].get("primary_pfx", "")
-            # entity = item[1].get("entity", "")
-            # continent = item[1].get("continent", "")
+    if result is not None:
+        item = result.get(next(iter(result)))
+        pfx = item.get("primary_pfx", "")
+        # entity = item[1].get("entity", "")
+        # continent = item[1].get("continent", "")
 
     # Both in same country
 
@@ -221,10 +221,10 @@ def calc_score(self):
 def can_claim_dxcc(self):
     """"""
     result = self.cty_lookup(self.station.get("Call", ""))
-    if result:
+    if result is not None:
         mypfx = ""
-        for item in result.items():
-            mypfx = item[1].get("primary_pfx", "")
+        item = result.get(next(iter(result)))
+        mypfx = item.get("primary_pfx", "")
         if mypfx in [
             "K",
             "KL",

not1mm/plugins/arrl_dx_cw.py

@@ -103,14 +103,14 @@ def prefill(self):
     #     self.other_2.setText(str(self.contact.get("ZN", "")))
     self.other_1.setText(str(self.contest_settings.get("SentExchange", 0)))
 
-    location = self.cty_lookup(self.station.get("Call", ""))
-    if location:
-        for item in location.items():
-            mycountry = item[1].get("primary_pfx", "")
-            if mycountry in ["K", "VE"]:
-                query = f"select count(*) as prefix_count from dxlog where Band={float(self.contact.get('Band', 0))} and CountryPrefix='{self.contact.get('CountryPrefix','')}' and ContestNR = {self.pref.get('contest', '1')} and points = 3;"
-            else:
-                query = f"select count(*) as prefix_count from dxlog where Band={float(self.contact.get('Band', 0))} and NR='{self.contact.get('NR','')}' and ContestNR = {self.pref.get('contest', '1')} and points = 3;"
+    result = self.cty_lookup(self.station.get("Call", ""))
+    if result is not None:
+        item = result.get(next(iter(result)))
+        mycountry = item.get("primary_pfx", "")
+        if mycountry in ["K", "VE"]:
+            query = f"select count(*) as prefix_count from dxlog where Band={float(self.contact.get('Band', 0))} and CountryPrefix='{self.contact.get('CountryPrefix','')}' and ContestNR = {self.pref.get('contest', '1')} and points = 3;"
+        else:
+            query = f"select count(*) as prefix_count from dxlog where Band={float(self.contact.get('Band', 0))} and NR='{self.contact.get('NR','')}' and ContestNR = {self.pref.get('contest', '1')} and points = 3;"
 
     result = self.database.exec_sql(query)
     count = result.get("prefix_count", 0)
@@ -127,20 +127,20 @@ def points(self):
         return 0
 
     result = self.cty_lookup(self.station.get("Call", ""))
-    if result:
-        for item in result.items():
-            mycountry = item[1].get("primary_pfx", "")
+    if result is not None:
+        item = result.get(next(iter(result)))
+        mycountry = item.get("primary_pfx", "")
     result = self.cty_lookup(self.contact.get("Call", ""))
-    if result:
-        for item in result.items():
-            entity = item[1].get("primary_pfx", "")
-            if mycountry in ["K", "VE"]:
-                if entity in ["K", "VE"]:
-                    return 0
-                return 3
+    if result is not None:
+        item = result.get(next(iter(result)))
+        entity = item.get("primary_pfx", "")
+        if mycountry in ["K", "VE"]:
             if entity in ["K", "VE"]:
-                return 3
-            return 0
+                return 0
+            return 3
+        if entity in ["K", "VE"]:
+            return 3
+        return 0
     return 0
 
 
@@ -148,17 +148,17 @@ def show_mults(self, rtc=None):
     """Return display string for mults"""
     location = self.cty_lookup(self.station.get("Call", ""))
     _country, _state = 0, 0
-    if location:
-        for item in location.items():
-            mycountry = item[1].get("primary_pfx", "")
-            if mycountry in ["K", "VE"]:
-                result = self.database.fetch_arrldx_country_band_count()
-                if result:
-                    _country = int(result.get("cb_count", 0))
-            else:
-                result = self.database.fetch_arrldx_state_prov_count()
-                if result:
-                    _state = int(result.get("cb_count", 0))
+    if location is not None:
+        item = location.get(next(iter(location)))
+        mycountry = item.get("primary_pfx", "")
+        if mycountry in ["K", "VE"]:
+            result = self.database.fetch_arrldx_country_band_count()
+            if result:
+                _country = int(result.get("cb_count", 0))
+        else:
+            result = self.database.fetch_arrldx_state_prov_count()
+            if result:
+                _state = int(result.get("cb_count", 0))
     if rtc is not None:
         return (_country, _state)
     return _country + _state
@@ -400,23 +400,23 @@ def recalculate_mults(self):
 
     for contact in all_contacts:
         time_stamp = contact.get("TS", "")
-        entity = contact.get("CountryPrefix", "")
+        # entity = contact.get("CountryPrefix", "")
         location = self.cty_lookup(self.station.get("Call", ""))
-        if location:
-            for item in location.items():
-                mycountry = item[1].get("primary_pfx", "")
-                if mycountry in ["K", "VE"]:
-                    query = (
-                        f"select count(*) as prefix_count from dxlog where TS < '{time_stamp}' "
-                        f"and CountryPrefix='{contact.get('CountryPrefix','')}' "
-                        f"and ContestNR = {self.pref.get('contest', '1')} and points = 3;"
-                    )
-                else:
-                    query = (
-                        f"select count(*) as prefix_count from dxlog where TS < '{time_stamp}' "
-                        f"and NR='{contact.get('NR','')}' "
-                        f"and ContestNR = {self.pref.get('contest', '1')} and points = 3;"
-                    )
+        if location is not None:
+            item = location.get(next(iter(location)))
+            mycountry = item.get("primary_pfx", "")
+            if mycountry in ["K", "VE"]:
+                query = (
+                    f"select count(*) as prefix_count from dxlog where TS < '{time_stamp}' "
+                    f"and CountryPrefix='{contact.get('CountryPrefix','')}' "
+                    f"and ContestNR = {self.pref.get('contest', '1')} and points = 3;"
+                )
+            else:
+                query = (
+                    f"select count(*) as prefix_count from dxlog where TS < '{time_stamp}' "
+                    f"and NR='{contact.get('NR','')}' "
+                    f"and ContestNR = {self.pref.get('contest', '1')} and points = 3;"
+                )
         result = self.database.exec_sql(query)
         logger.debug("contact: %s", contact)
         logger.debug("query: %s", query)