Make export selectors readonly

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,14 +1,15 @@
 name: Report an issue with Home Assistant Core
 description: Report an issue with Home Assistant Core.
+type: Bug
 body:
   - type: markdown
     attributes:
       value: |
         This issue form is for reporting bugs only!
 
-        If you have a feature or enhancement request, please [request them here instead][fr].
+        If you have a feature or enhancement request, please use the [feature request][fr] section of our [Community Forum][fr].
 
-        [fr]: https://github.com/orgs/home-assistant/discussions
+        [fr]: https://community.home-assistant.io/c/feature-requests
   - type: textarea
     validations:
       required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -10,8 +10,8 @@ contact_links:
     url: https://www.home-assistant.io/help
     about: We use GitHub for tracking bugs, check our website for resources on getting help.
   - name: Feature Request
-    url: https://github.com/orgs/home-assistant/discussions
-    about: Please use this link to request new features or enhancements to existing features.
+    url: https://community.home-assistant.io/c/feature-requests
+    about: Please use our Community Forum for making feature requests.
   - name: I'm unsure where to go
     url: https://www.home-assistant.io/join-chat
     about: If you are unsure where to go, then joining our chat is recommended; Just ask!

.github/workflows/builder.yml

@@ -94,7 +94,7 @@ jobs:
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@v11
+        uses: dawidd6/action-download-artifact@v9
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/frontend
@@ -105,10 +105,10 @@ jobs:
 
       - name: Download nightly wheels of intents
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@v11
+        uses: dawidd6/action-download-artifact@v9
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
-          repo: OHF-Voice/intents-package
+          repo: home-assistant/intents-package
           branch: main
           workflow: nightly.yaml
           workflow_conclusion: success
@@ -509,7 +509,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -522,7 +522,7 @@ jobs:
       - name: Push Docker image
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
         id: push
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -531,7 +531,7 @@ jobs:
 
       - name: Generate artifact attestation
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0
+        uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
         with:
           subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
           subject-digest: ${{ steps.push.outputs.digest }}

.github/workflows/ci.yaml

@@ -37,10 +37,10 @@ on:
         type: boolean
 
 env:
-  CACHE_VERSION: 3
+  CACHE_VERSION: 2
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2025.7"
+  HA_SHORT_VERSION: "2025.6"
   DEFAULT_PYTHON: "3.13"
   ALL_PYTHON_VERSIONS: "['3.13']"
   # 10.3 is the oldest supported version
@@ -360,7 +360,7 @@ jobs:
       - name: Run ruff
         run: |
           . venv/bin/activate
-          pre-commit run --hook-stage manual ruff-check --all-files --show-diff-on-failure
+          pre-commit run --hook-stage manual ruff --all-files --show-diff-on-failure
         env:
           RUFF_OUTPUT_FORMAT: github
 

.github/workflows/codeql.yml

@@ -24,11 +24,11 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.29.0
+        uses: github/codeql-action/init@v3.28.18
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.29.0
+        uses: github/codeql-action/analyze@v3.28.18
         with:
           category: "/language:python"

.github/workflows/detect-duplicate-issues.yml

@@ -1,385 +0,0 @@
-name: Auto-detect duplicate issues
-
-# yamllint disable-line rule:truthy
-on:
-  issues:
-    types: [labeled]
-
-permissions:
-  issues: write
-  models: read
-
-jobs:
-  detect-duplicates:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check if integration label was added and extract details
-        id: extract
-        uses: actions/github-script@v7.0.1
-        with:
-          script: |
-            // Debug: Log the event payload
-            console.log('Event name:', context.eventName);
-            console.log('Event action:', context.payload.action);
-            console.log('Event payload keys:', Object.keys(context.payload));
-
-            // Check the specific label that was added
-            const addedLabel = context.payload.label;
-            if (!addedLabel) {
-              console.log('No label found in labeled event payload');
-              core.setOutput('should_continue', 'false');
-              return;
-            }
-
-            console.log(`Label added: ${addedLabel.name}`);
-
-            if (!addedLabel.name.startsWith('integration:')) {
-              console.log('Added label is not an integration label, skipping duplicate detection');
-              core.setOutput('should_continue', 'false');
-              return;
-            }
-
-            console.log(`Integration label added: ${addedLabel.name}`);
-
-            let currentIssue;
-            let integrationLabels = [];
-
-            try {
-              const issue = await github.rest.issues.get({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.payload.issue.number
-              });
-
-              currentIssue = issue.data;
-
-              // Check if potential-duplicate label already exists
-              const hasPotentialDuplicateLabel = currentIssue.labels
-                .some(label => label.name === 'potential-duplicate');
-
-              if (hasPotentialDuplicateLabel) {
-                console.log('Issue already has potential-duplicate label, skipping duplicate detection');
-                core.setOutput('should_continue', 'false');
-                return;
-              }
-
-              integrationLabels = currentIssue.labels
-                .filter(label => label.name.startsWith('integration:'))
-                .map(label => label.name);
-            } catch (error) {
-              core.error(`Failed to fetch issue #${context.payload.issue.number}:`, error.message);
-              core.setOutput('should_continue', 'false');
-              return;
-            }
-
-            // Check if we've already posted a duplicate detection comment recently
-            let comments;
-            try {
-              comments = await github.rest.issues.listComments({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.payload.issue.number,
-                per_page: 10
-              });
-            } catch (error) {
-              core.error('Failed to fetch comments:', error.message);
-              // Continue anyway, worst case we might post a duplicate comment
-              comments = { data: [] };
-            }
-
-            // Check if we've already posted a duplicate detection comment
-            const recentDuplicateComment = comments.data.find(comment =>
-              comment.user && comment.user.login === 'github-actions[bot]' &&
-              comment.body.includes('<!-- workflow: detect-duplicate-issues -->')
-            );
-
-            if (recentDuplicateComment) {
-              console.log('Already posted duplicate detection comment, skipping');
-              core.setOutput('should_continue', 'false');
-              return;
-            }
-
-            core.setOutput('should_continue', 'true');
-            core.setOutput('current_number', currentIssue.number);
-            core.setOutput('current_title', currentIssue.title);
-            core.setOutput('current_body', currentIssue.body);
-            core.setOutput('current_url', currentIssue.html_url);
-            core.setOutput('integration_labels', JSON.stringify(integrationLabels));
-
-            console.log(`Current issue: #${currentIssue.number}`);
-            console.log(`Integration labels: ${integrationLabels.join(', ')}`);
-
-      - name: Fetch similar issues
-        id: fetch_similar
-        if: steps.extract.outputs.should_continue == 'true'
-        uses: actions/github-script@v7.0.1
-        env:
-          INTEGRATION_LABELS: ${{ steps.extract.outputs.integration_labels }}
-          CURRENT_NUMBER: ${{ steps.extract.outputs.current_number }}
-        with:
-          script: |
-            const integrationLabels = JSON.parse(process.env.INTEGRATION_LABELS);
-            const currentNumber = parseInt(process.env.CURRENT_NUMBER);
-
-            if (integrationLabels.length === 0) {
-              console.log('No integration labels found, skipping duplicate detection');
-              core.setOutput('has_similar', 'false');
-              return;
-            }
-
-            // Use GitHub search API to find issues with matching integration labels
-            console.log(`Searching for issues with integration labels: ${integrationLabels.join(', ')}`);
-
-            // Build search query for issues with any of the current integration labels
-            const labelQueries = integrationLabels.map(label => `label:"${label}"`);
-
-            // Calculate date 6 months ago
-            const sixMonthsAgo = new Date();
-            sixMonthsAgo.setMonth(sixMonthsAgo.getMonth() - 6);
-            const dateFilter = `created:>=${sixMonthsAgo.toISOString().split('T')[0]}`;
-
-            let searchQuery;
-
-            if (labelQueries.length === 1) {
-              searchQuery = `repo:${context.repo.owner}/${context.repo.repo} is:issue ${labelQueries[0]} ${dateFilter}`;
-            } else {
-              searchQuery = `repo:${context.repo.owner}/${context.repo.repo} is:issue (${labelQueries.join(' OR ')}) ${dateFilter}`;
-            }
-
-            console.log(`Search query: ${searchQuery}`);
-
-            let result;
-            try {
-              result = await github.rest.search.issuesAndPullRequests({
-                q: searchQuery,
-                per_page: 15,
-                sort: 'updated',
-                order: 'desc'
-              });
-            } catch (error) {
-              core.error('Failed to search for similar issues:', error.message);
-              if (error.status === 403 && error.message.includes('rate limit')) {
-                core.error('GitHub API rate limit exceeded');
-              }
-              core.setOutput('has_similar', 'false');
-              return;
-            }
-
-            // Filter out the current issue, pull requests, and newer issues (higher numbers)
-            const similarIssues = result.data.items
-              .filter(item =>
-                item.number !== currentNumber &&
-                !item.pull_request &&
-                item.number < currentNumber // Only include older issues (lower numbers)
-              )
-              .map(item => ({
-                number: item.number,
-                title: item.title,
-                body: item.body,
-                url: item.html_url,
-                state: item.state,
-                createdAt: item.created_at,
-                updatedAt: item.updated_at,
-                comments: item.comments,
-                labels: item.labels.map(l => l.name)
-              }));
-
-            console.log(`Found ${similarIssues.length} issues with matching integration labels`);
-            console.log('Raw similar issues:', JSON.stringify(similarIssues.slice(0, 3), null, 2));
-
-            if (similarIssues.length === 0) {
-              console.log('No similar issues found, setting has_similar to false');
-              core.setOutput('has_similar', 'false');
-              return;
-            }
-
-            console.log('Similar issues found, setting has_similar to true');
-            core.setOutput('has_similar', 'true');
-
-            // Clean the issue data to prevent JSON parsing issues
-            const cleanedIssues = similarIssues.slice(0, 15).map(item => {
-              // Handle body with improved truncation and null handling
-              let cleanBody = '';
-              if (item.body && typeof item.body === 'string') {
-                // Remove control characters
-                const cleaned = item.body.replace(/[\u0000-\u001F\u007F-\u009F]/g, '');
-                // Truncate to 1000 characters and add ellipsis if needed
-                cleanBody = cleaned.length > 1000
-                  ? cleaned.substring(0, 1000) + '...'
-                  : cleaned;
-              }
-
-              return {
-                number: item.number,
-                title: item.title.replace(/[\u0000-\u001F\u007F-\u009F]/g, ''), // Remove control characters
-                body: cleanBody,
-                url: item.url,
-                state: item.state,
-                createdAt: item.createdAt,
-                updatedAt: item.updatedAt,
-                comments: item.comments,
-                labels: item.labels
-              };
-            });
-
-            console.log(`Cleaned issues count: ${cleanedIssues.length}`);
-            console.log('First cleaned issue:', JSON.stringify(cleanedIssues[0], null, 2));
-
-            core.setOutput('similar_issues', JSON.stringify(cleanedIssues));
-
-      - name: Detect duplicates using AI
-        id: ai_detection
-        if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/ai-inference@v1.1.0
-        with:
-          model: openai/gpt-4o
-          system-prompt: |
-            You are a Home Assistant issue duplicate detector. Your task is to identify TRUE DUPLICATES - issues that report the EXACT SAME problem, not just similar or related issues.
-
-            CRITICAL: An issue is ONLY a duplicate if:
-            - It describes the SAME problem with the SAME root cause
-            - Issues about the same integration but different problems are NOT duplicates
-            - Issues with similar symptoms but different causes are NOT duplicates
-
-            Important considerations:
-            - Open issues are more relevant than closed ones for duplicate detection
-            - Recently updated issues may indicate ongoing work or discussion
-            - Issues with more comments are generally more relevant and active
-            - Older closed issues might be resolved differently than newer approaches
-            - Consider the time between issues - very old issues may have different contexts
-
-            Rules:
-            1. ONLY mark as duplicate if the issues describe IDENTICAL problems
-            2. Look for issues that report the same problem or request the same functionality
-            3. Different error messages = NOT a duplicate (even if same integration)
-            4. For CLOSED issues, only mark as duplicate if they describe the EXACT same problem
-            5. For OPEN issues, use a lower threshold (90%+ similarity)
-            6. Prioritize issues with higher comment counts as they indicate more activity/relevance
-            7. When in doubt, do NOT mark as duplicate
-            8. Return ONLY a JSON array of issue numbers that are duplicates
-            9. If no duplicates are found, return an empty array: []
-            10. Maximum 5 potential duplicates, prioritize open issues with comments
-            11. Consider the age of issues - prefer recent duplicates over very old ones
-
-            Example response format:
-            [1234, 5678, 9012]
-
-          prompt: |
-            Current issue (just created):
-            Title: ${{ steps.extract.outputs.current_title }}
-            Body: ${{ steps.extract.outputs.current_body }}
-
-            Other issues to compare against (each includes state, creation date, last update, and comment count):
-            ${{ steps.fetch_similar.outputs.similar_issues }}
-
-            Analyze these issues and identify which ones describe IDENTICAL problems and thus are duplicates of the current issue. When sorting them, consider their state (open/closed), how recently they were updated, and their comment count (higher = more relevant).
-
-          max-tokens: 100
-
-      - name: Post duplicate detection results
-        id: post_results
-        if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/github-script@v7.0.1
-        env:
-          AI_RESPONSE: ${{ steps.ai_detection.outputs.response }}
-          SIMILAR_ISSUES: ${{ steps.fetch_similar.outputs.similar_issues }}
-        with:
-          script: |
-            const aiResponse = process.env.AI_RESPONSE;
-
-            console.log('Raw AI response:', JSON.stringify(aiResponse));
-
-            let duplicateNumbers = [];
-            try {
-              // Clean the response of any potential control characters
-              const cleanResponse = aiResponse.trim().replace(/[\u0000-\u001F\u007F-\u009F]/g, '');
-              console.log('Cleaned AI response:', cleanResponse);
-
-              duplicateNumbers = JSON.parse(cleanResponse);
-
-              // Ensure it's an array and contains only numbers
-              if (!Array.isArray(duplicateNumbers)) {
-                console.log('AI response is not an array, trying to extract numbers');
-                const numberMatches = cleanResponse.match(/\d+/g);
-                duplicateNumbers = numberMatches ? numberMatches.map(n => parseInt(n)) : [];
-              }
-
-              // Filter to only valid numbers
-              duplicateNumbers = duplicateNumbers.filter(n => typeof n === 'number' && !isNaN(n));
-
-            } catch (error) {
-              console.log('Failed to parse AI response as JSON:', error.message);
-              console.log('Raw response:', aiResponse);
-
-              // Fallback: try to extract numbers from the response
-              const numberMatches = aiResponse.match(/\d+/g);
-              duplicateNumbers = numberMatches ? numberMatches.map(n => parseInt(n)) : [];
-              console.log('Extracted numbers as fallback:', duplicateNumbers);
-            }
-
-            if (!Array.isArray(duplicateNumbers) || duplicateNumbers.length === 0) {
-              console.log('No duplicates detected by AI');
-              return;
-            }
-
-            console.log(`AI detected ${duplicateNumbers.length} potential duplicates: ${duplicateNumbers.join(', ')}`);
-
-            // Get details of detected duplicates
-            const similarIssues = JSON.parse(process.env.SIMILAR_ISSUES);
-            const duplicates = similarIssues.filter(issue => duplicateNumbers.includes(issue.number));
-
-            if (duplicates.length === 0) {
-              console.log('No matching issues found for detected numbers');
-              return;
-            }
-
-            // Create comment with duplicate detection results
-            const duplicateLinks = duplicates.map(issue => `- [#${issue.number}: ${issue.title}](${issue.url})`).join('\n');
-
-            const commentBody = [
-              '<!-- workflow: detect-duplicate-issues -->',
-              '### 🔍 **Potential duplicate detection**',
-              '',
-              'I\'ve analyzed similar issues and found the following potential duplicates:',
-              '',
-              duplicateLinks,
-              '',
-              '**What to do next:**',
-              '1. Please review these issues to see if they match your issue',
-              '2. If you find an existing issue that covers your problem:',
-              '   - Consider closing this issue',
-              '   - Add your findings or 👍 on the existing issue instead',
-              '3. If your issue is different or adds new aspects, please clarify how it differs',
-              '',
-              'This helps keep our issues organized and ensures similar issues are consolidated for better visibility.',
-              '',
-              '*This message was generated automatically by our duplicate detection system.*'
-            ].join('\n');
-
-            try {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.payload.issue.number,
-                body: commentBody
-              });
-
-              console.log(`Posted duplicate detection comment with ${duplicates.length} potential duplicates`);
-
-              // Add the potential-duplicate label
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.payload.issue.number,
-                labels: ['potential-duplicate']
-              });
-
-              console.log('Added potential-duplicate label to the issue');
-            } catch (error) {
-              core.error('Failed to post duplicate detection comment or add label:', error.message);
-              if (error.status === 403) {
-                core.error('Permission denied or rate limit exceeded');
-              }
-              // Don't throw - we've done the analysis, just couldn't post the result
-            }

.github/workflows/detect-non-english-issues.yml

