Merge branch 'main' into chore/format-conftest-with-black

Signed-off-by: Subhra Sameer Dash <[email protected]>

Author: Subhrasameerdash

.github/scripts/bot-next-issue-recommendation.js

@@ -69,23 +69,41 @@ module.exports = async ({ github, context, core }) => {
     }
 
     let recommendedIssues = [];
+    let recommendedLabel = null;
+    let isFallback = false;
+    let recommendationScope = 'repo';
 
-    if (difficultyLevels.goodFirstIssue) {
-      // Recommend beginner issues first, then Good First Issues
-      recommendedIssues = await searchIssues(github, core, repoOwner, repoName, 'beginner');
-      if (recommendedIssues.length === 0) {
-        recommendedIssues = await searchIssues(github, core, repoOwner, repoName, 'good first issue');
-      }
-    } else if (difficultyLevels.beginner) {
-      // Recommend beginner or Good First Issues
-      recommendedIssues = await searchIssues(github, core, repoOwner, repoName, 'beginner');
-      if (recommendedIssues.length === 0) {
-        recommendedIssues = await searchIssues(github, core, repoOwner, repoName, 'good first issue');
-      }
+    recommendedIssues = await searchIssues(github, core, repoOwner, repoName, 'beginner');
+    recommendedLabel = 'Beginner';
+
+    if (recommendedIssues.length === 0) {
+      isFallback = true;
+      recommendedIssues = await searchIssues(github, core, repoOwner, repoName, 'good first issue');
+      recommendedLabel = 'Good First Issue';
+    }
+
+    if (recommendedIssues.length === 0) {
+      recommendationScope = 'org';
+      recommendedLabel = 'Good First Issue';
+      recommendedIssues = await github.rest.search.issuesAndPullRequests({
+        q: `org:hiero-ledger type:issue state:open label:"good first issue" no:assignee`,
+        per_page: 6,
+      }).then(res => res.data.items);
     }
+
+    // Remove the issue they just solved
+    recommendedIssues = recommendedIssues.filter(i => i.number !== issueNumber);
 
     // Generate and post comment
-    await generateAndPostComment(github, context, core, prNumber, recommendedIssues, difficultyLevels.goodFirstIssue);
+    const completedLabel = difficultyLevels.goodFirstIssue ? 'Good First Issue' : 'Beginner';
+    const completedLabelText = completedLabel === 'Beginner' ? 'Beginner issue' : completedLabel;
+    const recommendationMeta = {
+      completedLabelText,
+      recommendedLabel,
+      isFallback,
+      recommendationScope,
+    };
+    await generateAndPostComment(github, context, core, prNumber, recommendedIssues, recommendationMeta);
 
   } catch (error) {
     core.setFailed(`Error processing issue #${issueNumber}: ${error.message}`);
@@ -94,12 +112,12 @@ module.exports = async ({ github, context, core }) => {
 
 async function searchIssues(github, core, owner, repo, label) {
   try {
-    const query = `repo:${owner}/${repo} is:issue is:open label:"${label}" no:assignee`;
+    const query = `repo:${owner}/${repo} type:issue state:open label:"${label}" no:assignee`;
     core.info(`Searching for issues with query: ${query}`);
 
     const { data: searchResult } = await github.rest.search.issuesAndPullRequests({
       q: query,
-      per_page: 5,
+      per_page: 6,
     });
 
     core.info(`Found ${searchResult.items.length} issues with label "${label}"`);
@@ -110,15 +128,21 @@ async function searchIssues(github, core, owner, repo, label) {
   }
 }
 
-async function generateAndPostComment(github, context, core, prNumber, recommendedIssues, wasGoodFirstIssue) {
+async function generateAndPostComment(github, context, core, prNumber, recommendedIssues, { completedLabelText, recommendedLabel, isFallback, recommendationScope }) {
   const marker = '<!-- next-issue-bot-marker -->';
 
   // Build comment content
-  let comment = `${marker}\n\n🎉 **Congratulations on completing a beginner/Good First Issue!**\n\n`;
+  let comment = `${marker}\n\n🎉 **Nice work completing a ${completedLabelText}!**\n\n`;
   comment += `Thank you for your contribution to the Hiero Python SDK! We're excited to have you as part of our community.\n\n`;
 
   if (recommendedIssues.length > 0) {
-    comment += `Here are some ${wasGoodFirstIssue ? 'beginner-level' : 'similar'} issues you might be interested in working on next:\n\n`;
+    if (recommendationScope === 'org') {
+      comment += `Here are some **Good First Issues across the Hiero organization** you might be interested in working on next:\n\n`;
+    } else if (isFallback) {
+      comment += `Here are some **${recommendedLabel}** issues at a similar level you might be interested in working on next:\n\n`;
+    } else {
+      comment += `Here are some issues labeled **${recommendedLabel}** you might be interested in working on next:\n\n`;
+    }
 
     // Sanitize title: escape markdown link syntax and special characters
     const sanitizeTitle = (title) => title
@@ -143,8 +167,11 @@ async function generateAndPostComment(github, context, core, prNumber, recommend
       }
     });
   } else {
-    comment += `There are currently no open ${wasGoodFirstIssue ? 'beginner' : 'similar'} issues in this repository. \n\n`;
-    comment += `You can check out good first issues across the entire Hiero organization: [Hiero Good First Issues](https://github.com/issues?q=is%3Aopen+is%3Aissue+org%3Ahiero-ledger+archived%3Afalse+label%3A%22good+first+issue%22+)\n\n`;
+    comment += `There are currently no open issues available at or near the ${completedLabelText} level in this repository.\n\n`;
+    const orgLabel = recommendedLabel === 'Beginner' ? 'beginner' : 'good first issue';
+    const orgLabelQuery = encodeURIComponent(`label:"${orgLabel}"`);
+    comment += `You can check out ${recommendedLabel.toLowerCase()} issues across the entire Hiero organization: ` +
+      `[Hiero ${recommendedLabel} Issues](https://github.com/issues?q=org%3Ahiero-ledger+type%3Aissue+state%3Aopen+${orgLabelQuery})\n\n`;
   }
 
   comment += `🌟 **Stay connected with the project:**\n`;

CHANGELOG.md

@@ -11,13 +11,15 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 ### Tests
 
 - Formatted `tests/unit/conftest.py` with black for code style consistency. (#1522)
+- format `black tests/unit/nft_id_test.py` with Black.(#1544)
 - Format `tests/unit/executable_test.py` with Black.(#1530)
 - Format `tests/unit/hedera_trust_manager_test.py` with Black for consistent code style (#1539)
 - Format tests/unit/logger_test.py with black for code style consistency (#1541)
 - Format `tests/unit/batch_transaction_test.py` with Black.(`#1520`)
 - Style: formatted `tests/unit/prng_transaction_test.py` with black (#1546)
 - Formatted contract unit tests with black for consistent style. (#1523)
 - Format account test files with Black (#1519)
+- Format `tests/unit/node*.py` with Black for consistent code style (#1545)
 - Improve unit test coverage for Hbar, including edge cases, validation, comparisons, and hashing. (#1483)
 - Standardize formatting of evm_address_test.py using Black for improved consistency and readability (#1529)
 - Formatted unit test files using Black.
@@ -133,7 +135,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Added dry-run support and refactored `.github/workflows/bot-workflows.yml` to use dedicated script `.github/scripts/bot-workflows.js` for improved maintainability and testability. (`#1288`)
 
 ### Changed
-
+- Refactored `examples/consensus/topic_create_transaction.py` to use `Client.from_env()` (#1611)
 - Updated GitHub Actions setup-node action to v6.2.0.
 - chore: format tests/unit/mock_server.py with black (#1542)
 - Updated actions/checkout to v6.0.1 and actions/github-script v8.0.0 in bot-next-issue-recommendation workflow (#1586)
@@ -218,10 +220,9 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Enhance TopicInfo `__str__` method and tests with additional coverage, and update the format_key function in `key_format.py` to handle objects with a \_to_proto method.
 - Update changelog workflow to trigger automatically on pull requests instead of manual dispatch (#1567)
 - Formatted key-related unit test files (`key_utils_test.py`, `test_key_format.py`, `test_key_list.py`) using the black formatter
-- chore: update maintainer guidelines link in MAINTAINERS.md (#1605)
 
 ### Fixed
-
+- Fix the next-issue recommendation bot to post the correct issue recommendation comment. (#1593)
 - Ensured that the GFI assignment bot skips posting `/assign` reminders for repository collaborators to avoid unnecessary notifications.(#1568).
 - Reduced notification spam by skipping the entire advanced qualification job for non-advanced issues and irrelevant events (#1517)
 - Aligned token freeze example filename references and improved error handling by catching broader exceptions with clearer messages. (#1412)

examples/consensus/topic_create_transaction.py

@@ -2,56 +2,17 @@
 uv run examples/consensus/topic_create_transaction.py
 python examples/consensus/topic_create_transaction.py
 """
+from hiero_sdk_python import Client, TopicCreateTransaction, ResponseCode, PrivateKey
 
-import os
-import sys
-from typing import Tuple
-from dotenv import load_dotenv
-
-from hiero_sdk_python import (
-    Client,
-    AccountId,
-    PrivateKey,
-    TopicCreateTransaction,
-    Network,
-)
-
-# Load environment variables from .env file
-load_dotenv()
-network_name = os.getenv("NETWORK", "testnet").lower()
-
-
-def setup_client() -> Tuple[Client, PrivateKey]:
+def setup_client():
     """
-    Sets up and configures the Hiero client for the testnet.
-    Reads OPERATOR_ID and OPERATOR_KEY from environment variables.
+    Sets up and configures the Hiero client.
+    Reads OPERATOR_ID and OPERATOR_KEY from environment variables via Client.from_env().
     """
-    network = Network(network_name)
-    print(f"Connecting to Hedera {network_name} network!")
-    client = Client(network)
-
-    operator_id_str = os.getenv("OPERATOR_ID")
-    operator_key_str = os.getenv("OPERATOR_KEY")
-
-    # Check if the environment variables are loaded correctly
-    if not operator_id_str or not operator_key_str:
-        print("Error: OPERATOR_ID or OPERATOR_KEY not found in environment.")
-        print("Please create a .env file in the project's root directory with:")
-        print("\nOPERATOR_ID=your_id_here")
-        print("OPERATOR_KEY=your_key_here\n")
-        sys.exit(1)
-
-    try:
-        operator_id = AccountId.from_string(operator_id_str)
-        operator_key = PrivateKey.from_string(operator_key_str)
-    except (TypeError, ValueError) as e:
-        print(f"Error: Invalid OPERATOR_ID or OPERATOR_KEY format: {e}")
-        sys.exit(1)
-
-    client.set_operator(operator_id, operator_key)
+    client = Client.from_env()
+    print(f"Network: {client.network.network}")
     print(f"Client set up with operator id {client.operator_account_id}")
-    return client, operator_key
-
+    return client, client.operator_private_key
 
 def create_topic(client: Client, operator_key: PrivateKey):
     """
@@ -64,18 +25,18 @@ def create_topic(client: Client, operator_key: PrivateKey):
         .freeze_with(client)
         .sign(operator_key)
     )
-
     try:
         receipt = transaction.execute(client)
-        if receipt and receipt.topic_id:
-            print(f"Success! Topic created with ID: {receipt.topic_id}")
-        else:
+        if receipt.status != ResponseCode.SUCCESS:
+            print(f"Topic creation failed: {ResponseCode(receipt.status).name}")
+            raise SystemExit(1)
+        if not receipt.topic_id:
             print("Topic creation failed: Topic ID not returned in receipt.")
-            sys.exit(1)
+            raise SystemExit(1)
+        print(f"Success! Topic created with ID: {receipt.topic_id}")
     except Exception as e:
         print(f"Topic creation failed: {str(e)}")
-        sys.exit(1)
-
+        raise SystemExit(1)
 
 def main():
     """
@@ -84,6 +45,5 @@ def main():
     client, operator_key = setup_client()
     create_topic(client, operator_key)
 
-
 if __name__ == "__main__":
-    main()
+    main()

tests/unit/nft_id_test.py

@@ -5,42 +5,54 @@
 from hiero_sdk_python.hapi.services import basic_types_pb2
 
 pytestmark = pytest.mark.unit
+
+
 def test_nft_id():
-    #return true
+    # return true
     nftid_constructor_tokenid = TokenId(shard=0, realm=1, num=2)
-    nftid_constructor_test = NftId(token_id=nftid_constructor_tokenid, serial_number=1234)
+    nftid_constructor_test = NftId(
+        token_id=nftid_constructor_tokenid, serial_number=1234
+    )
 
     assert str(nftid_constructor_test) == "0.1.2/1234"
-    assert repr(nftid_constructor_test) == "NftId(token_id=TokenId(shard=0, realm=1, num=2, checksum=None), serial_number=1234)"
+    assert (
+        repr(nftid_constructor_test)
+        == "NftId(token_id=TokenId(shard=0, realm=1, num=2, checksum=None), serial_number=1234)"
+    )
     assert nftid_constructor_test._to_proto().__eq__(
         basic_types_pb2.NftID(
             token_ID=basic_types_pb2.TokenID(shardNum=0, realmNum=1, tokenNum=2),
-            serial_number=1234)
+            serial_number=1234,
+        )
     )
     assert NftId._from_proto(
         nft_id_proto=basic_types_pb2.NftID(
             token_ID=basic_types_pb2.TokenID(shardNum=0, realmNum=1, tokenNum=2),
-            serial_number=1234
+            serial_number=1234,
         )
     ).__eq__(nftid_constructor_test)
 
-    #return false
+    # return false
     with pytest.raises(TypeError):
         nftid_failed_constructor_tokenid1 = TokenId(shard=0, realm=1, num="A")
     with pytest.raises(TypeError):
         nftid_failed_constructor_tokenid = TokenId(shard=0, realm="b", num=1)
     with pytest.raises(TypeError):
-        nftid_failed_constructor_tokenid = TokenId(shard='c', realm=1, num=1)
+        nftid_failed_constructor_tokenid = TokenId(shard="c", realm=1, num=1)
     with pytest.raises(TypeError):
         nftid_failed_constructor = NftId(token_id=None, serial_number=1234)
     with pytest.raises(TypeError):
         nftid_failed_constructor = NftId(token_id=1234, serial_number=1234)
     with pytest.raises(TypeError):
-        nftid_failed_constructor = NftId(token_id=TokenId(shard=0, realm=1, num=0), serial_number="asdfasdfasdf")
+        nftid_failed_constructor = NftId(
+            token_id=TokenId(shard=0, realm=1, num=0), serial_number="asdfasdfasdf"
+        )
     with pytest.raises(ValueError):
-        nftid_failed_constructor = NftId(token_id=TokenId(shard=0, realm=1, num=0), serial_number=-1234)
+        nftid_failed_constructor = NftId(
+            token_id=TokenId(shard=0, realm=1, num=0), serial_number=-1234
+        )
 
-    #don't need to test protobuf cause its final and type checked
+    # don't need to test protobuf cause its final and type checked
     with pytest.raises(ValueError):
         NftId.from_string("")
 
@@ -66,6 +78,7 @@ def test_nft_id():
     with pytest.raises(ValueError):
         NftId.from_string(fail_str)
 
+
 def test_get_nft_id_with_checksum(mock_client):
     """Should return string with checksum when ledger id is provided."""
     client = mock_client
@@ -74,4 +87,4 @@ def test_get_nft_id_with_checksum(mock_client):
     token_id = TokenId.from_string("0.0.1")
     nft_id = NftId(token_id, 1)
 
-    assert nft_id.to_string_with_checksum(client) == "0.0.1-dfkxr/1"
+    assert nft_id.to_string_with_checksum(client) == "0.0.1-dfkxr/1"

tests/unit/node_tls_test.py

@@ -255,6 +255,7 @@ def test_node_validate_tls_certificate_no_address_book():
 @patch("grpc.insecure_channel")
 def test_node_get_channel_secure(
     _mock_insecure, mock_secure, mock_node_with_address_book
+    mock_insecure, mock_secure, mock_node_with_address_book
 ):
     """Test channel creation for secure connection."""
     node = mock_node_with_address_book
@@ -280,6 +281,7 @@ def test_node_get_channel_secure(
 @patch("grpc.insecure_channel")
 def test_node_get_channel_insecure(
     _mock_insecure, mock_secure, mock_node_without_address_book
+    mock_insecure, mock_secure, mock_node_without_address_book
 ):
     """Test channel creation for insecure connection."""
     node = mock_node_without_address_book
@@ -290,6 +292,11 @@ def test_node_get_channel_insecure(
     channel = node._get_channel()
 
     _mock_insecure.assert_called_once()
+    mock_insecure.return_value = mock_channel
+
+    channel = node._get_channel()
+
+    mock_insecure.assert_called_once()
     mock_secure.assert_not_called()
     assert channel is not None
 
@@ -298,6 +305,7 @@ def test_node_get_channel_insecure(
 @patch("grpc.insecure_channel")
 def test_node_get_channel_reuses_existing(
     __mock_insecure, mock_secure, mock_node_with_address_book
+    mock_insecure, mock_secure, mock_node_with_address_book
 ):
     """Test that channel is reused when already created."""
     node = mock_node_with_address_book
@@ -353,6 +361,9 @@ def test_secure_connect_raise_error_if_no_certificate_is_available(
     node = mock_node_without_address_book
     node._apply_transport_security(enabled=True)
     with pytest.raises(ValueError, match=r"No certificate available\."):
+    node._apply_transport_security(True)
+
+    with pytest.raises(ValueError, match="No certificate available."):
         node._get_channel()