@@ -1,193 +0,0 @@
-name: Auto-detect non-English issues
-
-# yamllint disable-line rule:truthy
-on:
-  issues:
-    types: [opened]
-
-permissions:
-  issues: write
-  models: read
-
-jobs:
-  detect-language:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check issue language
-        id: detect_language
-        uses: actions/github-script@v7.0.1
-        env:
-          ISSUE_NUMBER: ${{ github.event.issue.number }}
-          ISSUE_TITLE: ${{ github.event.issue.title }}
-          ISSUE_BODY: ${{ github.event.issue.body }}
-          ISSUE_USER_TYPE: ${{ github.event.issue.user.type }}
-        with:
-          script: |
-            // Get the issue details from environment variables
-            const issueNumber = process.env.ISSUE_NUMBER;
-            const issueTitle = process.env.ISSUE_TITLE || '';
-            const issueBody = process.env.ISSUE_BODY || '';
-            const userType = process.env.ISSUE_USER_TYPE;
-
-            // Skip language detection for bot users
-            if (userType === 'Bot') {
-              console.log('Skipping language detection for bot user');
-              core.setOutput('should_continue', 'false');
-              return;
-            }
-
-            console.log(`Checking language for issue #${issueNumber}`);
-            console.log(`Title: ${issueTitle}`);
-
-            // Combine title and body for language detection
-            const fullText = `${issueTitle}\n\n${issueBody}`;
-
-            // Check if the text is too short to reliably detect language
-            if (fullText.trim().length < 20) {
-              console.log('Text too short for reliable language detection');
-              core.setOutput('should_continue', 'false'); // Skip processing for very short text
-              return;
-            }
-
-            core.setOutput('issue_number', issueNumber);
-            core.setOutput('issue_text', fullText);
-            core.setOutput('should_continue', 'true');
-
-      - name: Detect language using AI
-        id: ai_language_detection
-        if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/ai-inference@v1.1.0
-        with:
-          model: openai/gpt-4o-mini
-          system-prompt: |
-            You are a language detection system. Your task is to determine if the provided text is written in English or another language.
-
-            Rules:
-            1. Analyze the text and determine the primary language of the USER'S DESCRIPTION only
-            2. IGNORE markdown headers (lines starting with #, ##, ###, etc.) as these are from issue templates, not user input
-            3. IGNORE all code blocks (text between ``` or ` markers) as they may contain system-generated error messages in other languages
-            4. IGNORE error messages, logs, and system output even if not in code blocks - these often appear in the user's system language
-            5. Consider technical terms, code snippets, URLs, and file paths as neutral (they don't indicate non-English)
-            6. Focus ONLY on the actual sentences and descriptions written by the user explaining their issue
-            7. If the user's explanation/description is in English but includes non-English error messages or logs, consider it ENGLISH
-            8. Return ONLY a JSON object with two fields:
-               - "is_english": boolean (true if the user's description is primarily in English, false otherwise)
-               - "detected_language": string (the name of the detected language, e.g., "English", "Spanish", "Chinese", etc.)
-            9. Be lenient - if the user's explanation is in English with non-English system output, it's still English
-            10. Common programming terms, error messages, and technical jargon should not be considered as non-English
-            11. If you cannot reliably determine the language, set detected_language to "undefined"
-
-            Example response:
-            {"is_english": false, "detected_language": "Spanish"}
-
-          prompt: |
-            Please analyze the following issue text and determine if it is written in English:
-
-            ${{ steps.detect_language.outputs.issue_text }}
-
-          max-tokens: 50
-
-      - name: Process non-English issues
-        if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/github-script@v7.0.1
-        env:
-          AI_RESPONSE: ${{ steps.ai_language_detection.outputs.response }}
-          ISSUE_NUMBER: ${{ steps.detect_language.outputs.issue_number }}
-        with:
-          script: |
-            const issueNumber = parseInt(process.env.ISSUE_NUMBER);
-            const aiResponse = process.env.AI_RESPONSE;
-
-            console.log('AI language detection response:', aiResponse);
-
-            let languageResult;
-            try {
-              languageResult = JSON.parse(aiResponse.trim());
-
-              // Validate the response structure
-              if (!languageResult || typeof languageResult.is_english !== 'boolean') {
-                throw new Error('Invalid response structure');
-              }
-            } catch (error) {
-              core.error(`Failed to parse AI response: ${error.message}`);
-              console.log('Raw AI response:', aiResponse);
-
-              // Log more details for debugging
-              core.warning('Defaulting to English due to parsing error');
-
-              // Default to English if we can't parse the response
-              return;
-            }
-
-            if (languageResult.is_english) {
-              console.log('Issue is in English, no action needed');
-              return;
-            }
-
-            // If language is undefined or not detected, skip processing
-            if (!languageResult.detected_language || languageResult.detected_language === 'undefined') {
-              console.log('Language could not be determined, skipping processing');
-              return;
-            }
-
-            console.log(`Issue detected as non-English: ${languageResult.detected_language}`);
-
-            // Post comment explaining the language requirement
-            const commentBody = [
-              '<!-- workflow: detect-non-english-issues -->',
-              '### 🌐 Non-English issue detected',
-              '',
-              `This issue appears to be written in **${languageResult.detected_language}** rather than English.`,
-              '',
-              'The Home Assistant project uses English as the primary language for issues to ensure that everyone in our international community can participate and help resolve issues. This allows any of our thousands of contributors to jump in and provide assistance.',
-              '',
-              '**What to do:**',
-              '1. Re-create the issue using the English language',
-              '2. If you need help with translation, consider using:',
-              '   - Translation tools like Google Translate',
-              '   - AI assistants like ChatGPT or Claude',
-              '',
-              'This helps our community provide the best possible support and ensures your issue gets the attention it deserves from our global contributor base.',
-              '',
-              'Thank you for your understanding! 🙏'
-            ].join('\n');
-
-            try {
-              // Add comment
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                body: commentBody
-              });
-
-              console.log('Posted language requirement comment');
-
-              // Add non-english label
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                labels: ['non-english']
-              });
-
-              console.log('Added non-english label');
-
-              // Close the issue
-              await github.rest.issues.update({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                state: 'closed',
-                state_reason: 'not_planned'
-              });
-
-              console.log('Closed the issue');
-
-            } catch (error) {
-              core.error('Failed to process non-English issue:', error.message);
-              if (error.status === 403) {
-                core.error('Permission denied or rate limit exceeded');
-              }
-            }

.pre-commit-config.yaml

@@ -1,8 +1,8 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.0
+    rev: v0.11.0
     hooks:
-      - id: ruff-check
+      - id: ruff
         args:
           - --fix
       - id: ruff-format
@@ -30,7 +30,7 @@ repos:
           - --branch=master
           - --branch=rc
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.37.1
+    rev: v1.35.1
     hooks:
       - id: yamllint
   - repo: https://github.com/pre-commit/mirrors-prettier

.strict-typing

@@ -65,7 +65,6 @@ homeassistant.components.aladdin_connect.*
 homeassistant.components.alarm_control_panel.*
 homeassistant.components.alert.*
 homeassistant.components.alexa.*
-homeassistant.components.alexa_devices.*
 homeassistant.components.alpha_vantage.*
 homeassistant.components.amazon_polly.*
 homeassistant.components.amberelectric.*

.vscode/tasks.json

@@ -45,7 +45,7 @@
     {
       "label": "Ruff",
       "type": "shell",
-      "command": "pre-commit run ruff-check --all-files",
+      "command": "pre-commit run ruff --all-files",
       "group": {
         "kind": "test",
         "isDefault": true

CODEOWNERS

@@ -89,8 +89,6 @@ build.json @home-assistant/supervisor
 /tests/components/alert/ @home-assistant/core @frenck
 /homeassistant/components/alexa/ @home-assistant/cloud @ochlocracy @jbouwh
 /tests/components/alexa/ @home-assistant/cloud @ochlocracy @jbouwh
-/homeassistant/components/alexa_devices/ @chemelli74
-/tests/components/alexa_devices/ @chemelli74
 /homeassistant/components/amazon_polly/ @jschlyter
 /homeassistant/components/amberelectric/ @madpilot
 /tests/components/amberelectric/ @madpilot
@@ -305,7 +303,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/crownstone/ @Crownstone @RicArch97
 /tests/components/crownstone/ @Crownstone @RicArch97
 /homeassistant/components/cups/ @fabaff
-/tests/components/cups/ @fabaff
 /homeassistant/components/daikin/ @fredrike
 /tests/components/daikin/ @fredrike
 /homeassistant/components/date/ @home-assistant/core
@@ -1274,8 +1271,8 @@ build.json @home-assistant/supervisor
 /tests/components/rehlko/ @bdraco @peterager
 /homeassistant/components/remote/ @home-assistant/core
 /tests/components/remote/ @home-assistant/core
-/homeassistant/components/remote_calendar/ @Thomas55555 @allenporter
-/tests/components/remote_calendar/ @Thomas55555 @allenporter
+/homeassistant/components/remote_calendar/ @Thomas55555
+/tests/components/remote_calendar/ @Thomas55555
 /homeassistant/components/renault/ @epenet
 /tests/components/renault/ @epenet
 /homeassistant/components/renson/ @jimmyd-be
@@ -1420,8 +1417,6 @@ build.json @home-assistant/supervisor
 /tests/components/sma/ @kellerza @rklomp @erwindouna
 /homeassistant/components/smappee/ @bsmappee
 /tests/components/smappee/ @bsmappee
-/homeassistant/components/smarla/ @explicatis @rlint-explicatis
-/tests/components/smarla/ @explicatis @rlint-explicatis
 /homeassistant/components/smart_meter_texas/ @grahamwetzler
 /tests/components/smart_meter_texas/ @grahamwetzler
 /homeassistant/components/smartthings/ @joostlek

homeassistant/__main__.py

@@ -38,7 +38,8 @@ def validate_python() -> None:
 
 def ensure_config_path(config_dir: str) -> None:
     """Validate the configuration directory."""
-    from . import config as config_util  # noqa: PLC0415
+    # pylint: disable-next=import-outside-toplevel
+    from . import config as config_util
 
     lib_dir = os.path.join(config_dir, "deps")
 
@@ -79,7 +80,8 @@ def ensure_config_path(config_dir: str) -> None:
 
 def get_arguments() -> argparse.Namespace:
     """Get parsed passed in arguments."""
-    from . import config as config_util  # noqa: PLC0415
+    # pylint: disable-next=import-outside-toplevel
+    from . import config as config_util
 
     parser = argparse.ArgumentParser(
         description="Home Assistant: Observe, Control, Automate.",
@@ -175,7 +177,8 @@ def main() -> int:
         validate_os()
 
     if args.script is not None:
-        from . import scripts  # noqa: PLC0415
+        # pylint: disable-next=import-outside-toplevel
+        from . import scripts
 
         return scripts.run(args.script)
 
@@ -185,7 +188,8 @@ def main() -> int:
 
     ensure_config_path(config_dir)
 
-    from . import config, runner  # noqa: PLC0415
+    # pylint: disable-next=import-outside-toplevel
+    from . import config, runner
 
     safe_mode = config.safe_mode_enabled(config_dir)
 

homeassistant/auth/mfa_modules/notify.py

@@ -52,28 +52,28 @@ _LOGGER = logging.getLogger(__name__)
 
 def _generate_secret() -> str:
     """Generate a secret."""
-    import pyotp  # noqa: PLC0415
+    import pyotp  # pylint: disable=import-outside-toplevel
 
     return str(pyotp.random_base32())
 
 
 def _generate_random() -> int:
     """Generate a 32 digit number."""
-    import pyotp  # noqa: PLC0415
+    import pyotp  # pylint: disable=import-outside-toplevel
 
     return int(pyotp.random_base32(length=32, chars=list("1234567890")))
 
 
 def _generate_otp(secret: str, count: int) -> str:
     """Generate one time password."""
-    import pyotp  # noqa: PLC0415
+    import pyotp  # pylint: disable=import-outside-toplevel
 
     return str(pyotp.HOTP(secret).at(count))
 
 
 def _verify_otp(secret: str, otp: str, count: int) -> bool:
     """Verify one time password."""
-    import pyotp  # noqa: PLC0415
+    import pyotp  # pylint: disable=import-outside-toplevel
 
     return bool(pyotp.HOTP(secret).verify(otp, count))
 

homeassistant/auth/mfa_modules/totp.py

@@ -37,7 +37,7 @@ DUMMY_SECRET = "FPPTH34D4E3MI2HG"
 
 def _generate_qr_code(data: str) -> str:
     """Generate a base64 PNG string represent QR Code image of data."""
-    import pyqrcode  # noqa: PLC0415
+    import pyqrcode  # pylint: disable=import-outside-toplevel
 
     qr_code = pyqrcode.create(data)
 
@@ -59,7 +59,7 @@ def _generate_qr_code(data: str) -> str:
 
 def _generate_secret_and_qr_code(username: str) -> tuple[str, str, str]:
     """Generate a secret, url, and QR code."""
-    import pyotp  # noqa: PLC0415
+    import pyotp  # pylint: disable=import-outside-toplevel
 
     ota_secret = pyotp.random_base32()
     url = pyotp.totp.TOTP(ota_secret).provisioning_uri(
@@ -107,7 +107,7 @@ class TotpAuthModule(MultiFactorAuthModule):
 
     def _add_ota_secret(self, user_id: str, secret: str | None = None) -> str:
         """Create a ota_secret for user."""
-        import pyotp  # noqa: PLC0415
+        import pyotp  # pylint: disable=import-outside-toplevel
 
         ota_secret: str = secret or pyotp.random_base32()
 
@@ -163,7 +163,7 @@ class TotpAuthModule(MultiFactorAuthModule):
 
     def _validate_2fa(self, user_id: str, code: str) -> bool:
         """Validate two factor authentication code."""
-        import pyotp  # noqa: PLC0415
+        import pyotp  # pylint: disable=import-outside-toplevel
 
         if (ota_secret := self._users.get(user_id)) is None:  # type: ignore[union-attr]
             # even we cannot find user, we still do verify
@@ -196,7 +196,7 @@ class TotpSetupFlow(SetupFlow[TotpAuthModule]):
         Return self.async_show_form(step_id='init') if user_input is None.
         Return self.async_create_entry(data={'result': result}) if finish.
         """
-        import pyotp  # noqa: PLC0415
+        import pyotp  # pylint: disable=import-outside-toplevel
 
         errors: dict[str, str] = {}
 

homeassistant/backports/enum.py

@@ -0,0 +1,29 @@
+"""Enum backports from standard lib.
+
+This file contained the backport of the StrEnum of Python 3.11.
+
+Since we have dropped support for Python 3.10, we can remove this backport.
+This file is kept for now to avoid breaking custom components that might
+import it.
+"""
+
+from __future__ import annotations
+
+from enum import StrEnum as _StrEnum
+from functools import partial
+
+from homeassistant.helpers.deprecation import (
+    DeprecatedAlias,
+    all_with_deprecated_constants,
+    check_if_deprecated_constant,
+    dir_with_deprecated_constants,
+)
+
+# StrEnum deprecated as of 2024.5 use enum.StrEnum instead.
+_DEPRECATED_StrEnum = DeprecatedAlias(_StrEnum, "enum.StrEnum", "2025.5")
+
+__getattr__ = partial(check_if_deprecated_constant, module_globals=globals())
+__dir__ = partial(
+    dir_with_deprecated_constants, module_globals_keys=[*globals().keys()]
+)
+__all__ = all_with_deprecated_constants(globals())

homeassistant/backports/functools.py

@@ -0,0 +1,31 @@
+"""Functools backports from standard lib.
+
+This file contained the backport of the cached_property implementation of Python 3.12.
+
+Since we have dropped support for Python 3.11, we can remove this backport.
+This file is kept for now to avoid breaking custom components that might
+import it.
+"""
+
+from __future__ import annotations
+
+# pylint: disable-next=hass-deprecated-import
+from functools import cached_property as _cached_property, partial
+
+from homeassistant.helpers.deprecation import (
+    DeprecatedAlias,
+    all_with_deprecated_constants,
+    check_if_deprecated_constant,
+    dir_with_deprecated_constants,
+)
+
+# cached_property deprecated as of 2024.5 use functools.cached_property instead.
+_DEPRECATED_cached_property = DeprecatedAlias(
+    _cached_property, "functools.cached_property", "2025.5"
+)
+
+__getattr__ = partial(check_if_deprecated_constant, module_globals=globals())
+__dir__ = partial(
+    dir_with_deprecated_constants, module_globals_keys=[*globals().keys()]
+)
+__all__ = all_with_deprecated_constants(globals())

homeassistant/bootstrap.py

@@ -171,6 +171,8 @@ FRONTEND_INTEGRATIONS = {
 # Stage 0 is divided into substages. Each substage has a name, a set of integrations and a timeout.
 # The substage containing recorder should have no timeout, as it could cancel a database migration.
 # Recorder freezes "recorder" timeout during a migration, but it does not freeze other timeouts.
+# The substages preceding it should also have no timeout, until we ensure that the recorder
+# is not accidentally promoted as a dependency of any of the integrations in them.
 # If we add timeouts to the frontend substages, we should make sure they don't apply in recovery mode.
 STAGE_0_INTEGRATIONS = (
     # Load logging and http deps as soon as possible
@@ -394,7 +396,7 @@ async def async_setup_hass(
 
 def open_hass_ui(hass: core.HomeAssistant) -> None:
     """Open the UI."""
-    import webbrowser  # noqa: PLC0415
+    import webbrowser  # pylint: disable=import-outside-toplevel
 
     if hass.config.api is None or "frontend" not in hass.config.components:
         _LOGGER.warning("Cannot launch the UI because frontend not loaded")
@@ -561,7 +563,8 @@ async def async_enable_logging(
 
     if not log_no_color:
         try:
-            from colorlog import ColoredFormatter  # noqa: PLC0415
+            # pylint: disable-next=import-outside-toplevel
+            from colorlog import ColoredFormatter
 
             # basicConfig must be called after importing colorlog in order to
             # ensure that the handlers it sets up wraps the correct streams.
@@ -605,7 +608,7 @@ async def async_enable_logging(
     )
     threading.excepthook = lambda args: logging.getLogger().exception(
         "Uncaught thread exception",
-        exc_info=(  # type: ignore[arg-type]  # noqa: LOG014
+        exc_info=(  # type: ignore[arg-type]
             args.exc_type,
             args.exc_value,
             args.exc_traceback,
@@ -926,11 +929,7 @@ async def _async_set_up_integrations(
             await _async_setup_multi_components(hass, stage_all_domains, config)
             continue
         try:
-            async with hass.timeout.async_timeout(
-                timeout,
-                cool_down=COOLDOWN_TIME,
-                cancel_message=f"Bootstrap stage {name} timeout",
-            ):
+            async with hass.timeout.async_timeout(timeout, cool_down=COOLDOWN_TIME):
                 await _async_setup_multi_components(hass, stage_all_domains, config)
         except TimeoutError:
             _LOGGER.warning(
@@ -942,11 +941,7 @@ async def _async_set_up_integrations(
     # Wrap up startup
     _LOGGER.debug("Waiting for startup to wrap up")
     try:
-        async with hass.timeout.async_timeout(
-            WRAP_UP_TIMEOUT,
-            cool_down=COOLDOWN_TIME,
-            cancel_message="Bootstrap startup wrap up timeout",
-        ):
+        async with hass.timeout.async_timeout(WRAP_UP_TIMEOUT, cool_down=COOLDOWN_TIME):
             await hass.async_block_till_done()
     except TimeoutError:
         _LOGGER.warning(
@@ -1059,5 +1054,5 @@ async def _async_setup_multi_components(
             _LOGGER.error(
                 "Error setting up integration %s - received exception",
                 domain,
-                exc_info=(type(result), result, result.__traceback__),  # noqa: LOG014
+                exc_info=(type(result), result, result.__traceback__),
             )

homeassistant/brands/amazon.json

@@ -3,7 +3,6 @@
   "name": "Amazon",
   "integrations": [
     "alexa",
-    "alexa_devices",
     "amazon_polly",
     "aws",
     "aws_s3",

homeassistant/brands/shelly.json

@@ -1,6 +0,0 @@
-{
-  "domain": "shelly",
-  "name": "shelly",
-  "integrations": ["shelly"],
-  "iot_standards": ["zwave"]
-}

homeassistant/components/abode/__init__.py

@@ -14,24 +14,30 @@ from jaraco.abode.exceptions import (
 )
 from jaraco.abode.helpers.timeline import Groups as GROUPS
 from requests.exceptions import ConnectTimeout, HTTPError
+import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_DATE,
     ATTR_DEVICE_ID,
+    ATTR_ENTITY_ID,
     ATTR_TIME,
     CONF_PASSWORD,
     CONF_USERNAME,
     EVENT_HOMEASSISTANT_STOP,
     Platform,
 )
-from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant
+from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, ServiceCall
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 
 from .const import CONF_POLLING, DOMAIN, LOGGER
-from .services import async_setup_services
+
+SERVICE_SETTINGS = "change_setting"
+SERVICE_CAPTURE_IMAGE = "capture_image"
+SERVICE_TRIGGER_AUTOMATION = "trigger_automation"
 
 ATTR_DEVICE_NAME = "device_name"
 ATTR_DEVICE_TYPE = "device_type"
@@ -39,12 +45,22 @@ ATTR_EVENT_CODE = "event_code"
 ATTR_EVENT_NAME = "event_name"
 ATTR_EVENT_TYPE = "event_type"
 ATTR_EVENT_UTC = "event_utc"
+ATTR_SETTING = "setting"
 ATTR_USER_NAME = "user_name"
 ATTR_APP_TYPE = "app_type"
 ATTR_EVENT_BY = "event_by"
+ATTR_VALUE = "value"
 
 CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
 
+CHANGE_SETTING_SCHEMA = vol.Schema(
+    {vol.Required(ATTR_SETTING): cv.string, vol.Required(ATTR_VALUE): cv.string}
+)
+
+CAPTURE_IMAGE_SCHEMA = vol.Schema({ATTR_ENTITY_ID: cv.entity_ids})
+
+AUTOMATION_SCHEMA = vol.Schema({ATTR_ENTITY_ID: cv.entity_ids})
+
 PLATFORMS = [
     Platform.ALARM_CONTROL_PANEL,
     Platform.BINARY_SENSOR,
@@ -69,7 +85,7 @@ class AbodeSystem:
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Abode component."""
-    async_setup_services(hass)
+    setup_hass_services(hass)
     return True
 
 
@@ -122,6 +138,60 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return unload_ok
 
 
+def setup_hass_services(hass: HomeAssistant) -> None:
+    """Home Assistant services."""
+
+    def change_setting(call: ServiceCall) -> None:
+        """Change an Abode system setting."""
+        setting = call.data[ATTR_SETTING]
+        value = call.data[ATTR_VALUE]
+
+        try:
+            hass.data[DOMAIN].abode.set_setting(setting, value)
+        except AbodeException as ex:
+            LOGGER.warning(ex)
+
+    def capture_image(call: ServiceCall) -> None:
+        """Capture a new image."""
+        entity_ids = call.data[ATTR_ENTITY_ID]
+
+        target_entities = [
+            entity_id
+            for entity_id in hass.data[DOMAIN].entity_ids
+            if entity_id in entity_ids
+        ]
+
+        for entity_id in target_entities:
+            signal = f"abode_camera_capture_{entity_id}"
+            dispatcher_send(hass, signal)
+
+    def trigger_automation(call: ServiceCall) -> None:
+        """Trigger an Abode automation."""
+        entity_ids = call.data[ATTR_ENTITY_ID]
+
+        target_entities = [
+            entity_id
+            for entity_id in hass.data[DOMAIN].entity_ids
+            if entity_id in entity_ids
+        ]
+
+        for entity_id in target_entities:
+            signal = f"abode_trigger_automation_{entity_id}"
+            dispatcher_send(hass, signal)
+
+    hass.services.async_register(
+        DOMAIN, SERVICE_SETTINGS, change_setting, schema=CHANGE_SETTING_SCHEMA
+    )
+
+    hass.services.async_register(
+        DOMAIN, SERVICE_CAPTURE_IMAGE, capture_image, schema=CAPTURE_IMAGE_SCHEMA
+    )
+
+    hass.services.async_register(
+        DOMAIN, SERVICE_TRIGGER_AUTOMATION, trigger_automation, schema=AUTOMATION_SCHEMA
+    )
+
+
 async def setup_hass_events(hass: HomeAssistant) -> None:
     """Home Assistant start and stop callbacks."""
 

homeassistant/components/abode/services.py

@@ -1,90 +0,0 @@
-"""Support for the Abode Security System."""
-
-from __future__ import annotations
-
-from jaraco.abode.exceptions import Exception as AbodeException
-import voluptuous as vol
-
-from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.dispatcher import dispatcher_send
-
-from .const import DOMAIN, LOGGER
-
-SERVICE_SETTINGS = "change_setting"
-SERVICE_CAPTURE_IMAGE = "capture_image"
-SERVICE_TRIGGER_AUTOMATION = "trigger_automation"
-
-ATTR_SETTING = "setting"
-ATTR_VALUE = "value"
-
-
-CHANGE_SETTING_SCHEMA = vol.Schema(
-    {vol.Required(ATTR_SETTING): cv.string, vol.Required(ATTR_VALUE): cv.string}
-)
-
-CAPTURE_IMAGE_SCHEMA = vol.Schema({ATTR_ENTITY_ID: cv.entity_ids})
-
-AUTOMATION_SCHEMA = vol.Schema({ATTR_ENTITY_ID: cv.entity_ids})
-
-
-def _change_setting(call: ServiceCall) -> None:
-    """Change an Abode system setting."""
-    setting = call.data[ATTR_SETTING]
-    value = call.data[ATTR_VALUE]
-
-    try:
-        call.hass.data[DOMAIN].abode.set_setting(setting, value)
-    except AbodeException as ex:
-        LOGGER.warning(ex)
-
-
-def _capture_image(call: ServiceCall) -> None:
-    """Capture a new image."""
-    entity_ids = call.data[ATTR_ENTITY_ID]
-
-    target_entities = [
-        entity_id
-        for entity_id in call.hass.data[DOMAIN].entity_ids
-        if entity_id in entity_ids
-    ]
-
-    for entity_id in target_entities:
-        signal = f"abode_camera_capture_{entity_id}"
-        dispatcher_send(call.hass, signal)
-
-
-def _trigger_automation(call: ServiceCall) -> None:
-    """Trigger an Abode automation."""
-    entity_ids = call.data[ATTR_ENTITY_ID]
-
-    target_entities = [
-        entity_id
-        for entity_id in call.hass.data[DOMAIN].entity_ids
-        if entity_id in entity_ids
-    ]
-
-    for entity_id in target_entities:
-        signal = f"abode_trigger_automation_{entity_id}"
-        dispatcher_send(call.hass, signal)
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Home Assistant services."""
-
-    hass.services.async_register(
-        DOMAIN, SERVICE_SETTINGS, _change_setting, schema=CHANGE_SETTING_SCHEMA
-    )
-
-    hass.services.async_register(
-        DOMAIN, SERVICE_CAPTURE_IMAGE, _capture_image, schema=CAPTURE_IMAGE_SCHEMA
-    )
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_TRIGGER_AUTOMATION,
-        _trigger_automation,
-        schema=AUTOMATION_SCHEMA,
-    )

homeassistant/components/acmeda/config_flow.py

@@ -40,10 +40,9 @@ class AcmedaFlowHandler(ConfigFlow, domain=DOMAIN):
             entry.unique_id for entry in self._async_current_entries()
         }
 
-        hubs: list[aiopulse.Hub] = []
         with suppress(TimeoutError):
             async with timeout(5):
-                hubs = [
+                hubs: list[aiopulse.Hub] = [
                     hub
                     async for hub in aiopulse.Hub.discover()
                     if hub.id not in already_configured

homeassistant/components/adax/__init__.py

@@ -8,7 +8,7 @@ from homeassistant.core import HomeAssistant
 from .const import CONNECTION_TYPE, LOCAL
 from .coordinator import AdaxCloudCoordinator, AdaxConfigEntry, AdaxLocalCoordinator
 
-PLATFORMS = [Platform.CLIMATE, Platform.SENSOR]
+PLATFORMS = [Platform.CLIMATE]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: AdaxConfigEntry) -> bool:

homeassistant/components/adax/coordinator.py

@@ -41,30 +41,7 @@ class AdaxCloudCoordinator(DataUpdateCoordinator[dict[str, dict[str, Any]]]):
 
     async def _async_update_data(self) -> dict[str, dict[str, Any]]:
         """Fetch data from the Adax."""
-        try:
-            if hasattr(self.adax_data_handler, "fetch_rooms_info"):
-                rooms = await self.adax_data_handler.fetch_rooms_info() or []
-                _LOGGER.debug("fetch_rooms_info returned: %s", rooms)
-            else:
-                _LOGGER.debug("fetch_rooms_info method not available, using get_rooms")
-                rooms = []
-
-            if not rooms:
-                _LOGGER.debug(
-                    "No rooms from fetch_rooms_info, trying get_rooms as fallback"
-                )
-                rooms = await self.adax_data_handler.get_rooms() or []
-                _LOGGER.debug("get_rooms fallback returned: %s", rooms)
-
-            if not rooms:
-                raise UpdateFailed("No rooms available from Adax API")
-
-        except OSError as e:
-            raise UpdateFailed(f"Error communicating with API: {e}") from e
-
-        for room in rooms:
-            room["energyWh"] = int(room.get("energyWh", 0))
-
+        rooms = await self.adax_data_handler.get_rooms() or []
         return {r["id"]: r for r in rooms}
 
 

homeassistant/components/adax/sensor.py

@@ -1,77 +0,0 @@
-"""Support for Adax energy sensors."""
-
-from __future__ import annotations
-
-from typing import cast
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorStateClass,
-)
-from homeassistant.const import UnitOfEnergy
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from . import AdaxConfigEntry
-from .const import CONNECTION_TYPE, DOMAIN, LOCAL
-from .coordinator import AdaxCloudCoordinator
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AdaxConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the Adax energy sensors with config flow."""
-    if entry.data.get(CONNECTION_TYPE) != LOCAL:
-        cloud_coordinator = cast(AdaxCloudCoordinator, entry.runtime_data)
-
-        # Create individual energy sensors for each device
-        async_add_entities(
-            AdaxEnergySensor(cloud_coordinator, device_id)
-            for device_id in cloud_coordinator.data
-        )
-
-
-class AdaxEnergySensor(CoordinatorEntity[AdaxCloudCoordinator], SensorEntity):
-    """Representation of an Adax energy sensor."""
-
-    _attr_has_entity_name = True
-    _attr_translation_key = "energy"
-    _attr_device_class = SensorDeviceClass.ENERGY
-    _attr_native_unit_of_measurement = UnitOfEnergy.WATT_HOUR
-    _attr_suggested_unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR
-    _attr_state_class = SensorStateClass.TOTAL_INCREASING
-    _attr_suggested_display_precision = 3
-
-    def __init__(
-        self,
-        coordinator: AdaxCloudCoordinator,
-        device_id: str,
-    ) -> None:
-        """Initialize the energy sensor."""
-        super().__init__(coordinator)
-        self._device_id = device_id
-        room = coordinator.data[device_id]
-
-        self._attr_unique_id = f"{room['homeId']}_{device_id}_energy"
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, device_id)},
-            name=room["name"],
-            manufacturer="Adax",
-        )
-
-    @property
-    def available(self) -> bool:
-        """Return True if entity is available."""
-        return (
-            super().available and "energyWh" in self.coordinator.data[self._device_id]
-        )
-
-    @property
-    def native_value(self) -> int:
-        """Return the native value of the sensor."""
-        return int(self.coordinator.data[self._device_id]["energyWh"])

homeassistant/components/agent_dvr/camera.py

@@ -15,7 +15,7 @@ from homeassistant.helpers.entity_platform import (
 )
 
 from . import AgentDVRConfigEntry
-from .const import ATTRIBUTION, CAMERA_SCAN_INTERVAL_SECS, DOMAIN
+from .const import ATTRIBUTION, CAMERA_SCAN_INTERVAL_SECS, DOMAIN as AGENT_DOMAIN
 
 SCAN_INTERVAL = timedelta(seconds=CAMERA_SCAN_INTERVAL_SECS)
 
@@ -82,7 +82,7 @@ class AgentCamera(MjpegCamera):
             still_image_url=f"{device.client._server_url}{device.still_image_url}&size={device.mjpegStreamWidth}x{device.mjpegStreamHeight}",  # noqa: SLF001
         )
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self.unique_id)},
+            identifiers={(AGENT_DOMAIN, self.unique_id)},
             manufacturer="Agent",
             model="Camera",
             name=f"{device.client.name} {device.name}",

homeassistant/components/airgradient/coordinator.py

@@ -51,16 +51,9 @@ class AirGradientCoordinator(DataUpdateCoordinator[AirGradientData]):
 
     async def _async_setup(self) -> None:
         """Set up the coordinator."""
-        try:
-            self._current_version = (
-                await self.client.get_current_measures()
-            ).firmware_version
-        except AirGradientError as error:
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="update_error",
-                translation_placeholders={"error": str(error)},
-            ) from error
+        self._current_version = (
+            await self.client.get_current_measures()
+        ).firmware_version
 
     async def _async_update_data(self) -> AirGradientData:
         try:

homeassistant/components/airly/config_flow.py

@@ -39,14 +39,14 @@ class AirlyFlowHandler(ConfigFlow, domain=DOMAIN):
             )
             self._abort_if_unique_id_configured()
             try:
-                location_point_valid = await check_location(
+                location_point_valid = await test_location(
                     websession,
                     user_input["api_key"],
                     user_input["latitude"],
                     user_input["longitude"],
                 )
                 if not location_point_valid:
-                    location_nearest_valid = await check_location(
+                    location_nearest_valid = await test_location(
                         websession,
                         user_input["api_key"],
                         user_input["latitude"],
@@ -88,7 +88,7 @@ class AirlyFlowHandler(ConfigFlow, domain=DOMAIN):
         )
 
 
-async def check_location(
+async def test_location(
     client: ClientSession,
     api_key: str,
     latitude: float,

homeassistant/components/airq/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aioairq"],
-  "requirements": ["aioairq==0.4.6"]
+  "requirements": ["aioairq==0.4.4"]
 }

homeassistant/components/airthings/__init__.py

@@ -5,22 +5,23 @@ from __future__ import annotations
 from datetime import timedelta
 import logging
 
-from airthings import Airthings
+from airthings import Airthings, AirthingsDevice, AirthingsError
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_SECRET
-from .coordinator import AirthingsDataUpdateCoordinator
+from .const import CONF_SECRET, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 SCAN_INTERVAL = timedelta(minutes=6)
 
-type AirthingsConfigEntry = ConfigEntry[AirthingsDataUpdateCoordinator]
+type AirthingsDataCoordinatorType = DataUpdateCoordinator[dict[str, AirthingsDevice]]
+type AirthingsConfigEntry = ConfigEntry[AirthingsDataCoordinatorType]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: AirthingsConfigEntry) -> bool:
@@ -31,8 +32,21 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirthingsConfigEntry) ->
         async_get_clientsession(hass),
     )
 
-    coordinator = AirthingsDataUpdateCoordinator(hass, airthings)
+    async def _update_method() -> dict[str, AirthingsDevice]:
+        """Get the latest data from Airthings."""
+        try:
+            return await airthings.update_devices()  # type: ignore[no-any-return]
+        except AirthingsError as err:
+            raise UpdateFailed(f"Unable to fetch data: {err}") from err
 
+    coordinator = DataUpdateCoordinator(
+        hass,
+        _LOGGER,
+        config_entry=entry,
+        name=DOMAIN,
+        update_method=_update_method,
+        update_interval=SCAN_INTERVAL,
+    )
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator

homeassistant/components/airthings/coordinator.py

@@ -1,36 +0,0 @@
-"""The Airthings integration."""
-
-from datetime import timedelta
-import logging
-
-from airthings import Airthings, AirthingsDevice, AirthingsError
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-SCAN_INTERVAL = timedelta(minutes=6)
-
-
-class AirthingsDataUpdateCoordinator(DataUpdateCoordinator[dict[str, AirthingsDevice]]):
-    """Coordinator for Airthings data updates."""
-
-    def __init__(self, hass: HomeAssistant, airthings: Airthings) -> None:
-        """Initialize the coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name=DOMAIN,
-            update_method=self._update_method,
-            update_interval=SCAN_INTERVAL,
-        )
-        self.airthings = airthings
-
-    async def _update_method(self) -> dict[str, AirthingsDevice]:
-        """Get the latest data from Airthings."""
-        try:
-            return await self.airthings.update_devices()  # type: ignore[no-any-return]
-        except AirthingsError as err:
-            raise UpdateFailed(f"Unable to fetch data: {err}") from err

homeassistant/components/airthings/sensor.py

@@ -19,7 +19,6 @@ from homeassistant.const import (
     SIGNAL_STRENGTH_DECIBELS,
     EntityCategory,
     UnitOfPressure,
-    UnitOfSoundPressure,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -28,44 +27,32 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import AirthingsConfigEntry
+from . import AirthingsConfigEntry, AirthingsDataCoordinatorType
 from .const import DOMAIN
-from .coordinator import AirthingsDataUpdateCoordinator
 
 SENSORS: dict[str, SensorEntityDescription] = {
     "radonShortTermAvg": SensorEntityDescription(
         key="radonShortTermAvg",
         native_unit_of_measurement="Bq/m³",
         translation_key="radon",
-        suggested_display_precision=0,
     ),
     "temp": SensorEntityDescription(
         key="temp",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
     ),
     "humidity": SensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
     "pressure": SensorEntityDescription(
         key="pressure",
         device_class=SensorDeviceClass.ATMOSPHERIC_PRESSURE,
         native_unit_of_measurement=UnitOfPressure.MBAR,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
-    ),
-    "sla": SensorEntityDescription(
-        key="sla",
-        device_class=SensorDeviceClass.SOUND_PRESSURE,
-        native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
     "battery": SensorEntityDescription(
         key="battery",
@@ -73,47 +60,40 @@ SENSORS: dict[str, SensorEntityDescription] = {
         native_unit_of_measurement=PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
     "co2": SensorEntityDescription(
         key="co2",
         device_class=SensorDeviceClass.CO2,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
     "voc": SensorEntityDescription(
         key="voc",
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
     "light": SensorEntityDescription(
         key="light",
         native_unit_of_measurement=PERCENTAGE,
         translation_key="light",
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
     "lux": SensorEntityDescription(
         key="lux",
         device_class=SensorDeviceClass.ILLUMINANCE,
         native_unit_of_measurement=LIGHT_LUX,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
     "virusRisk": SensorEntityDescription(
         key="virusRisk",
         translation_key="virus_risk",
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
     "mold": SensorEntityDescription(
         key="mold",
         translation_key="mold",
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
     "rssi": SensorEntityDescription(
         key="rssi",
@@ -122,21 +102,18 @@ SENSORS: dict[str, SensorEntityDescription] = {
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
     "pm1": SensorEntityDescription(
         key="pm1",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM1,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
     "pm25": SensorEntityDescription(
         key="pm25",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
     ),
 }
 
@@ -163,7 +140,7 @@ async def async_setup_entry(
 
 
 class AirthingsHeaterEnergySensor(
-    CoordinatorEntity[AirthingsDataUpdateCoordinator], SensorEntity
+    CoordinatorEntity[AirthingsDataCoordinatorType], SensorEntity
 ):
     """Representation of a Airthings Sensor device."""
 
@@ -172,7 +149,7 @@ class AirthingsHeaterEnergySensor(
 
     def __init__(
         self,
-        coordinator: AirthingsDataUpdateCoordinator,
+        coordinator: AirthingsDataCoordinatorType,
         airthings_device: AirthingsDevice,
         entity_description: SensorEntityDescription,
     ) -> None:

homeassistant/components/airtouch5/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airtouch5",
   "iot_class": "local_push",
   "loggers": ["airtouch5py"],
-  "requirements": ["airtouch5py==0.3.0"]
+  "requirements": ["airtouch5py==0.2.11"]
 }

homeassistant/components/alexa_devices/__init__.py

@@ -1,32 +0,0 @@
-"""Alexa Devices integration."""
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-
-from .coordinator import AmazonConfigEntry, AmazonDevicesCoordinator
-
-PLATFORMS = [
-    Platform.BINARY_SENSOR,
-    Platform.NOTIFY,
-    Platform.SWITCH,
-]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
-    """Set up Alexa Devices platform."""
-
-    coordinator = AmazonDevicesCoordinator(hass, entry)
-
-    await coordinator.async_config_entry_first_refresh()
-
-    entry.runtime_data = coordinator
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
-    """Unload a config entry."""
-    await entry.runtime_data.api.close()
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/alexa_devices/binary_sensor.py

@@ -1,74 +0,0 @@
-"""Support for binary sensors."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import Final
-
-from aioamazondevices.api import AmazonDevice
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import AmazonConfigEntry
-from .entity import AmazonEntity
-
-# Coordinator is used to centralize the data updates
-PARALLEL_UPDATES = 0
-
-
-@dataclass(frozen=True, kw_only=True)
-class AmazonBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Alexa Devices binary sensor entity description."""
-
-    is_on_fn: Callable[[AmazonDevice], bool]
-
-
-BINARY_SENSORS: Final = (
-    AmazonBinarySensorEntityDescription(
-        key="online",
-        device_class=BinarySensorDeviceClass.CONNECTIVITY,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        is_on_fn=lambda _device: _device.online,
-    ),
-    AmazonBinarySensorEntityDescription(
-        key="bluetooth",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        translation_key="bluetooth",
-        is_on_fn=lambda _device: _device.bluetooth_state,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AmazonConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Alexa Devices binary sensors based on a config entry."""
-
-    coordinator = entry.runtime_data
-
-    async_add_entities(
-        AmazonBinarySensorEntity(coordinator, serial_num, sensor_desc)
-        for sensor_desc in BINARY_SENSORS
-        for serial_num in coordinator.data
-    )
-
-
-class AmazonBinarySensorEntity(AmazonEntity, BinarySensorEntity):
-    """Binary sensor device."""
-
-    entity_description: AmazonBinarySensorEntityDescription
-
-    @property
-    def is_on(self) -> bool:
-        """Return True if the binary sensor is on."""
-        return self.entity_description.is_on_fn(self.device)

homeassistant/components/alexa_devices/config_flow.py

@@ -1,63 +0,0 @@
-"""Config flow for Alexa Devices integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from aioamazondevices.api import AmazonEchoApi
-from aioamazondevices.exceptions import CannotAuthenticate, CannotConnect
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_CODE, CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.selector import CountrySelector
-
-from .const import CONF_LOGIN_DATA, DOMAIN
-
-
-class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Alexa Devices."""
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors = {}
-        if user_input:
-            client = AmazonEchoApi(
-                user_input[CONF_COUNTRY],
-                user_input[CONF_USERNAME],
-                user_input[CONF_PASSWORD],
-            )
-            try:
-                data = await client.login_mode_interactive(user_input[CONF_CODE])
-            except CannotConnect:
-                errors["base"] = "cannot_connect"
-            except CannotAuthenticate:
-                errors["base"] = "invalid_auth"
-            else:
-                await self.async_set_unique_id(data["customer_info"]["user_id"])
-                self._abort_if_unique_id_configured()
-                user_input.pop(CONF_CODE)
-                return self.async_create_entry(
-                    title=user_input[CONF_USERNAME],
-                    data=user_input | {CONF_LOGIN_DATA: data},
-                )
-            finally:
-                await client.close()
-
-        return self.async_show_form(
-            step_id="user",
-            errors=errors,
-            data_schema=vol.Schema(
-                {
-                    vol.Required(
-                        CONF_COUNTRY, default=self.hass.config.country
-                    ): CountrySelector(),
-                    vol.Required(CONF_USERNAME): cv.string,
-                    vol.Required(CONF_PASSWORD): cv.string,
-                    vol.Required(CONF_CODE): cv.string,
-                }
-            ),
-        )

homeassistant/components/alexa_devices/const.py

@@ -1,8 +0,0 @@
-"""Alexa Devices constants."""
-
-import logging
-
-_LOGGER = logging.getLogger(__package__)
-
-DOMAIN = "alexa_devices"
-CONF_LOGIN_DATA = "login_data"

homeassistant/components/alexa_devices/coordinator.py

@@ -1,58 +0,0 @@
-"""Support for Alexa Devices."""
-
-from datetime import timedelta
-
-from aioamazondevices.api import AmazonDevice, AmazonEchoApi
-from aioamazondevices.exceptions import (
-    CannotAuthenticate,
-    CannotConnect,
-    CannotRetrieveData,
-)
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import _LOGGER, CONF_LOGIN_DATA
-
-SCAN_INTERVAL = 30
-
-type AmazonConfigEntry = ConfigEntry[AmazonDevicesCoordinator]
-
-
-class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
-    """Base coordinator for Alexa Devices."""
-
-    config_entry: AmazonConfigEntry
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        entry: AmazonConfigEntry,
-    ) -> None:
-        """Initialize the scanner."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name=entry.title,
-            config_entry=entry,
-            update_interval=timedelta(seconds=SCAN_INTERVAL),
-        )
-        self.api = AmazonEchoApi(
-            entry.data[CONF_COUNTRY],
-            entry.data[CONF_USERNAME],
-            entry.data[CONF_PASSWORD],
-            entry.data[CONF_LOGIN_DATA],
-        )
-
-    async def _async_update_data(self) -> dict[str, AmazonDevice]:
-        """Update device data."""
-        try:
-            await self.api.login_mode_stored_data()
-            return await self.api.get_devices_data()
-        except (CannotConnect, CannotRetrieveData) as err:
-            raise UpdateFailed(f"Error occurred while updating {self.name}") from err
-        except CannotAuthenticate as err:
-            raise ConfigEntryError("Could not authenticate") from err

homeassistant/components/alexa_devices/diagnostics.py

@@ -1,66 +0,0 @@
-"""Diagnostics support for Alexa Devices integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from aioamazondevices.api import AmazonDevice
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceEntry
-
-from .coordinator import AmazonConfigEntry
-
-TO_REDACT = {CONF_PASSWORD, CONF_USERNAME, CONF_NAME, "title"}
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: AmazonConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-
-    coordinator = entry.runtime_data
-
-    devices: list[dict[str, dict[str, Any]]] = [
-        build_device_data(device) for device in coordinator.data.values()
-    ]
-
-    return {
-        "entry": async_redact_data(entry.as_dict(), TO_REDACT),
-        "device_info": {
-            "last_update success": coordinator.last_update_success,
-            "last_exception": repr(coordinator.last_exception),
-            "devices": devices,
-        },
-    }
-
-
-async def async_get_device_diagnostics(
-    hass: HomeAssistant, entry: AmazonConfigEntry, device_entry: DeviceEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a device."""
-
-    coordinator = entry.runtime_data
-
-    assert device_entry.serial_number
-
-    return build_device_data(coordinator.data[device_entry.serial_number])
-
-
-def build_device_data(device: AmazonDevice) -> dict[str, Any]:
-    """Build device data for diagnostics."""
-    return {
-        "account name": device.account_name,
-        "capabilities": device.capabilities,
-        "device family": device.device_family,
-        "device type": device.device_type,
-        "device cluster members": device.device_cluster_members,
-        "online": device.online,
-        "serial number": device.serial_number,
-        "software version": device.software_version,
-        "do not disturb": device.do_not_disturb,
-        "response style": device.response_style,
-        "bluetooth state": device.bluetooth_state,
-    }

homeassistant/components/alexa_devices/entity.py

@@ -1,57 +0,0 @@
-"""Defines a base Alexa Devices entity."""
-
-from aioamazondevices.api import AmazonDevice
-from aioamazondevices.const import SPEAKER_GROUP_MODEL
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import AmazonDevicesCoordinator
-
-
-class AmazonEntity(CoordinatorEntity[AmazonDevicesCoordinator]):
-    """Defines a base Alexa Devices entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: AmazonDevicesCoordinator,
-        serial_num: str,
-        description: EntityDescription,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self._serial_num = serial_num
-        model_details = coordinator.api.get_model_details(self.device) or {}
-        model = model_details.get("model")
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, serial_num)},
-            name=self.device.account_name,
-            model=model,
-            model_id=self.device.device_type,
-            manufacturer=model_details.get("manufacturer", "Amazon"),
-            hw_version=model_details.get("hw_version"),
-            sw_version=(
-                self.device.software_version if model != SPEAKER_GROUP_MODEL else None
-            ),
-            serial_number=serial_num if model != SPEAKER_GROUP_MODEL else None,
-        )
-        self.entity_description = description
-        self._attr_unique_id = f"{serial_num}-{description.key}"
-
-    @property
-    def device(self) -> AmazonDevice:
-        """Return the device."""
-        return self.coordinator.data[self._serial_num]
-
-    @property
-    def available(self) -> bool:
-        """Return True if entity is available."""
-        return (
-            super().available
-            and self._serial_num in self.coordinator.data
-            and self.device.online
-        )

homeassistant/components/alexa_devices/icons.json

@@ -1,12 +0,0 @@
-{
-  "entity": {
-    "binary_sensor": {
-      "bluetooth": {
-        "default": "mdi:bluetooth",
-        "state": {
-          "off": "mdi:bluetooth-off"
-        }
-      }
-    }
-  }
-}

homeassistant/components/alexa_devices/manifest.json

@@ -1,12 +0,0 @@
-{
-  "domain": "alexa_devices",
-  "name": "Alexa Devices",
-  "codeowners": ["@chemelli74"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/alexa_devices",
-  "integration_type": "hub",
-  "iot_class": "cloud_polling",
-  "loggers": ["aioamazondevices"],
-  "quality_scale": "bronze",
-  "requirements": ["aioamazondevices==3.1.12"]
-}

homeassistant/components/alexa_devices/notify.py

@@ -1,78 +0,0 @@
-"""Support for notification entity."""
-
-from __future__ import annotations
-
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-from typing import Any, Final
-
-from aioamazondevices.api import AmazonDevice, AmazonEchoApi
-from aioamazondevices.const import SPEAKER_GROUP_FAMILY
-
-from homeassistant.components.notify import NotifyEntity, NotifyEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import AmazonConfigEntry
-from .entity import AmazonEntity
-
-PARALLEL_UPDATES = 1
-
-
-@dataclass(frozen=True, kw_only=True)
-class AmazonNotifyEntityDescription(NotifyEntityDescription):
-    """Alexa Devices notify entity description."""
-
-    is_supported: Callable[[AmazonDevice], bool] = lambda _device: True
-    method: Callable[[AmazonEchoApi, AmazonDevice, str], Awaitable[None]]
-    subkey: str
-
-
-NOTIFY: Final = (
-    AmazonNotifyEntityDescription(
-        key="speak",
-        translation_key="speak",
-        subkey="AUDIO_PLAYER",
-        is_supported=lambda _device: _device.device_family != SPEAKER_GROUP_FAMILY,
-        method=lambda api, device, message: api.call_alexa_speak(device, message),
-    ),
-    AmazonNotifyEntityDescription(
-        key="announce",
-        translation_key="announce",
-        subkey="AUDIO_PLAYER",
-        method=lambda api, device, message: api.call_alexa_announcement(
-            device, message
-        ),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AmazonConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Alexa Devices notification entity based on a config entry."""
-
-    coordinator = entry.runtime_data
-
-    async_add_entities(
-        AmazonNotifyEntity(coordinator, serial_num, sensor_desc)
-        for sensor_desc in NOTIFY
-        for serial_num in coordinator.data
-        if sensor_desc.subkey in coordinator.data[serial_num].capabilities
-        and sensor_desc.is_supported(coordinator.data[serial_num])
-    )
-
-
-class AmazonNotifyEntity(AmazonEntity, NotifyEntity):
-    """Binary sensor notify platform."""
-
-    entity_description: AmazonNotifyEntityDescription
-
-    async def async_send_message(
-        self, message: str, title: str | None = None, **kwargs: Any
-    ) -> None:
-        """Send a message."""
-
-        await self.entity_description.method(self.coordinator.api, self.device, message)

homeassistant/components/alexa_devices/quality_scale.yaml

@@ -1,76 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: no actions
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: no actions
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: entities do not explicitly subscribe to events
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions: todo
-  config-entry-unloading: done
-  docs-configuration-parameters: todo
-  docs-installation-parameters: todo
-  entity-unavailable: done
-  integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: done
-  reauthentication-flow: todo
-  test-coverage:
-    status: todo
-    comment: all tests missing
-
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery-update-info:
-    status: exempt
-    comment: Network information not relevant
-  discovery:
-    status: exempt
-    comment: There are a ton of mac address ranges in use, but also by kindles which are not supported by this integration
-  docs-data-update: todo
-  docs-examples: todo
-  docs-known-limitations: todo
-  docs-supported-devices: todo
-  docs-supported-functions: todo
-  docs-troubleshooting: todo
-  docs-use-cases: todo
-  dynamic-devices: todo
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default: done
-  entity-translations: done
-  exception-translations: todo
-  icon-translations: done
-  reconfiguration-flow: todo
-  repair-issues:
-    status: exempt
-    comment: no known use cases for repair issues or flows, yet
-  stale-devices:
-    status: todo
-    comment: automate the cleanup process
-
-  # Platinum
-  async-dependency: done
-  inject-websession: todo
-  strict-typing: done

homeassistant/components/alexa_devices/strings.json

@@ -1,60 +0,0 @@
-{
-  "common": {
-    "data_country": "Country code",
-    "data_code": "One-time password (OTP code)",
-    "data_description_country": "The country of your Amazon account.",
-    "data_description_username": "The email address of your Amazon account.",
-    "data_description_password": "The password of your Amazon account.",
-    "data_description_code": "The one-time password to log in to your account. Currently, only tokens from OTP applications are supported."
-  },
-  "config": {
-    "flow_title": "{username}",
-    "step": {
-      "user": {
-        "data": {
-          "country": "[%key:component::alexa_devices::common::data_country%]",
-          "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "code": "[%key:component::alexa_devices::common::data_description_code%]"
-        },
-        "data_description": {
-          "country": "[%key:component::alexa_devices::common::data_description_country%]",
-          "username": "[%key:component::alexa_devices::common::data_description_username%]",
-          "password": "[%key:component::alexa_devices::common::data_description_password%]",
-          "code": "[%key:component::alexa_devices::common::data_description_code%]"
-        }
-      }
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    }
-  },
-  "entity": {
-    "binary_sensor": {
-      "bluetooth": {
-        "name": "Bluetooth"
-      }
-    },
-    "notify": {
-      "speak": {
-        "name": "Speak"
-      },
-      "announce": {
-        "name": "Announce"
-      }
-    },
-    "switch": {
-      "do_not_disturb": {
-        "name": "Do not disturb"
-      }
-    }
-  }
-}

homeassistant/components/alexa_devices/switch.py

@@ -1,84 +0,0 @@
-"""Support for switches."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Final
-
-from aioamazondevices.api import AmazonDevice
-
-from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import AmazonConfigEntry
-from .entity import AmazonEntity
-
-PARALLEL_UPDATES = 1
-
-
-@dataclass(frozen=True, kw_only=True)
-class AmazonSwitchEntityDescription(SwitchEntityDescription):
-    """Alexa Devices switch entity description."""
-
-    is_on_fn: Callable[[AmazonDevice], bool]
-    subkey: str
-    method: str
-
-
-SWITCHES: Final = (
-    AmazonSwitchEntityDescription(
-        key="do_not_disturb",
-        subkey="AUDIO_PLAYER",
-        translation_key="do_not_disturb",
-        is_on_fn=lambda _device: _device.do_not_disturb,
-        method="set_do_not_disturb",
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AmazonConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Alexa Devices switches based on a config entry."""
-
-    coordinator = entry.runtime_data
-
-    async_add_entities(
-        AmazonSwitchEntity(coordinator, serial_num, switch_desc)
-        for switch_desc in SWITCHES
-        for serial_num in coordinator.data
-        if switch_desc.subkey in coordinator.data[serial_num].capabilities
-    )
-
-
-class AmazonSwitchEntity(AmazonEntity, SwitchEntity):
-    """Switch device."""
-
-    entity_description: AmazonSwitchEntityDescription
-
-    async def _switch_set_state(self, state: bool) -> None:
-        """Set desired switch state."""
-        method = getattr(self.coordinator.api, self.entity_description.method)
-
-        if TYPE_CHECKING:
-            assert method is not None
-
-        await method(self.device, state)
-        await self.coordinator.async_request_refresh()
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the switch on."""
-        await self._switch_set_state(True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the switch off."""
-        await self._switch_set_state(False)
-
-    @property
-    def is_on(self) -> bool:
-        """Return True if switch is on."""
-        return self.entity_description.is_on_fn(self.device)

homeassistant/components/amcrest/__init__.py

@@ -16,7 +16,10 @@ from amcrest import AmcrestError, ApiWrapper, LoginError
 import httpx
 import voluptuous as vol
 
+from homeassistant.auth.models import User
+from homeassistant.auth.permissions.const import POLICY_CONTROL
 from homeassistant.const import (
+    ATTR_ENTITY_ID,
     CONF_AUTHENTICATION,
     CONF_BINARY_SENSORS,
     CONF_HOST,
@@ -27,17 +30,21 @@ from homeassistant.const import (
     CONF_SENSORS,
     CONF_SWITCHES,
     CONF_USERNAME,
+    ENTITY_MATCH_ALL,
+    ENTITY_MATCH_NONE,
     HTTP_BASIC_AUTHENTICATION,
     Platform,
 )
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.exceptions import Unauthorized, UnknownUser
 from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.dispatcher import async_dispatcher_send, dispatcher_send
 from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.service import async_extract_entity_ids
 from homeassistant.helpers.typing import ConfigType
 
 from .binary_sensor import BINARY_SENSOR_KEYS, BINARY_SENSORS, check_binary_sensors
-from .camera import STREAM_SOURCE_LIST
+from .camera import CAMERA_SERVICES, STREAM_SOURCE_LIST
 from .const import (
     CAMERAS,
     COMM_RETRIES,
@@ -51,7 +58,6 @@ from .const import (
 )
 from .helpers import service_signal
 from .sensor import SENSOR_KEYS
-from .services import async_setup_services
 from .switch import SWITCH_KEYS
 
 _LOGGER = logging.getLogger(__name__)
@@ -449,7 +455,47 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     if not hass.data[DATA_AMCREST][DEVICES]:
         return False
 
-    async_setup_services(hass)
+    def have_permission(user: User | None, entity_id: str) -> bool:
+        return not user or user.permissions.check_entity(entity_id, POLICY_CONTROL)
+
+    async def async_extract_from_service(call: ServiceCall) -> list[str]:
+        if call.context.user_id:
+            user = await hass.auth.async_get_user(call.context.user_id)
+            if user is None:
+                raise UnknownUser(context=call.context)
+        else:
+            user = None
+
+        if call.data.get(ATTR_ENTITY_ID) == ENTITY_MATCH_ALL:
+            # Return all entity_ids user has permission to control.
+            return [
+                entity_id
+                for entity_id in hass.data[DATA_AMCREST][CAMERAS]
+                if have_permission(user, entity_id)
+            ]
+
+        if call.data.get(ATTR_ENTITY_ID) == ENTITY_MATCH_NONE:
+            return []
+
+        call_ids = await async_extract_entity_ids(hass, call)
+        entity_ids = []
+        for entity_id in hass.data[DATA_AMCREST][CAMERAS]:
+            if entity_id not in call_ids:
+                continue
+            if not have_permission(user, entity_id):
+                raise Unauthorized(
+                    context=call.context, entity_id=entity_id, permission=POLICY_CONTROL
+                )
+            entity_ids.append(entity_id)
+        return entity_ids
+
+    async def async_service_handler(call: ServiceCall) -> None:
+        args = [call.data[arg] for arg in CAMERA_SERVICES[call.service][2]]
+        for entity_id in await async_extract_from_service(call):
+            async_dispatcher_send(hass, service_signal(call.service, entity_id), *args)
+
+    for service, params in CAMERA_SERVICES.items():
+        hass.services.async_register(DOMAIN, service, async_service_handler, params[0])
 
     return True
 

homeassistant/components/amcrest/services.py

@@ -1,62 +0,0 @@
-"""Support for Amcrest IP cameras."""
-
-from __future__ import annotations
-
-from homeassistant.auth.models import User
-from homeassistant.auth.permissions.const import POLICY_CONTROL
-from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, ENTITY_MATCH_NONE
-from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.exceptions import Unauthorized, UnknownUser
-from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.service import async_extract_entity_ids
-
-from .camera import CAMERA_SERVICES
-from .const import CAMERAS, DATA_AMCREST, DOMAIN
-from .helpers import service_signal
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Set up the Amcrest IP Camera services."""
-
-    def have_permission(user: User | None, entity_id: str) -> bool:
-        return not user or user.permissions.check_entity(entity_id, POLICY_CONTROL)
-
-    async def async_extract_from_service(call: ServiceCall) -> list[str]:
-        if call.context.user_id:
-            user = await hass.auth.async_get_user(call.context.user_id)
-            if user is None:
-                raise UnknownUser(context=call.context)
-        else:
-            user = None
-
-        if call.data.get(ATTR_ENTITY_ID) == ENTITY_MATCH_ALL:
-            # Return all entity_ids user has permission to control.
-            return [
-                entity_id
-                for entity_id in hass.data[DATA_AMCREST][CAMERAS]
-                if have_permission(user, entity_id)
-            ]
-
-        if call.data.get(ATTR_ENTITY_ID) == ENTITY_MATCH_NONE:
-            return []
-
-        call_ids = await async_extract_entity_ids(hass, call)
-        entity_ids = []
-        for entity_id in hass.data[DATA_AMCREST][CAMERAS]:
-            if entity_id not in call_ids:
-                continue
-            if not have_permission(user, entity_id):
-                raise Unauthorized(
-                    context=call.context, entity_id=entity_id, permission=POLICY_CONTROL
-                )
-            entity_ids.append(entity_id)
-        return entity_ids
-
-    async def async_service_handler(call: ServiceCall) -> None:
-        args = [call.data[arg] for arg in CAMERA_SERVICES[call.service][2]]
-        for entity_id in await async_extract_from_service(call):
-            async_dispatcher_send(hass, service_signal(call.service, entity_id), *args)
-
-    for service, params in CAMERA_SERVICES.items():
-        hass.services.async_register(DOMAIN, service, async_service_handler, params[0])

homeassistant/components/analytics/analytics.py

@@ -24,7 +24,7 @@ from homeassistant.components.recorder import (
     get_instance as get_recorder_instance,
 )
 from homeassistant.config_entries import SOURCE_IGNORE
-from homeassistant.const import ATTR_DOMAIN, BASE_PLATFORMS, __version__ as HA_VERSION
+from homeassistant.const import ATTR_DOMAIN, __version__ as HA_VERSION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
@@ -225,8 +225,7 @@ class Analytics:
                 LOGGER.error(err)
                 return
 
-            configuration_set = _domains_from_yaml_config(yaml_configuration)
-
+            configuration_set = set(yaml_configuration)
             er_platforms = {
                 entity.platform
                 for entity in ent_reg.entities.values()
@@ -371,13 +370,3 @@ class Analytics:
             for entry in entries
             if entry.source != SOURCE_IGNORE and entry.disabled_by is None
         )
-
-
-def _domains_from_yaml_config(yaml_configuration: dict[str, Any]) -> set[str]:
-    """Extract domains from the YAML configuration."""
-    domains = set(yaml_configuration)
-    for platforms in conf_util.extract_platform_integrations(
-        yaml_configuration, BASE_PLATFORMS
-    ).values():
-        domains.update(platforms)
-    return domains

homeassistant/components/androidtv_remote/manifest.json

@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["androidtvremote2"],
-  "requirements": ["androidtvremote2==0.2.2"],
+  "requirements": ["androidtvremote2==0.2.1"],
   "zeroconf": ["_androidtvremote2._tcp.local."]
 }

homeassistant/components/androidtv_remote/strings.json

@@ -51,10 +51,6 @@
           "app_id": "Application ID",
           "app_icon": "Application icon",
           "app_delete": "Check to delete this application"
-        },
-        "data_description": {
-          "app_id": "E.g. com.plexapp.android for https://play.google.com/store/apps/details?id=com.plexapp.android",
-          "app_icon": "Image URL. From the Play Store app page, right click on the icon and select 'Copy image address' and then paste it here. Alternatively, download the image, upload it under /config/www/ and use the URL /local/filename"
         }
       }
     }

homeassistant/components/anthropic/conversation.py

@@ -366,35 +366,15 @@ class AnthropicConversationEntity(
         options = self.entry.options
 
         try:
-            await chat_log.async_provide_llm_data(
-                user_input.as_llm_context(DOMAIN),
+            await chat_log.async_update_llm_data(
+                DOMAIN,
+                user_input,
                 options.get(CONF_LLM_HASS_API),
                 options.get(CONF_PROMPT),
-                user_input.extra_system_prompt,
             )
         except conversation.ConverseError as err:
             return err.as_conversation_result()
 
-        await self._async_handle_chat_log(chat_log)
-
-        response_content = chat_log.content[-1]
-        if not isinstance(response_content, conversation.AssistantContent):
-            raise TypeError("Last message must be an assistant message")
-        intent_response = intent.IntentResponse(language=user_input.language)
-        intent_response.async_set_speech(response_content.content or "")
-        return conversation.ConversationResult(
-            response=intent_response,
-            conversation_id=chat_log.conversation_id,
-            continue_conversation=chat_log.continue_conversation,
-        )
-
-    async def _async_handle_chat_log(
-        self,
-        chat_log: conversation.ChatLog,
-    ) -> None:
-        """Generate an answer for the chat log."""
-        options = self.entry.options
-
         tools: list[ToolParam] | None = None
         if chat_log.llm_api:
             tools = [
@@ -444,7 +424,7 @@ class AnthropicConversationEntity(
                     [
                         content
                         async for content in chat_log.async_add_delta_content_stream(
-                            self.entity_id,
+                            user_input.agent_id,
                             _transform_stream(chat_log, stream, messages),
                         )
                         if not isinstance(content, conversation.AssistantContent)
@@ -455,6 +435,17 @@ class AnthropicConversationEntity(
             if not chat_log.unresponded_tool_results:
                 break
 
+        response_content = chat_log.content[-1]
+        if not isinstance(response_content, conversation.AssistantContent):
+            raise TypeError("Last message must be an assistant message")
+        intent_response = intent.IntentResponse(language=user_input.language)
+        intent_response.async_set_speech(response_content.content or "")
+        return conversation.ConversationResult(
+            response=intent_response,
+            conversation_id=chat_log.conversation_id,
+            continue_conversation=chat_log.continue_conversation,
+        )
+
     async def _async_entry_update_listener(
         self, hass: HomeAssistant, entry: ConfigEntry
     ) -> None:

homeassistant/components/apcupsd/config_flow.py

@@ -46,7 +46,11 @@ class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
             return self.async_show_form(step_id="user", data_schema=_SCHEMA)
 
         host, port = user_input[CONF_HOST], user_input[CONF_PORT]
+
+        # Abort if an entry with same host and port is present.
         self._async_abort_entries_match({CONF_HOST: host, CONF_PORT: port})
+
+        # Test the connection to the host and get the current status for serial number.
         try:
             async with asyncio.timeout(CONNECTION_TIMEOUT):
                 data = APCUPSdData(await aioapcaccess.request_status(host, port))
@@ -63,30 +67,3 @@ class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
 
         title = data.name or data.model or data.serial_no or "APC UPS"
         return self.async_create_entry(title=title, data=user_input)
-
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reconfiguration of an existing entry."""
-
-        if user_input is None:
-            return self.async_show_form(step_id="reconfigure", data_schema=_SCHEMA)
-
-        host, port = user_input[CONF_HOST], user_input[CONF_PORT]
-        self._async_abort_entries_match({CONF_HOST: host, CONF_PORT: port})
-        try:
-            async with asyncio.timeout(CONNECTION_TIMEOUT):
-                data = APCUPSdData(await aioapcaccess.request_status(host, port))
-        except (OSError, asyncio.IncompleteReadError, TimeoutError):
-            errors = {"base": "cannot_connect"}
-            return self.async_show_form(
-                step_id="reconfigure", data_schema=_SCHEMA, errors=errors
-            )
-
-        await self.async_set_unique_id(data.serial_no)
-        self._abort_if_unique_id_mismatch(reason="wrong_apcupsd_daemon")
-
-        return self.async_update_reload_and_abort(
-            self._get_reconfigure_entry(),
-            data_updates=user_input,
-        )

homeassistant/components/apcupsd/sensor.py

@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import (
     PERCENTAGE,
-    EntityCategory,
     UnitOfApparentPower,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
@@ -36,7 +35,6 @@ SENSORS: dict[str, SensorEntityDescription] = {
     "alarmdel": SensorEntityDescription(
         key="alarmdel",
         translation_key="alarm_delay",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "ambtemp": SensorEntityDescription(
         key="ambtemp",
@@ -49,18 +47,15 @@ SENSORS: dict[str, SensorEntityDescription] = {
         key="apc",
         translation_key="apc_status",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "apcmodel": SensorEntityDescription(
         key="apcmodel",
         translation_key="apc_model",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "badbatts": SensorEntityDescription(
         key="badbatts",
         translation_key="bad_batteries",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "battdate": SensorEntityDescription(
         key="battdate",
@@ -87,7 +82,6 @@ SENSORS: dict[str, SensorEntityDescription] = {
         key="cable",
         translation_key="cable_type",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "cumonbatt": SensorEntityDescription(
         key="cumonbatt",
@@ -100,63 +94,52 @@ SENSORS: dict[str, SensorEntityDescription] = {
         key="date",
         translation_key="date",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "dipsw": SensorEntityDescription(
         key="dipsw",
         translation_key="dip_switch_settings",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "dlowbatt": SensorEntityDescription(
         key="dlowbatt",
         translation_key="low_battery_signal",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "driver": SensorEntityDescription(
         key="driver",
         translation_key="driver",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "dshutd": SensorEntityDescription(
         key="dshutd",
         translation_key="shutdown_delay",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "dwake": SensorEntityDescription(
         key="dwake",
         translation_key="wake_delay",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "end apc": SensorEntityDescription(
         key="end apc",
         translation_key="date_and_time",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "extbatts": SensorEntityDescription(
         key="extbatts",
         translation_key="external_batteries",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "firmware": SensorEntityDescription(
         key="firmware",
         translation_key="firmware_version",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "hitrans": SensorEntityDescription(
         key="hitrans",
         translation_key="transfer_high",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "hostname": SensorEntityDescription(
         key="hostname",
         translation_key="hostname",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "humidity": SensorEntityDescription(
         key="humidity",
@@ -180,12 +163,10 @@ SENSORS: dict[str, SensorEntityDescription] = {
         key="lastxfer",
         translation_key="last_transfer",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "linefail": SensorEntityDescription(
         key="linefail",
         translation_key="line_failure",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "linefreq": SensorEntityDescription(
         key="linefreq",
@@ -217,18 +198,15 @@ SENSORS: dict[str, SensorEntityDescription] = {
         translation_key="transfer_low",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "mandate": SensorEntityDescription(
         key="mandate",
         translation_key="manufacture_date",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "masterupd": SensorEntityDescription(
         key="masterupd",
         translation_key="master_update",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "maxlinev": SensorEntityDescription(
         key="maxlinev",
@@ -239,13 +217,11 @@ SENSORS: dict[str, SensorEntityDescription] = {
     "maxtime": SensorEntityDescription(
         key="maxtime",
         translation_key="max_time",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "mbattchg": SensorEntityDescription(
         key="mbattchg",
         translation_key="max_battery_charge",
         native_unit_of_measurement=PERCENTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "minlinev": SensorEntityDescription(
         key="minlinev",
@@ -256,48 +232,41 @@ SENSORS: dict[str, SensorEntityDescription] = {
     "mintimel": SensorEntityDescription(
         key="mintimel",
         translation_key="min_time",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "model": SensorEntityDescription(
         key="model",
         translation_key="model",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "nombattv": SensorEntityDescription(
         key="nombattv",
         translation_key="battery_nominal_voltage",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "nominv": SensorEntityDescription(
         key="nominv",
         translation_key="nominal_input_voltage",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "nomoutv": SensorEntityDescription(
         key="nomoutv",
         translation_key="nominal_output_voltage",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "nompower": SensorEntityDescription(
         key="nompower",
         translation_key="nominal_output_power",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "nomapnt": SensorEntityDescription(
         key="nomapnt",
         translation_key="nominal_apparent_power",
         native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
         device_class=SensorDeviceClass.APPARENT_POWER,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "numxfers": SensorEntityDescription(
         key="numxfers",
@@ -322,25 +291,21 @@ SENSORS: dict[str, SensorEntityDescription] = {
         key="reg1",
         translation_key="register_1_fault",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "reg2": SensorEntityDescription(
         key="reg2",
         translation_key="register_2_fault",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "reg3": SensorEntityDescription(
         key="reg3",
         translation_key="register_3_fault",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "retpct": SensorEntityDescription(
         key="retpct",
         translation_key="restore_capacity",
         native_unit_of_measurement=PERCENTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "selftest": SensorEntityDescription(
         key="selftest",
@@ -350,24 +315,20 @@ SENSORS: dict[str, SensorEntityDescription] = {
         key="sense",
         translation_key="sensitivity",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "serialno": SensorEntityDescription(
         key="serialno",
         translation_key="serial_number",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "starttime": SensorEntityDescription(
         key="starttime",
         translation_key="startup_time",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "statflag": SensorEntityDescription(
         key="statflag",
         translation_key="online_status",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "status": SensorEntityDescription(
         key="status",
@@ -376,7 +337,6 @@ SENSORS: dict[str, SensorEntityDescription] = {
     "stesti": SensorEntityDescription(
         key="stesti",
         translation_key="self_test_interval",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "timeleft": SensorEntityDescription(
         key="timeleft",
@@ -400,28 +360,23 @@ SENSORS: dict[str, SensorEntityDescription] = {
         key="upsname",
         translation_key="ups_name",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "version": SensorEntityDescription(
         key="version",
         translation_key="version",
         entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "xoffbat": SensorEntityDescription(
         key="xoffbat",
         translation_key="transfer_from_battery",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "xoffbatt": SensorEntityDescription(
         key="xoffbatt",
         translation_key="transfer_from_battery",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "xonbatt": SensorEntityDescription(
         key="xonbatt",
         translation_key="transfer_to_battery",
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
 }
 

homeassistant/components/apcupsd/strings.json

@@ -1,9 +1,7 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "wrong_apcupsd_daemon": "The reconfigured APC UPS Daemon is not the same as the one already configured.",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"

homeassistant/components/aprilaire/humidifier.py

@@ -62,8 +62,6 @@ async def async_setup_entry(
                 target_humidity_key=Attribute.HUMIDIFICATION_SETPOINT,
                 min_humidity=10,
                 max_humidity=50,
-                auto_status_key=Attribute.HUMIDIFICATION_AVAILABLE,
-                auto_status_value=1,
                 default_humidity=30,
                 set_humidity_fn=coordinator.client.set_humidification_setpoint,
             )
@@ -79,8 +77,6 @@ async def async_setup_entry(
                 action_map=DEHUMIDIFIER_ACTION_MAP,
                 current_humidity_key=Attribute.INDOOR_HUMIDITY_CONTROLLING_SENSOR_VALUE,
                 target_humidity_key=Attribute.DEHUMIDIFICATION_SETPOINT,
-                auto_status_key=None,
-                auto_status_value=None,
                 min_humidity=40,
                 max_humidity=90,
                 default_humidity=60,
@@ -104,8 +100,6 @@ class AprilaireHumidifierDescription(HumidifierEntityDescription):
     target_humidity_key: str
     min_humidity: int
     max_humidity: int
-    auto_status_key: str | None
-    auto_status_value: int | None
     default_humidity: int
     set_humidity_fn: Callable[[int], Awaitable]
 
@@ -169,31 +163,14 @@ class AprilaireHumidifierEntity(BaseAprilaireEntity, HumidifierEntity):
     def min_humidity(self) -> float:
         """Return the minimum humidity."""
 
-        if self.is_auto_humidity_mode():
-            return 1
-
         return self.entity_description.min_humidity
 
     @property
     def max_humidity(self) -> float:
         """Return the maximum humidity."""
 
-        if self.is_auto_humidity_mode():
-            return 7
-
         return self.entity_description.max_humidity
 
-    def is_auto_humidity_mode(self) -> bool:
-        """Return whether the humidifier is in auto mode."""
-
-        if self.entity_description.auto_status_key is None:
-            return False
-
-        return (
-            self.coordinator.data.get(self.entity_description.auto_status_key)
-            == self.entity_description.auto_status_value
-        )
-
     async def async_set_humidity(self, humidity: int) -> None:
         """Set the humidity."""
 

homeassistant/components/aprilaire/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["pyaprilaire"],
-  "requirements": ["pyaprilaire==0.9.1"]
+  "requirements": ["pyaprilaire==0.9.0"]
 }

homeassistant/components/apsystems/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["APsystemsEZ1"],
-  "requirements": ["apsystems-ez1==2.7.0"]
+  "requirements": ["apsystems-ez1==2.6.0"]
 }

homeassistant/components/aquacell/icons.json

@@ -1,9 +1,6 @@
 {
   "entity": {
     "sensor": {
-      "last_update": {
-        "default": "mdi:update"
-      },
       "salt_left_side_percentage": {
         "default": "mdi:basket-fill"
       },

homeassistant/components/aquacell/sensor.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from datetime import datetime
 
 from aioaquacell import Softener
 
@@ -29,7 +28,7 @@ PARALLEL_UPDATES = 1
 class SoftenerSensorEntityDescription(SensorEntityDescription):
     """Describes Softener sensor entity."""
 
-    value_fn: Callable[[Softener], StateType | datetime]
+    value_fn: Callable[[Softener], StateType]
 
 
 SENSORS: tuple[SoftenerSensorEntityDescription, ...] = (
@@ -78,12 +77,6 @@ SENSORS: tuple[SoftenerSensorEntityDescription, ...] = (
             "low",
         ],
     ),
-    SoftenerSensorEntityDescription(
-        key="last_update",
-        translation_key="last_update",
-        device_class=SensorDeviceClass.TIMESTAMP,
-        value_fn=lambda softener: softener.lastUpdate,
-    ),
 )
 
 
@@ -118,6 +111,6 @@ class SoftenerSensor(AquacellEntity, SensorEntity):
         self.entity_description = description
 
     @property
-    def native_value(self) -> StateType | datetime:
+    def native_value(self) -> StateType:
         """Return the state of the sensor."""
         return self.entity_description.value_fn(self.softener)

homeassistant/components/aquacell/strings.json

@@ -21,9 +21,6 @@
   },
   "entity": {
     "sensor": {
-      "last_update": {
-        "name": "Last update"
-      },
       "salt_left_side_percentage": {
         "name": "Salt left side percentage"
       },

homeassistant/components/aruba/device_tracker.py

@@ -89,7 +89,7 @@ class ArubaDeviceScanner(DeviceScanner):
     def get_aruba_data(self) -> dict[str, dict[str, str]] | None:
         """Retrieve data from Aruba Access Point and return parsed result."""
 
-        connect = f"ssh {self.username}@{self.host}"
+        connect = f"ssh {self.username}@{self.host} -o HostKeyAlgorithms=ssh-rsa"
         ssh: pexpect.spawn[str] = pexpect.spawn(connect, encoding="utf-8")
         query = ssh.expect(
             [

homeassistant/components/assist_pipeline/pipeline.py

@@ -1178,60 +1178,32 @@ class PipelineRun:
                 if role := delta.get("role"):
                     chat_log_role = role
 
-                # We are only interested in assistant deltas
-                if chat_log_role != "assistant":
+                # We are only interested in assistant deltas with content
+                if chat_log_role != "assistant" or not (
+                    content := delta.get("content")
+                ):
                     return
 
-                if content := delta.get("content"):
-                    tts_input_stream.put_nowait(content)
+                tts_input_stream.put_nowait(content)
 
                 if self._streamed_response_text:
                     return
 
                 nonlocal delta_character_count
 
-                # Streamed responses are not cached. That's why we only start streaming text after
-                # we have received enough characters that indicates it will be a long response
-                # or if we have received text, and then a tool call.
-
-                # Tool call after we already received text
-                start_streaming = delta_character_count > 0 and delta.get("tool_calls")
-
-                # Count characters in the content and test if we exceed streaming threshold
-                if not start_streaming and content:
-                    delta_character_count += len(content)
-                    start_streaming = delta_character_count > STREAM_RESPONSE_CHARS
-
-                if not start_streaming:
+                delta_character_count += len(content)
+                if delta_character_count < STREAM_RESPONSE_CHARS:
                     return
 
+                # Streamed responses are not cached. We only start streaming text after
+                # we have received a couple of words that indicates it will be a long response.
                 self._streamed_response_text = True
 
-                self.process_event(
-                    PipelineEvent(
-                        PipelineEventType.INTENT_PROGRESS,
-                        {
-                            "tts_start_streaming": True,
-                        },
-                    )
-                )
-
                 async def tts_input_stream_generator() -> AsyncGenerator[str]:
                     """Yield TTS input stream."""
                     while (tts_input := await tts_input_stream.get()) is not None:
                         yield tts_input
 
-                # Concatenate all existing queue items
-                parts = []
-                while not tts_input_stream.empty():
-                    parts.append(tts_input_stream.get_nowait())
-                tts_input_stream.put_nowait(
-                    "".join(
-                        # At this point parts is only strings, None indicates end of queue
-                        cast(list[str], parts)
-                    )
-                )
-
                 assert self.tts_stream is not None
                 self.tts_stream.async_set_message_stream(tts_input_stream_generator())
 

homeassistant/components/assist_satellite/__init__.py

@@ -1,23 +1,13 @@
 """Base class for assist satellite entities."""
 
-from dataclasses import asdict
 import logging
 from pathlib import Path
-from typing import Any
 
-from hassil.util import (
-    PUNCTUATION_END,
-    PUNCTUATION_END_WORD,
-    PUNCTUATION_START,
-    PUNCTUATION_START_WORD,
-)
 import voluptuous as vol
 
 from homeassistant.components.http import StaticPathConfig
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant, ServiceCall, SupportsResponse
-from homeassistant.exceptions import HomeAssistantError
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType
@@ -33,7 +23,6 @@ from .const import (
 )
 from .entity import (
     AssistSatelliteAnnouncement,
-    AssistSatelliteAnswer,
     AssistSatelliteConfiguration,
     AssistSatelliteEntity,
     AssistSatelliteEntityDescription,
@@ -45,7 +34,6 @@ from .websocket_api import async_register_websocket_api
 __all__ = [
     "DOMAIN",
     "AssistSatelliteAnnouncement",
-    "AssistSatelliteAnswer",
     "AssistSatelliteConfiguration",
     "AssistSatelliteEntity",
     "AssistSatelliteEntityDescription",
@@ -98,62 +86,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         "async_internal_start_conversation",
         [AssistSatelliteEntityFeature.START_CONVERSATION],
     )
-
-    async def handle_ask_question(call: ServiceCall) -> dict[str, Any]:
-        """Handle a Show View service call."""
-        satellite_entity_id: str = call.data[ATTR_ENTITY_ID]
-        satellite_entity: AssistSatelliteEntity | None = component.get_entity(
-            satellite_entity_id
-        )
-        if satellite_entity is None:
-            raise HomeAssistantError(
-                f"Invalid Assist satellite entity id: {satellite_entity_id}"
-            )
-
-        ask_question_args = {
-            "question": call.data.get("question"),
-            "question_media_id": call.data.get("question_media_id"),
-            "preannounce": call.data.get("preannounce", False),
-            "answers": call.data.get("answers"),
-        }
-
-        if preannounce_media_id := call.data.get("preannounce_media_id"):
-            ask_question_args["preannounce_media_id"] = preannounce_media_id
-
-        answer = await satellite_entity.async_internal_ask_question(**ask_question_args)
-
-        if answer is None:
-            raise HomeAssistantError("No answer from satellite")
-
-        return asdict(answer)
-
-    hass.services.async_register(
-        domain=DOMAIN,
-        service="ask_question",
-        service_func=handle_ask_question,
-        schema=vol.All(
-            {
-                vol.Required(ATTR_ENTITY_ID): cv.entity_id,
-                vol.Optional("question"): str,
-                vol.Optional("question_media_id"): str,
-                vol.Optional("preannounce"): bool,
-                vol.Optional("preannounce_media_id"): str,
-                vol.Optional("answers"): [
-                    {
-                        vol.Required("id"): str,
-                        vol.Required("sentences"): vol.All(
-                            cv.ensure_list,
-                            [cv.string],
-                            has_one_non_empty_item,
-                            has_no_punctuation,
-                        ),
-                    }
-                ],
-            },
-            cv.has_at_least_one_key("question", "question_media_id"),
-        ),
-        supports_response=SupportsResponse.ONLY,
-    )
     hass.data[CONNECTION_TEST_DATA] = {}
     async_register_websocket_api(hass)
     hass.http.register_view(ConnectionTestView())
@@ -178,29 +110,3 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.data[DATA_COMPONENT].async_unload_entry(entry)
-
-
-def has_no_punctuation(value: list[str]) -> list[str]:
-    """Validate result does not contain punctuation."""
-    for sentence in value:
-        if (
-            PUNCTUATION_START.search(sentence)
-            or PUNCTUATION_END.search(sentence)
-            or PUNCTUATION_START_WORD.search(sentence)
-            or PUNCTUATION_END_WORD.search(sentence)
-        ):
-            raise vol.Invalid("sentence should not contain punctuation")
-
-    return value
-
-
-def has_one_non_empty_item(value: list[str]) -> list[str]:
-    """Validate result has at least one item."""
-    if len(value) < 1:
-        raise vol.Invalid("at least one sentence is required")
-
-    for sentence in value:
-        if not sentence:
-            raise vol.Invalid("sentences cannot be empty")
-
-    return value

homeassistant/components/assist_satellite/entity.py

@@ -4,16 +4,12 @@ from abc import abstractmethod
 import asyncio
 from collections.abc import AsyncIterable
 import contextlib
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from enum import StrEnum
 import logging
 import time
 from typing import Any, Literal, final
 
-from hassil import Intents, recognize
-from hassil.expression import Expression, ListReference, Sequence
-from hassil.intents import WildcardSlotList
-
 from homeassistant.components import conversation, media_source, stt, tts
 from homeassistant.components.assist_pipeline import (
     OPTION_PREFERRED,
@@ -109,20 +105,6 @@ class AssistSatelliteAnnouncement:
     """Media ID to be played before announcement."""
 
 
-@dataclass
-class AssistSatelliteAnswer:
-    """Answer to a question."""
-
-    id: str | None
-    """Matched answer id or None if no answer was matched."""
-
-    sentence: str
-    """Raw sentence text from user response."""
-
-    slots: dict[str, Any] = field(default_factory=dict)
-    """Matched slots from answer."""
-
-
 class AssistSatelliteEntity(entity.Entity):
     """Entity encapsulating the state and functionality of an Assist satellite."""
 
@@ -138,10 +120,8 @@ class AssistSatelliteEntity(entity.Entity):
     _is_announcing = False
     _extra_system_prompt: str | None = None
     _wake_word_intercept_future: asyncio.Future[str | None] | None = None
-    _stt_intercept_future: asyncio.Future[str | None] | None = None
     _attr_tts_options: dict[str, Any] | None = None
     _pipeline_task: asyncio.Task | None = None
-    _ask_question_future: asyncio.Future[str | None] | None = None
 
     __assist_satellite_state = AssistSatelliteState.IDLE
 
@@ -329,112 +309,6 @@ class AssistSatelliteEntity(entity.Entity):
         """Start a conversation from the satellite."""
         raise NotImplementedError
 
-    async def async_internal_ask_question(
-        self,
-        question: str | None = None,
-        question_media_id: str | None = None,
-        preannounce: bool = True,
-        preannounce_media_id: str = PREANNOUNCE_URL,
-        answers: list[dict[str, Any]] | None = None,
-    ) -> AssistSatelliteAnswer | None:
-        """Ask a question and get a user's response from the satellite.
-
-        If question_media_id is not provided, question is synthesized to audio
-        with the selected pipeline.
-
-        If question_media_id is provided, it is played directly. It is possible
-        to omit the message and the satellite will not show any text.
-
-        If preannounce is True, a sound is played before the start message or media.
-        If preannounce_media_id is provided, it overrides the default sound.
-
-        Calls async_start_conversation.
-        """
-        await self._cancel_running_pipeline()
-
-        if question is None:
-            question = ""
-
-        announcement = await self._resolve_announcement_media_id(
-            question,
-            question_media_id,
-            preannounce_media_id=preannounce_media_id if preannounce else None,
-        )
-
-        if self._is_announcing:
-            raise SatelliteBusyError
-
-        self._is_announcing = True
-        self._set_state(AssistSatelliteState.RESPONDING)
-        self._ask_question_future = asyncio.Future()
-
-        try:
-            # Wait for announcement to finish
-            await self.async_start_conversation(announcement)
-
-            # Wait for response text
-            response_text = await self._ask_question_future
-            if response_text is None:
-                raise HomeAssistantError("No answer from question")
-
-            if not answers:
-                return AssistSatelliteAnswer(id=None, sentence=response_text)
-
-            return self._question_response_to_answer(response_text, answers)
-        finally:
-            self._is_announcing = False
-            self._set_state(AssistSatelliteState.IDLE)
-            self._ask_question_future = None
-
-    def _question_response_to_answer(
-        self, response_text: str, answers: list[dict[str, Any]]
-    ) -> AssistSatelliteAnswer:
-        """Match text to a pre-defined set of answers."""
-
-        # Build intents and match
-        intents = Intents.from_dict(
-            {
-                "language": self.hass.config.language,
-                "intents": {
-                    "QuestionIntent": {
-                        "data": [
-                            {
-                                "sentences": answer["sentences"],
-                                "metadata": {"answer_id": answer["id"]},
-                            }
-                            for answer in answers
-                        ]
-                    }
-                },
-            }
-        )
-
-        # Assume slot list references are wildcards
-        wildcard_names: set[str] = set()
-        for intent in intents.intents.values():
-            for intent_data in intent.data:
-                for sentence in intent_data.sentences:
-                    _collect_list_references(sentence, wildcard_names)
-
-        for wildcard_name in wildcard_names:
-            intents.slot_lists[wildcard_name] = WildcardSlotList(wildcard_name)
-
-        # Match response text
-        result = recognize(response_text, intents)
-        if result is None:
-            # No match
-            return AssistSatelliteAnswer(id=None, sentence=response_text)
-
-        assert result.intent_metadata
-        return AssistSatelliteAnswer(
-            id=result.intent_metadata["answer_id"],
-            sentence=response_text,
-            slots={
-                entity_name: entity.value
-                for entity_name, entity in result.entities.items()
-            },
-        )
-
     async def async_accept_pipeline_from_satellite(
         self,
         audio_stream: AsyncIterable[bytes],
@@ -477,11 +351,6 @@ class AssistSatelliteEntity(entity.Entity):
             self._internal_on_pipeline_event(PipelineEvent(PipelineEventType.RUN_END))
             return
 
-        if (self._ask_question_future is not None) and (
-            start_stage == PipelineStage.STT
-        ):
-            end_stage = PipelineStage.STT
-
         device_id = self.registry_entry.device_id if self.registry_entry else None
 
         # Refresh context if necessary
@@ -564,16 +433,6 @@ class AssistSatelliteEntity(entity.Entity):
                 self._set_state(AssistSatelliteState.IDLE)
         elif event.type is PipelineEventType.STT_START:
             self._set_state(AssistSatelliteState.LISTENING)
-        elif event.type is PipelineEventType.STT_END:
-            # Intercepting text for ask question
-            if (
-                (self._ask_question_future is not None)
-                and (not self._ask_question_future.done())
-                and event.data
-            ):
-                self._ask_question_future.set_result(
-                    event.data.get("stt_output", {}).get("text")
-                )
         elif event.type is PipelineEventType.INTENT_START:
             self._set_state(AssistSatelliteState.PROCESSING)
         elif event.type is PipelineEventType.TTS_START:
@@ -584,12 +443,6 @@ class AssistSatelliteEntity(entity.Entity):
             if not self._run_has_tts:
                 self._set_state(AssistSatelliteState.IDLE)
 
-            if (self._ask_question_future is not None) and (
-                not self._ask_question_future.done()
-            ):
-                # No text for ask question
-                self._ask_question_future.set_result(None)
-
         self.on_pipeline_event(event)
 
     @callback
@@ -724,15 +577,3 @@ class AssistSatelliteEntity(entity.Entity):
             media_id_source=media_id_source,
             preannounce_media_id=preannounce_media_id,
         )
-
-
-def _collect_list_references(expression: Expression, list_names: set[str]) -> None:
-    """Collect list reference names recursively."""
-    if isinstance(expression, Sequence):
-        seq: Sequence = expression
-        for item in seq.items:
-            _collect_list_references(item, list_names)
-    elif isinstance(expression, ListReference):
-        # {list}
-        list_ref: ListReference = expression
-        list_names.add(list_ref.slot_name)

homeassistant/components/assist_satellite/icons.json

@@ -10,9 +10,6 @@
     },
     "start_conversation": {
       "service": "mdi:forum"
-    },
-    "ask_question": {
-      "service": "mdi:microphone-question"
     }
   }
 }

homeassistant/components/assist_satellite/manifest.json

@@ -5,6 +5,5 @@
   "dependencies": ["assist_pipeline", "http", "stt", "tts"],
   "documentation": "https://www.home-assistant.io/integrations/assist_satellite",
   "integration_type": "entity",
-  "quality_scale": "internal",
-  "requirements": ["hassil==2.2.3"]
+  "quality_scale": "internal"
 }

homeassistant/components/assist_satellite/services.yaml

@@ -54,35 +54,3 @@ start_conversation:
       required: false
       selector:
         text:
-ask_question:
-  fields:
-    entity_id:
-      required: true
-      selector:
-        entity:
-          domain: assist_satellite
-          supported_features:
-            - assist_satellite.AssistSatelliteEntityFeature.START_CONVERSATION
-    question:
-      required: false
-      example: "What kind of music would you like to play?"
-      default: ""
-      selector:
-        text:
-    question_media_id:
-      required: false
-      selector:
-        text:
-    preannounce:
-      required: false
-      default: true
-      selector:
-        boolean:
-    preannounce_media_id:
-      required: false
-      selector:
-        text:
-    answers:
-      required: false
-      selector:
-        object:

homeassistant/components/assist_satellite/strings.json

@@ -59,36 +59,6 @@
           "description": "Custom media ID to play before the start message or media."
         }
       }
-    },
-    "ask_question": {
-      "name": "Ask question",
-      "description": "Asks a question and gets the user's response.",
-      "fields": {
-        "entity_id": {
-          "name": "Entity",
-          "description": "Assist satellite entity to ask the question on."
-        },
-        "question": {
-          "name": "Question",
-          "description": "The question to ask."
-        },
-        "question_media_id": {
-          "name": "Question media ID",
-          "description": "The media ID of the question to use instead of text-to-speech."
-        },
-        "preannounce": {
-          "name": "Preannounce",
-          "description": "Play a sound before the start message or media."
-        },
-        "preannounce_media_id": {
-          "name": "Preannounce media ID",
-          "description": "Custom media ID to play before the start message or media."
-        },
-        "answers": {
-          "name": "Answers",
-          "description": "Possible answers to the question."
-        }
-      }
     }
   }
 }

homeassistant/components/atag/water_heater.py

@@ -6,7 +6,6 @@ from homeassistant.components.water_heater import (
     STATE_ECO,
     STATE_PERFORMANCE,
     WaterHeaterEntity,
-    WaterHeaterEntityFeature,
 )
 from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant
@@ -33,7 +32,6 @@ class AtagWaterHeater(AtagEntity, WaterHeaterEntity):
     """Representation of an ATAG water heater."""
 
     _attr_operation_list = OPERATION_LIST
-    _attr_supported_features = WaterHeaterEntityFeature.TARGET_TEMPERATURE
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
     @property

homeassistant/components/automation/helpers.py

@@ -12,7 +12,7 @@ DATA_BLUEPRINTS = "automation_blueprints"
 
 def _blueprint_in_use(hass: HomeAssistant, blueprint_path: str) -> bool:
     """Return True if any automation references the blueprint."""
-    from . import automations_with_blueprint  # noqa: PLC0415
+    from . import automations_with_blueprint  # pylint: disable=import-outside-toplevel
 
     return len(automations_with_blueprint(hass, blueprint_path)) > 0
 
@@ -28,7 +28,8 @@ async def _reload_blueprint_automations(
 @callback
 def async_get_blueprints(hass: HomeAssistant) -> blueprint.DomainBlueprints:
     """Get automation blueprints."""
-    from .config import AUTOMATION_BLUEPRINT_SCHEMA  # noqa: PLC0415
+    # pylint: disable-next=import-outside-toplevel
+    from .config import AUTOMATION_BLUEPRINT_SCHEMA
 
     return blueprint.DomainBlueprints(
         hass,

homeassistant/components/axis/hub/hub.py

@@ -11,7 +11,7 @@ from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, format_mac
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
-from ..const import ATTR_MANUFACTURER, DOMAIN
+from ..const import ATTR_MANUFACTURER, DOMAIN as AXIS_DOMAIN
 from .config import AxisConfig
 from .entity_loader import AxisEntityLoader
 from .event_source import AxisEventSource
@@ -79,7 +79,7 @@ class AxisHub:
             config_entry_id=self.config.entry.entry_id,
             configuration_url=self.api.config.url,
             connections={(CONNECTION_NETWORK_MAC, self.unique_id)},
-            identifiers={(DOMAIN, self.unique_id)},
+            identifiers={(AXIS_DOMAIN, self.unique_id)},
             manufacturer=ATTR_MANUFACTURER,
             model=f"{self.config.model} {self.product_type}",
             name=self.config.name,

homeassistant/components/backup/__init__.py

@@ -94,10 +94,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     if not with_hassio:
         reader_writer = CoreBackupReaderWriter(hass)
     else:
-        # pylint: disable-next=hass-component-root-import
-        from homeassistant.components.hassio.backup import (  # noqa: PLC0415
-            SupervisorBackupReaderWriter,
-        )
+        # pylint: disable-next=import-outside-toplevel, hass-component-root-import
+        from homeassistant.components.hassio.backup import SupervisorBackupReaderWriter
 
         reader_writer = SupervisorBackupReaderWriter(hass)
 

homeassistant/components/backup/manager.py

@@ -62,7 +62,6 @@ from .const import (
     LOGGER,
 )
 from .models import (
-    AddonInfo,
     AgentBackup,
     BackupError,
     BackupManagerError,
@@ -103,9 +102,7 @@ class ManagerBackup(BaseBackup):
     """Backup class."""
 
     agents: dict[str, AgentBackupStatus]
-    failed_addons: list[AddonInfo]
     failed_agent_ids: list[str]
-    failed_folders: list[Folder]
     with_automatic_settings: bool | None
 
 
@@ -113,7 +110,7 @@ class ManagerBackup(BaseBackup):
 class AddonErrorData:
     """Addon error class."""
 
-    addon: AddonInfo
+    name: str
     errors: list[tuple[str, str]]
 
 
@@ -649,13 +646,9 @@ class BackupManager:
             for agent_backup in result:
                 if (backup_id := agent_backup.backup_id) not in backups:
                     if known_backup := self.known_backups.get(backup_id):
-                        failed_addons = known_backup.failed_addons
                         failed_agent_ids = known_backup.failed_agent_ids
-                        failed_folders = known_backup.failed_folders
                     else:
-                        failed_addons = []
                         failed_agent_ids = []
-                        failed_folders = []
                     with_automatic_settings = self.is_our_automatic_backup(
                         agent_backup, await instance_id.async_get(self.hass)
                     )
@@ -666,9 +659,7 @@ class BackupManager:
                         date=agent_backup.date,
                         database_included=agent_backup.database_included,
                         extra_metadata=agent_backup.extra_metadata,
-                        failed_addons=failed_addons,
                         failed_agent_ids=failed_agent_ids,
-                        failed_folders=failed_folders,
                         folders=agent_backup.folders,
                         homeassistant_included=agent_backup.homeassistant_included,
                         homeassistant_version=agent_backup.homeassistant_version,
@@ -723,13 +714,9 @@ class BackupManager:
                 continue
             if backup is None:
                 if known_backup := self.known_backups.get(backup_id):
-                    failed_addons = known_backup.failed_addons
                     failed_agent_ids = known_backup.failed_agent_ids
-                    failed_folders = known_backup.failed_folders
                 else:
-                    failed_addons = []
                     failed_agent_ids = []
-                    failed_folders = []
                 with_automatic_settings = self.is_our_automatic_backup(
                     result, await instance_id.async_get(self.hass)
                 )
@@ -740,9 +727,7 @@ class BackupManager:
                     date=result.date,
                     database_included=result.database_included,
                     extra_metadata=result.extra_metadata,
-                    failed_addons=failed_addons,
                     failed_agent_ids=failed_agent_ids,
-                    failed_folders=failed_folders,
                     folders=result.folders,
                     homeassistant_included=result.homeassistant_included,
                     homeassistant_version=result.homeassistant_version,
@@ -985,7 +970,7 @@ class BackupManager:
             password=None,
         )
         await written_backup.release_stream()
-        self.known_backups.add(written_backup.backup, agent_errors, {}, {}, [])
+        self.known_backups.add(written_backup.backup, agent_errors, [])
         return written_backup.backup.backup_id
 
     async def async_create_backup(
@@ -1223,11 +1208,7 @@ class BackupManager:
             finally:
                 await written_backup.release_stream()
             self.known_backups.add(
-                written_backup.backup,
-                agent_errors,
-                written_backup.addon_errors,
-                written_backup.folder_errors,
-                unavailable_agents,
+                written_backup.backup, agent_errors, unavailable_agents
             )
             if not agent_errors:
                 if with_automatic_settings:
@@ -1435,12 +1416,7 @@ class BackupManager:
             # No issues with agents or folders, but issues with add-ons
             self._create_automatic_backup_failed_issue(
                 "automatic_backup_failed_addons",
-                {
-                    "failed_addons": ", ".join(
-                        val.addon.name or val.addon.slug
-                        for val in addon_errors.values()
-                    )
-                },
+                {"failed_addons": ", ".join(val.name for val in addon_errors.values())},
             )
         elif folder_errors and not (failed_agents or addon_errors):
             # No issues with agents or add-ons, but issues with folders
@@ -1455,11 +1431,7 @@ class BackupManager:
                 {
                     "failed_agents": ", ".join(failed_agents) or "-",
                     "failed_addons": (
-                        ", ".join(
-                            val.addon.name or val.addon.slug
-                            for val in addon_errors.values()
-                        )
-                        or "-"
+                        ", ".join(val.name for val in addon_errors.values()) or "-"
                     ),
                     "failed_folders": ", ".join(f for f in folder_errors) or "-",
                 },
@@ -1529,12 +1501,7 @@ class KnownBackups:
         self._backups = {
             backup["backup_id"]: KnownBackup(
                 backup_id=backup["backup_id"],
-                failed_addons=[
-                    AddonInfo(name=a["name"], slug=a["slug"], version=a["version"])
-                    for a in backup["failed_addons"]
-                ],
                 failed_agent_ids=backup["failed_agent_ids"],
-                failed_folders=[Folder(f) for f in backup["failed_folders"]],
             )
             for backup in stored_backups
         }
@@ -1547,16 +1514,12 @@ class KnownBackups:
         self,
         backup: AgentBackup,
         agent_errors: dict[str, Exception],
-        failed_addons: dict[str, AddonErrorData],
-        failed_folders: dict[Folder, list[tuple[str, str]]],
         unavailable_agents: list[str],
     ) -> None:
         """Add a backup."""
         self._backups[backup.backup_id] = KnownBackup(
             backup_id=backup.backup_id,
-            failed_addons=[val.addon for val in failed_addons.values()],
             failed_agent_ids=list(chain(agent_errors, unavailable_agents)),
-            failed_folders=list(failed_folders),
         )
         self._manager.store.save()
 
@@ -1577,38 +1540,21 @@ class KnownBackup:
     """Persistent backup data."""
 
     backup_id: str
-    failed_addons: list[AddonInfo]
     failed_agent_ids: list[str]
-    failed_folders: list[Folder]
 
     def to_dict(self) -> StoredKnownBackup:
         """Convert known backup to a dict."""
         return {
             "backup_id": self.backup_id,
-            "failed_addons": [
-                {"name": a.name, "slug": a.slug, "version": a.version}
-                for a in self.failed_addons
-            ],
             "failed_agent_ids": self.failed_agent_ids,
-            "failed_folders": [f.value for f in self.failed_folders],
         }
 
 
-class StoredAddonInfo(TypedDict):
-    """Stored add-on info."""
-
-    name: str | None
-    slug: str
-    version: str | None
-
-
 class StoredKnownBackup(TypedDict):
     """Stored persistent backup data."""
 
     backup_id: str
-    failed_addons: list[StoredAddonInfo]
     failed_agent_ids: list[str]
-    failed_folders: list[str]
 
 
 class CoreBackupReaderWriter(BackupReaderWriter):

homeassistant/components/backup/models.py

@@ -13,9 +13,9 @@ from homeassistant.exceptions import HomeAssistantError
 class AddonInfo:
     """Addon information."""
 
-    name: str | None
+    name: str
     slug: str
-    version: str | None
+    version: str
 
 
 class Folder(StrEnum):

homeassistant/components/backup/store.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 STORE_DELAY_SAVE = 30
 STORAGE_KEY = DOMAIN
 STORAGE_VERSION = 1
-STORAGE_VERSION_MINOR = 7
+STORAGE_VERSION_MINOR = 6
 
 
 class StoredBackupData(TypedDict):
@@ -76,11 +76,6 @@ class _BackupStore(Store[StoredBackupData]):
                 # Version 1.6 adds agent retention settings
                 for agent in data["config"]["agents"]:
                     data["config"]["agents"][agent]["retention"] = None
-            if old_minor_version < 7:
-                # Version 1.7 adds failing addons and folders
-                for backup in data["backups"]:
-                    backup["failed_addons"] = []
-                    backup["failed_folders"] = []
 
         # Note: We allow reading data with major version 2 in which the unused key
         # data["config"]["schedule"]["state"] will be removed. The bump to 2 is

homeassistant/components/blink/__init__.py

@@ -25,7 +25,7 @@ from homeassistant.helpers.typing import ConfigType
 
 from .const import DEFAULT_SCAN_INTERVAL, DOMAIN, PLATFORMS
 from .coordinator import BlinkConfigEntry, BlinkUpdateCoordinator
-from .services import async_setup_services
+from .services import setup_services
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -72,7 +72,7 @@ async def async_migrate_entry(hass: HomeAssistant, entry: BlinkConfigEntry) -> b
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Blink."""
 
-    async_setup_services(hass)
+    setup_services(hass)
 
     return True
 

homeassistant/components/blink/services.py

@@ -6,7 +6,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_PIN
-from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv
 
@@ -21,36 +21,34 @@ SERVICE_SEND_PIN_SCHEMA = vol.Schema(
 )
 
 
-async def _send_pin(call: ServiceCall) -> None:
-    """Call blink to send new pin."""
-    config_entry: BlinkConfigEntry | None
-    for entry_id in call.data[ATTR_CONFIG_ENTRY_ID]:
-        if not (config_entry := call.hass.config_entries.async_get_entry(entry_id)):
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="integration_not_found",
-                translation_placeholders={"target": DOMAIN},
-            )
-        if config_entry.state != ConfigEntryState.LOADED:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="not_loaded",
-                translation_placeholders={"target": config_entry.title},
-            )
-        coordinator = config_entry.runtime_data
-        await coordinator.api.auth.send_auth_key(
-            coordinator.api,
-            call.data[CONF_PIN],
-        )
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
+def setup_services(hass: HomeAssistant) -> None:
     """Set up the services for the Blink integration."""
 
+    async def send_pin(call: ServiceCall):
+        """Call blink to send new pin."""
+        config_entry: BlinkConfigEntry | None
+        for entry_id in call.data[ATTR_CONFIG_ENTRY_ID]:
+            if not (config_entry := hass.config_entries.async_get_entry(entry_id)):
+                raise ServiceValidationError(
+                    translation_domain=DOMAIN,
+                    translation_key="integration_not_found",
+                    translation_placeholders={"target": DOMAIN},
+                )
+            if config_entry.state != ConfigEntryState.LOADED:
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN,
+                    translation_key="not_loaded",
+                    translation_placeholders={"target": config_entry.title},
+                )
+            coordinator = config_entry.runtime_data
+            await coordinator.api.auth.send_auth_key(
+                coordinator.api,
+                call.data[CONF_PIN],
+            )
+
     hass.services.async_register(
         DOMAIN,
         SERVICE_SEND_PIN,
-        _send_pin,
+        send_pin,
         schema=SERVICE_SEND_PIN_SCHEMA,
     )

homeassistant/components/bluetooth/manifest.json

@@ -21,6 +21,6 @@
     "bluetooth-auto-recovery==1.5.2",
     "bluetooth-data-tools==1.28.1",
     "dbus-fast==2.43.0",
-    "habluetooth==3.49.0"
+    "habluetooth==3.48.2"
   ]
 }

homeassistant/components/bosch_alarm/alarm_control_panel.py

@@ -50,7 +50,7 @@ class AreaAlarmControlPanel(BoschAlarmAreaEntity, AlarmControlPanelEntity):
 
     def __init__(self, panel: Panel, area_id: int, unique_id: str) -> None:
         """Initialise a Bosch Alarm control panel entity."""
-        super().__init__(panel, area_id, unique_id, True, False, True)
+        super().__init__(panel, area_id, unique_id, False, False, True)
         self._attr_unique_id = self._area_unique_id
 
     @property

homeassistant/components/bsblan/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["bsblan"],
-  "requirements": ["python-bsblan==2.1.0"]
+  "requirements": ["python-bsblan==1.2.1"]
 }

homeassistant/components/bthome/manifest.json

@@ -20,5 +20,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/bthome",
   "iot_class": "local_push",
-  "requirements": ["bthome-ble==3.13.1"]
+  "requirements": ["bthome-ble==3.12.4"]
 }

homeassistant/components/caldav/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/caldav",
   "iot_class": "cloud_polling",
   "loggers": ["caldav", "vobject"],
-  "requirements": ["caldav==1.6.0", "icalendar==6.1.0"]
+  "requirements": ["caldav==1.3.9", "icalendar==6.1.0"]
 }

homeassistant/components/camera/manifest.json

@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/camera",
   "integration_type": "entity",
   "quality_scale": "internal",
-  "requirements": ["PyTurboJPEG==1.8.0"]
+  "requirements": ["PyTurboJPEG==1.7.5"]
 }

homeassistant/components/climate/__init__.py

@@ -27,6 +27,7 @@ from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.temperature import display_temp as show_temp
 from homeassistant.helpers.typing import ConfigType
+from homeassistant.loader import async_suggest_report_issue
 from homeassistant.util.hass_dict import HassKey
 from homeassistant.util.unit_conversion import TemperatureConverter
 
@@ -105,6 +106,11 @@ DEFAULT_MAX_HUMIDITY = 99
 
 CONVERTIBLE_ATTRIBUTE = [ATTR_TEMPERATURE, ATTR_TARGET_TEMP_LOW, ATTR_TARGET_TEMP_HIGH]
 
+# Can be removed in 2025.1 after deprecation period of the new feature flags
+CHECK_TURN_ON_OFF_FEATURE_FLAG = (
+    ClimateEntityFeature.TURN_ON | ClimateEntityFeature.TURN_OFF
+)
+
 SET_TEMPERATURE_SCHEMA = vol.All(
     cv.has_at_least_one_key(
         ATTR_TEMPERATURE, ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW
@@ -529,6 +535,26 @@ class ClimateEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
             return
         modes_str: str = ", ".join(modes) if modes else ""
         translation_key = f"not_valid_{mode_type}_mode"
+        if mode_type == "hvac":
+            report_issue = async_suggest_report_issue(
+                self.hass,
+                integration_domain=self.platform.platform_name,
+                module=type(self).__module__,
+            )
+            _LOGGER.warning(
+                (
+                    "%s::%s sets the hvac_mode %s which is not "
+                    "valid for this entity with modes: %s. "
+                    "This will stop working in 2025.4 and raise an error instead. "
+                    "Please %s"
+                ),
+                self.platform.platform_name,
+                self.__class__.__name__,
+                mode,
+                modes_str,
+                report_issue,
+            )
+            return
         raise ServiceValidationError(
             translation_domain=DOMAIN,
             translation_key=translation_key,

homeassistant/components/climate/strings.json

@@ -258,9 +258,6 @@
     "not_valid_preset_mode": {
       "message": "Preset mode {mode} is not valid. Valid preset modes are: {modes}."
     },
-    "not_valid_hvac_mode": {
-      "message": "HVAC mode {mode} is not valid. Valid HVAC modes are: {modes}."
-    },
     "not_valid_swing_mode": {
       "message": "Swing mode {mode} is not valid. Valid swing modes are: {modes}."
     },

homeassistant/components/cloud/manifest.json

@@ -13,6 +13,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==0.102.0"],
+  "requirements": ["hass-nabucasa==0.101.0"],
   "single_config_entry": true
 }

homeassistant/components/cloudflare/__init__.py

@@ -3,8 +3,7 @@
 from __future__ import annotations
 
 import asyncio
-from dataclasses import dataclass
-from datetime import datetime, timedelta
+from datetime import timedelta
 import logging
 import socket
 
@@ -27,18 +26,8 @@ from .const import CONF_RECORDS, DEFAULT_UPDATE_INTERVAL, DOMAIN, SERVICE_UPDATE
 
 _LOGGER = logging.getLogger(__name__)
 
-type CloudflareConfigEntry = ConfigEntry[CloudflareRuntimeData]
 
-
-@dataclass
-class CloudflareRuntimeData:
-    """Runtime data for Cloudflare config entry."""
-
-    client: pycfdns.Client
-    dns_zone: pycfdns.ZoneModel
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: CloudflareConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Cloudflare from a config entry."""
     session = async_get_clientsession(hass)
     client = pycfdns.Client(
@@ -56,12 +45,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: CloudflareConfigEntry) -
     except pycfdns.ComunicationException as error:
         raise ConfigEntryNotReady from error
 
-    entry.runtime_data = CloudflareRuntimeData(client, dns_zone)
-
-    async def update_records(now: datetime) -> None:
+    async def update_records(now):
         """Set up recurring update."""
         try:
-            await _async_update_cloudflare(hass, entry)
+            await _async_update_cloudflare(
+                hass, client, dns_zone, entry.data[CONF_RECORDS]
+            )
         except (
             pycfdns.AuthenticationException,
             pycfdns.ComunicationException,
@@ -71,7 +60,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: CloudflareConfigEntry) -
     async def update_records_service(call: ServiceCall) -> None:
         """Set up service for manual trigger."""
         try:
-            await _async_update_cloudflare(hass, entry)
+            await _async_update_cloudflare(
+                hass, client, dns_zone, entry.data[CONF_RECORDS]
+            )
         except (
             pycfdns.AuthenticationException,
             pycfdns.ComunicationException,
@@ -88,7 +79,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: CloudflareConfigEntry) -
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: CloudflareConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload Cloudflare config entry."""
 
     return True
@@ -96,12 +87,10 @@ async def async_unload_entry(hass: HomeAssistant, entry: CloudflareConfigEntry)
 
 async def _async_update_cloudflare(
     hass: HomeAssistant,
-    entry: CloudflareConfigEntry,
+    client: pycfdns.Client,
+    dns_zone: pycfdns.ZoneModel,
+    target_records: list[str],
 ) -> None:
-    client = entry.runtime_data.client
-    dns_zone = entry.runtime_data.dns_zone
-    target_records: list[str] = entry.data[CONF_RECORDS]
-
     _LOGGER.debug("Starting update for zone %s", dns_zone["name"])
 
     records = await client.list_dns_records(zone_id=dns_zone["id"], type="A")

homeassistant/components/comelit/climate.py

@@ -9,7 +9,6 @@ from aiocomelit import ComelitSerialBridgeObject
 from aiocomelit.const import CLIMATE
 
 from homeassistant.components.climate import (
-    DOMAIN as CLIMATE_DOMAIN,
     ClimateEntity,
     ClimateEntityFeature,
     HVACAction,
@@ -18,12 +17,13 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import PRESET_MODE_AUTO, PRESET_MODE_AUTO_TARGET_TEMP, PRESET_MODE_MANUAL
+from .const import DOMAIN
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
 from .entity import ComelitBridgeBaseEntity
-from .utils import bridge_api_call, cleanup_stale_entity, load_api_data
+from .utils import bridge_api_call
 
 # Coordinator is used to centralize the data updates
 PARALLEL_UPDATES = 0
@@ -41,13 +41,11 @@ class ClimaComelitMode(StrEnum):
 class ClimaComelitCommand(StrEnum):
     """Serial Bridge clima commands."""
 
-    AUTO = "auto"
-    MANUAL = "man"
     OFF = "off"
     ON = "on"
+    MANUAL = "man"
     SET = "set"
-    SNOW = "lower"
-    SUN = "upper"
+    AUTO = "auto"
 
 
 class ClimaComelitApiStatus(TypedDict):
@@ -69,15 +67,11 @@ API_STATUS: dict[str, ClimaComelitApiStatus] = {
     ),
 }
 
-HVACMODE_TO_ACTION: dict[HVACMode, ClimaComelitCommand] = {
+MODE_TO_ACTION: dict[HVACMode, ClimaComelitCommand] = {
     HVACMode.OFF: ClimaComelitCommand.OFF,
-    HVACMode.COOL: ClimaComelitCommand.SNOW,
-    HVACMode.HEAT: ClimaComelitCommand.SUN,
-}
-
-PRESET_MODE_TO_ACTION: dict[str, ClimaComelitCommand] = {
-    PRESET_MODE_MANUAL: ClimaComelitCommand.MANUAL,
-    PRESET_MODE_AUTO: ClimaComelitCommand.AUTO,
+    HVACMode.AUTO: ClimaComelitCommand.AUTO,
+    HVACMode.COOL: ClimaComelitCommand.MANUAL,
+    HVACMode.HEAT: ClimaComelitCommand.MANUAL,
 }
 
 
@@ -90,42 +84,26 @@ async def async_setup_entry(
 
     coordinator = cast(ComelitSerialBridge, config_entry.runtime_data)
 
-    entities: list[ClimateEntity] = []
-    for device in coordinator.data[CLIMATE].values():
-        values = load_api_data(device, CLIMATE_DOMAIN)
-        if values[0] == 0 and values[4] == 0:
-            # No climate data, device is only a humidifier/dehumidifier
-
-            await cleanup_stale_entity(
-                hass, config_entry, f"{config_entry.entry_id}-{device.index}", device
-            )
-
-            continue
-
-        entities.append(
-            ComelitClimateEntity(coordinator, device, config_entry.entry_id)
-        )
-
-    async_add_entities(entities)
+    async_add_entities(
+        ComelitClimateEntity(coordinator, device, config_entry.entry_id)
+        for device in coordinator.data[CLIMATE].values()
+    )
 
 
 class ComelitClimateEntity(ComelitBridgeBaseEntity, ClimateEntity):
     """Climate device."""
 
-    _attr_hvac_modes = [HVACMode.COOL, HVACMode.HEAT, HVACMode.OFF]
-    _attr_preset_modes = [PRESET_MODE_AUTO, PRESET_MODE_MANUAL]
+    _attr_hvac_modes = [HVACMode.AUTO, HVACMode.COOL, HVACMode.HEAT, HVACMode.OFF]
     _attr_max_temp = 30
     _attr_min_temp = 5
     _attr_supported_features = (
         ClimateEntityFeature.TARGET_TEMPERATURE
         | ClimateEntityFeature.TURN_OFF
         | ClimateEntityFeature.TURN_ON
-        | ClimateEntityFeature.PRESET_MODE
     )
     _attr_target_temperature_step = PRECISION_TENTHS
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_name = None
-    _attr_translation_key = "thermostat"
 
     def __init__(
         self,
@@ -140,14 +118,20 @@ class ComelitClimateEntity(ComelitBridgeBaseEntity, ClimateEntity):
     def _update_attributes(self) -> None:
         """Update class attributes."""
         device = self.coordinator.data[CLIMATE][self._device.index]
-        values = load_api_data(device, CLIMATE_DOMAIN)
+        if not isinstance(device.val, list):
+            raise HomeAssistantError(
+                translation_domain=DOMAIN, translation_key="invalid_clima_data"
+            )
+
+        # CLIMATE has a 2 item tuple:
+        # - first  for Clima
+        # - second for Humidifier
+        values = device.val[0]
 
         _active = values[1]
         _mode = values[2]  # Values from API: "O", "L", "U"
         _automatic = values[3] == ClimaComelitMode.AUTO
 
-        self._attr_preset_mode = PRESET_MODE_AUTO if _automatic else PRESET_MODE_MANUAL
-
         self._attr_current_temperature = values[0] / 10
 
         self._attr_hvac_action = None
@@ -157,6 +141,10 @@ class ComelitClimateEntity(ComelitBridgeBaseEntity, ClimateEntity):
             self._attr_hvac_action = API_STATUS[_mode]["hvac_action"]
 
         self._attr_hvac_mode = None
+        if _mode == ClimaComelitMode.OFF:
+            self._attr_hvac_mode = HVACMode.OFF
+        if _automatic:
+            self._attr_hvac_mode = HVACMode.AUTO
         if _mode in API_STATUS:
             self._attr_hvac_mode = API_STATUS[_mode]["hvac_mode"]
 
@@ -172,12 +160,13 @@ class ComelitClimateEntity(ComelitBridgeBaseEntity, ClimateEntity):
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
         if (
-            (target_temp := kwargs.get(ATTR_TEMPERATURE)) is None
-            or self.hvac_mode == HVACMode.OFF
-            or self._attr_preset_mode == PRESET_MODE_AUTO
-        ):
+            target_temp := kwargs.get(ATTR_TEMPERATURE)
+        ) is None or self.hvac_mode == HVACMode.OFF:
             return
 
+        await self.coordinator.api.set_clima_status(
+            self._device.index, ClimaComelitCommand.MANUAL
+        )
         await self.coordinator.api.set_clima_status(
             self._device.index, ClimaComelitCommand.SET, target_temp
         )
@@ -188,28 +177,12 @@ class ComelitClimateEntity(ComelitBridgeBaseEntity, ClimateEntity):
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set hvac mode."""
 
-        if self._attr_hvac_mode == HVACMode.OFF:
+        if hvac_mode != HVACMode.OFF:
             await self.coordinator.api.set_clima_status(
                 self._device.index, ClimaComelitCommand.ON
             )
         await self.coordinator.api.set_clima_status(
-            self._device.index, HVACMODE_TO_ACTION[hvac_mode]
+            self._device.index, MODE_TO_ACTION[hvac_mode]
         )
         self._attr_hvac_mode = hvac_mode
         self.async_write_ha_state()
-
-    async def async_set_preset_mode(self, preset_mode: str) -> None:
-        """Set new target preset mode."""
-
-        if self._attr_hvac_mode == HVACMode.OFF:
-            return
-
-        await self.coordinator.api.set_clima_status(
-            self._device.index, PRESET_MODE_TO_ACTION[preset_mode]
-        )
-        self._attr_preset_mode = preset_mode
-
-        if preset_mode == PRESET_MODE_AUTO:
-            self._attr_target_temperature = PRESET_MODE_AUTO_TARGET_TEMP
-
-        self.async_write_ha_state()

homeassistant/components/comelit/const.py

@@ -11,8 +11,3 @@ DEFAULT_PORT = 80
 DEVICE_TYPE_LIST = [BRIDGE, VEDO]
 
 SCAN_INTERVAL = 5
-
-PRESET_MODE_AUTO = "automatic"
-PRESET_MODE_MANUAL = "manual"
-
-PRESET_MODE_AUTO_TARGET_TEMP = 20

homeassistant/components/comelit/humidifier.py

@@ -9,7 +9,6 @@ from aiocomelit import ComelitSerialBridgeObject
 from aiocomelit.const import CLIMATE
 
 from homeassistant.components.humidifier import (
-    DOMAIN as HUMIDIFIER_DOMAIN,
     MODE_AUTO,
     MODE_NORMAL,
     HumidifierAction,
@@ -18,13 +17,13 @@ from homeassistant.components.humidifier import (
     HumidifierEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import ServiceValidationError
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
 from .entity import ComelitBridgeBaseEntity
-from .utils import bridge_api_call, cleanup_stale_entity, load_api_data
+from .utils import bridge_api_call
 
 # Coordinator is used to centralize the data updates
 PARALLEL_UPDATES = 0
@@ -68,23 +67,6 @@ async def async_setup_entry(
 
     entities: list[ComelitHumidifierEntity] = []
     for device in coordinator.data[CLIMATE].values():
-        values = load_api_data(device, HUMIDIFIER_DOMAIN)
-        if values[0] == 0 and values[4] == 0:
-            # No humidity data, device is only a climate
-
-            for device_class in (
-                HumidifierDeviceClass.HUMIDIFIER,
-                HumidifierDeviceClass.DEHUMIDIFIER,
-            ):
-                await cleanup_stale_entity(
-                    hass,
-                    config_entry,
-                    f"{config_entry.entry_id}-{device.index}-{device_class}",
-                    device,
-                )
-
-            continue
-
         entities.append(
             ComelitHumidifierEntity(
                 coordinator,
@@ -142,7 +124,15 @@ class ComelitHumidifierEntity(ComelitBridgeBaseEntity, HumidifierEntity):
     def _update_attributes(self) -> None:
         """Update class attributes."""
         device = self.coordinator.data[CLIMATE][self._device.index]
-        values = load_api_data(device, HUMIDIFIER_DOMAIN)
+        if not isinstance(device.val, list):
+            raise HomeAssistantError(
+                translation_domain=DOMAIN, translation_key="invalid_clima_data"
+            )
+
+        # CLIMATE has a 2 item tuple:
+        # - first  for Clima
+        # - second for Humidifier
+        values = device.val[1]
 
         _active = values[1]
         _mode = values[2]  # Values from API: "O", "L", "U"

homeassistant/components/comelit/icons.json

@@ -4,18 +4,6 @@
       "zone_status": {
         "default": "mdi:shield-check"
       }
-    },
-    "climate": {
-      "thermostat": {
-        "state_attributes": {
-          "preset_mode": {
-            "state": {
-              "automatic": "mdi:refresh-auto",
-              "manual": "mdi:alpha-m"
-            }
-          }
-        }
-      }
     }
   }
 }

homeassistant/components/comelit/strings.json

@@ -74,18 +74,6 @@
       "dehumidifier": {
         "name": "Dehumidifier"
       }
-    },
-    "climate": {
-      "thermostat": {
-        "state_attributes": {
-          "preset_mode": {
-            "state": {
-              "automatic": "[%key:common::state::auto%]",
-              "manual": "[%key:common::state::manual%]"
-            }
-          }
-        }
-      }
     }
   },
   "exceptions": {

homeassistant/components/comelit/utils.py

@@ -4,21 +4,14 @@ from collections.abc import Awaitable, Callable, Coroutine
 from functools import wraps
 from typing import Any, Concatenate
 
-from aiocomelit import ComelitSerialBridgeObject
 from aiocomelit.exceptions import CannotAuthenticate, CannotConnect, CannotRetrieveData
 from aiohttp import ClientSession, CookieJar
 
-from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import (
-    aiohttp_client,
-    device_registry as dr,
-    entity_registry as er,
-)
+from homeassistant.helpers import aiohttp_client
 
-from .const import _LOGGER, DOMAIN
+from .const import DOMAIN
 from .entity import ComelitBridgeBaseEntity
 
 
@@ -29,61 +22,6 @@ async def async_client_session(hass: HomeAssistant) -> ClientSession:
     )
 
 
-def load_api_data(device: ComelitSerialBridgeObject, domain: str) -> list[Any]:
-    """Load data from the API."""
-    # This function is called when the data is loaded from the API
-    if not isinstance(device.val, list):
-        raise HomeAssistantError(
-            translation_domain=domain, translation_key="invalid_clima_data"
-        )
-    # CLIMATE has a 2 item tuple:
-    # - first  for Clima
-    # - second for Humidifier
-    return device.val[0] if domain == CLIMATE_DOMAIN else device.val[1]
-
-
-async def cleanup_stale_entity(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    entry_unique_id: str,
-    device: ComelitSerialBridgeObject,
-) -> None:
-    """Cleanup stale entity."""
-    entity_reg: er.EntityRegistry = er.async_get(hass)
-
-    identifiers: list[str] = []
-
-    for entry in er.async_entries_for_config_entry(entity_reg, config_entry.entry_id):
-        if entry.unique_id == entry_unique_id:
-            entry_name = entry.name or entry.original_name
-            _LOGGER.info("Removing entity: %s [%s]", entry.entity_id, entry_name)
-            entity_reg.async_remove(entry.entity_id)
-            identifiers.append(f"{config_entry.entry_id}-{device.type}-{device.index}")
-
-    if len(identifiers) > 0:
-        _async_remove_state_config_entry_from_devices(hass, identifiers, config_entry)
-
-
-def _async_remove_state_config_entry_from_devices(
-    hass: HomeAssistant, identifiers: list[str], config_entry: ConfigEntry
-) -> None:
-    """Remove config entry from device."""
-
-    device_registry = dr.async_get(hass)
-    for identifier in identifiers:
-        device = device_registry.async_get_device(identifiers={(DOMAIN, identifier)})
-        if device:
-            _LOGGER.info(
-                "Removing config entry %s from device %s",
-                config_entry.title,
-                device.name,
-            )
-            device_registry.async_update_device(
-                device_id=device.id,
-                remove_config_entry_id=config_entry.entry_id,
-            )
-
-
 def bridge_api_call[_T: ComelitBridgeBaseEntity, **_P](
     func: Callable[Concatenate[_T, _P], Awaitable[None]],
 ) -> Callable[Concatenate[_T, _P], Coroutine[Any, Any, None]]:

homeassistant/components/command_line/notify.py

@@ -12,8 +12,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.process import kill_subprocess
 
-from .const import CONF_COMMAND_TIMEOUT, LOGGER
-from .utils import render_template_args
+from .const import CONF_COMMAND_TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -44,13 +43,8 @@ class CommandLineNotificationService(BaseNotificationService):
 
     def send_message(self, message: str = "", **kwargs: Any) -> None:
         """Send a message to a command line."""
-        if not (command := render_template_args(self.hass, self.command)):
-            return
-
-        LOGGER.debug("Running with message: %s", message)
-
         with subprocess.Popen(  # noqa: S602 # shell by design
-            command,
+            self.command,
             universal_newlines=True,
             stdin=subprocess.PIPE,
             close_fds=False,  # required for posix_spawn
@@ -62,10 +56,10 @@ class CommandLineNotificationService(BaseNotificationService):
                     _LOGGER.error(
                         "Command failed (with return code %s): %s",
                         proc.returncode,
-                        command,
+                        self.command,
                     )
             except subprocess.TimeoutExpired:
-                _LOGGER.error("Timeout for command: %s", command)
+                _LOGGER.error("Timeout for command: %s", self.command)
                 kill_subprocess(proc)
             except subprocess.SubprocessError:
-                _LOGGER.error("Error trying to exec command: %s", command)
+                _LOGGER.error("Error trying to exec command: %s", self.command)

homeassistant/components/command_line/sensor.py

@@ -19,6 +19,7 @@ from homeassistant.const import (
     CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import TemplateError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.template import Template
@@ -36,7 +37,7 @@ from .const import (
     LOGGER,
     TRIGGER_ENTITY_OPTIONS,
 )
-from .utils import async_check_output_or_log, render_template_args
+from .utils import async_check_output_or_log
 
 DEFAULT_NAME = "Command Sensor"
 
@@ -221,6 +222,32 @@ class CommandSensorData:
 
     async def async_update(self) -> None:
         """Get the latest data with a shell command."""
-        if not (command := render_template_args(self.hass, self.command)):
-            return
+        command = self.command
+
+        if " " not in command:
+            prog = command
+            args = None
+            args_compiled = None
+        else:
+            prog, args = command.split(" ", 1)
+            args_compiled = Template(args, self.hass)
+
+        if args_compiled:
+            try:
+                args_to_render = {"arguments": args}
+                rendered_args = args_compiled.async_render(args_to_render)
+            except TemplateError as ex:
+                LOGGER.exception("Error rendering command template: %s", ex)
+                return
+        else:
+            rendered_args = None
+
+        if rendered_args == args:
+            # No template used. default behavior
+            pass
+        else:
+            # Template used. Construct the string used in the shell
+            command = f"{prog} {rendered_args}"
+
+        LOGGER.debug("Running command: %s", command)
         self.value = await async_check_output_or_log(command, self.timeout)

homeassistant/components/command_line/utils.py

@@ -3,13 +3,9 @@
 from __future__ import annotations
 
 import asyncio
+import logging
 
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import TemplateError
-from homeassistant.helpers.template import Template
-
-from .const import LOGGER
-
+_LOGGER = logging.getLogger(__name__)
 _EXEC_FAILED_CODE = 127
 
 
@@ -22,7 +18,7 @@ async def async_call_shell_with_timeout(
     return code is returned.
     """
     try:
-        LOGGER.debug("Running command: %s", command)
+        _LOGGER.debug("Running command: %s", command)
         proc = await asyncio.create_subprocess_shell(  # shell by design
             command,
             close_fds=False,  # required for posix_spawn
@@ -30,14 +26,14 @@ async def async_call_shell_with_timeout(
         async with asyncio.timeout(timeout):
             await proc.communicate()
     except TimeoutError:
-        LOGGER.error("Timeout for command: %s", command)
+        _LOGGER.error("Timeout for command: %s", command)
         return -1
 
     return_code = proc.returncode
     if return_code == _EXEC_FAILED_CODE:
-        LOGGER.error("Error trying to exec command: %s", command)
+        _LOGGER.error("Error trying to exec command: %s", command)
     elif log_return_code and return_code != 0:
-        LOGGER.error(
+        _LOGGER.error(
             "Command failed (with return code %s): %s",
             proc.returncode,
             command,
@@ -57,39 +53,12 @@ async def async_check_output_or_log(command: str, timeout: int) -> str | None:
             stdout, _ = await proc.communicate()
 
         if proc.returncode != 0:
-            LOGGER.error(
+            _LOGGER.error(
                 "Command failed (with return code %s): %s", proc.returncode, command
             )
         else:
             return stdout.strip().decode("utf-8")
     except TimeoutError:
-        LOGGER.error("Timeout for command: %s", command)
+        _LOGGER.error("Timeout for command: %s", command)
 
     return None
-
-
-def render_template_args(hass: HomeAssistant, command: str) -> str | None:
-    """Render template arguments for command line utilities."""
-    if " " not in command:
-        prog = command
-        args = None
-        args_compiled = None
-    else:
-        prog, args = command.split(" ", 1)
-        args_compiled = Template(args, hass)
-
-    rendered_args = None
-    if args_compiled:
-        args_to_render = {"arguments": args}
-        try:
-            rendered_args = args_compiled.async_render(args_to_render)
-        except TemplateError as ex:
-            LOGGER.exception("Error rendering command template: %s", ex)
-            return None
-
-    if rendered_args != args:
-        command = f"{prog} {rendered_args}"
-
-    LOGGER.debug("Running command: %s", command)
-
-    return command

homeassistant/components/compensation/manifest.json

@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/compensation",
   "iot_class": "calculated",
   "quality_scale": "legacy",
-  "requirements": ["numpy==2.3.0"]
+  "requirements": ["numpy==2.2.2"]
 }

homeassistant/components/config/entity_registry.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import logging
 from typing import Any
 
 import voluptuous as vol
@@ -11,23 +10,18 @@ from homeassistant import config_entries
 from homeassistant.components import websocket_api
 from homeassistant.components.websocket_api import ERR_NOT_FOUND, require_admin
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import (
     config_validation as cv,
     device_registry as dr,
     entity_registry as er,
 )
-from homeassistant.helpers.entity_component import async_get_entity_suggested_object_id
 from homeassistant.helpers.json import json_dumps
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @callback
 def async_setup(hass: HomeAssistant) -> bool:
     """Enable the Entity Registry views."""
 
-    websocket_api.async_register_command(hass, websocket_get_automatic_entity_ids)
     websocket_api.async_register_command(hass, websocket_get_entities)
     websocket_api.async_register_command(hass, websocket_get_entity)
     websocket_api.async_register_command(hass, websocket_list_entities_for_display)
@@ -322,54 +316,3 @@ def websocket_remove_entity(
 
     registry.async_remove(msg["entity_id"])
     connection.send_message(websocket_api.result_message(msg["id"]))
-
-
-@websocket_api.websocket_command(
-    {
-        vol.Required("type"): "config/entity_registry/get_automatic_entity_ids",
-        vol.Required("entity_ids"): cv.entity_ids,
-    }
-)
-@callback
-def websocket_get_automatic_entity_ids(
-    hass: HomeAssistant,
-    connection: websocket_api.ActiveConnection,
-    msg: dict[str, Any],
-) -> None:
-    """Return the automatic entity IDs for the given entity IDs.
-
-    This is used to help user reset entity IDs which have been customized by the user.
-    """
-    registry = er.async_get(hass)
-
-    entity_ids = msg["entity_ids"]
-    automatic_entity_ids: dict[str, str | None] = {}
-    reserved_entity_ids: set[str] = set()
-    for entity_id in entity_ids:
-        if not (entry := registry.entities.get(entity_id)):
-            automatic_entity_ids[entity_id] = None
-            continue
-        try:
-            suggested = async_get_entity_suggested_object_id(hass, entity_id)
-        except HomeAssistantError as err:
-            # This is raised if the entity has no object.
-            _LOGGER.debug(
-                "Unable to get suggested object ID for %s, entity ID: %s (%s)",
-                entry.entity_id,
-                entity_id,
-                err,
-            )
-            automatic_entity_ids[entity_id] = None
-            continue
-        suggested_entity_id = registry.async_generate_entity_id(
-            entry.domain,
-            suggested or f"{entry.platform}_{entry.unique_id}",
-            current_entity_id=entity_id,
-            reserved_entity_ids=reserved_entity_ids,
-        )
-        automatic_entity_ids[entity_id] = suggested_entity_id
-        reserved_entity_ids.add(suggested_entity_id)
-
-    connection.send_message(
-        websocket_api.result_message(msg["id"], automatic_entity_ids)
-    )

homeassistant/components/control4/__init__.py

@@ -54,10 +54,10 @@ class Control4RuntimeData:
 type Control4ConfigEntry = ConfigEntry[Control4RuntimeData]
 
 
-async def call_c4_api_retry(func, *func_args):  # noqa: RET503
+async def call_c4_api_retry(func, *func_args):
     """Call C4 API function and retry on failure."""
     # Ruff doesn't understand this loop - the exception is always raised after the retries
-    for i in range(API_RETRY_TIMES):
+    for i in range(API_RETRY_TIMES):  # noqa: RET503
         try:
             return await func(*func_args)
         except client_exceptions.ClientError as exception: