rasa-pro 3.11.0a4.dev3__py3-none-any.whl → 3.11.0rc2__py3-none-any.whl

rasa/__main__.py

@@ -1,5 +1,5 @@
 import argparse
-import logging
+import structlog
 import os
 import platform
 import sys
@@ -35,10 +35,9 @@ from rasa.cli.utils import (
 )
 from rasa.plugin import plugin_manager
 from rasa.shared.exceptions import RasaException
-from rasa.shared.utils.cli import print_error
 from rasa.utils.common import configure_logging_and_warnings
 
-logger = logging.getLogger(__name__)
+structlogger = structlog.get_logger()
 
 
 def create_argument_parser() -> argparse.ArgumentParser:
@@ -89,7 +88,7 @@ def print_version() -> None:
     """Prints version information of rasa tooling and python."""
     from rasa.utils.licensing import get_license_expiration_date
 
-    print(f"Rasa Version      :         {version.__version__}")
+    print(f"Rasa Pro Version  :         {version.__version__}")
     print(f"Minimum Compatible Version: {MINIMUM_COMPATIBLE_VERSION}")
     print(f"Rasa SDK Version  :         {rasa_sdk_version}")
     print(f"Python Version    :         {platform.python_version()}")
@@ -110,6 +109,10 @@ def main() -> None:
     configure_logging_and_warnings(
         log_level, logging_config_file, warn_only_once=True, filter_repeated_logs=True
     )
+    # TODO: we shouldn't configure colored logging, since we are using structlog
+    # for logging - should be removed as part of logs cleanup
+    rasa.utils.io.configure_colored_logging(log_level)
+    configure_structlog(log_level)
 
     tf_env.setup_tf_environment()
     tf_env.check_deterministic_ops()
@@ -119,8 +122,6 @@ def main() -> None:
 
     try:
         if hasattr(cmdline_arguments, "func"):
-            rasa.utils.io.configure_colored_logging(log_level)
-
             is_studio_command = check_if_studio_command()
 
             if not is_studio_command:
@@ -137,23 +138,32 @@ def main() -> None:
                 plugin_manager().hook.init_anonymization_pipeline(
                     endpoints_file=endpoints_file
                 )
-            # configure structlog
-            configure_structlog(log_level)
 
             cmdline_arguments.func(cmdline_arguments)
         elif hasattr(cmdline_arguments, "version"):
             print_version()
         else:
             # user has not provided a subcommand, let's print the help
-            logger.error("No command specified.")
+            structlogger.error("cli.no_command", event_info="No command specified.")
             arg_parser.print_help()
             sys.exit(1)
-    except RasaException as e:
+    except RasaException as exc:
         # these are exceptions we expect to happen (e.g. invalid training data format)
         # it doesn't make sense to print a stacktrace for these if we are not in
         # debug mode
-        logger.debug("Failed to run CLI command due to an exception.", exc_info=e)
-        print_error(f"{e.__class__.__name__}: {e}")
+        structlogger.debug(
+            "cli.exception.details",
+            event_info="Failed to run CLI command due to an exception.",
+            exc_info=exc,
+        )
+        structlogger.error("cli.exception.rasa_exception", event_info=f"{exc}")
+        sys.exit(1)
+    except Exception as exc:
+        structlogger.error(
+            "cli.exception.general_exception",
+            event_info=f"{exc.__class__.__name__}: {exc}",
+            exc_info=exc,
+        )
         sys.exit(1)
 
 

rasa/api.py

@@ -42,7 +42,7 @@ def run(
     from rasa.shared.constants import DOCS_BASE_URL
     from rasa.shared.utils.cli import print_warning
 
-    _endpoints = AvailableEndpoints.read_endpoints(endpoints)
+    _endpoints = AvailableEndpoints.get_instance(endpoints)
 
     if not connector and not credentials:
         connector = "rest"

rasa/cli/arguments/default_arguments.py

@@ -7,7 +7,6 @@ from rasa.core.persistor import RemoteStorageType, StorageType, parse_remote_sto
 from rasa.shared.constants import (
     DEFAULT_CONFIG_PATH,
     DEFAULT_DATA_PATH,
-    DEFAULT_DOMAIN_PATH,
     DEFAULT_ENDPOINTS_PATH,
     DEFAULT_MODELS_PATH,
 )
@@ -53,7 +52,7 @@ def add_nlu_data_param(
 
 def add_domain_param(
     parser: Union[argparse.ArgumentParser, argparse._ActionsContainer],
-    default: Optional[Text] = DEFAULT_DOMAIN_PATH,
+    default: Optional[Text] = None,
 ) -> None:
     parser.add_argument(
         "-d",

rasa/cli/arguments/shell.py

@@ -1,12 +1,16 @@
 import argparse
 
-from rasa.cli.arguments.default_arguments import add_model_param
+from rasa.cli.arguments.default_arguments import (
+    add_model_param,
+    add_skip_validation_flag,
+)
 from rasa.cli.arguments.run import add_server_arguments
 
 
 def set_shell_arguments(parser: argparse.ArgumentParser) -> None:
     add_model_param(parser)
     add_server_arguments(parser)
+    add_skip_validation_flag(parser)
 
 
 def set_shell_nlu_arguments(parser: argparse.ArgumentParser) -> None:

rasa/cli/e2e_test.py

@@ -164,7 +164,7 @@ def execute_e2e_tests(args: argparse.Namespace) -> None:
     args.endpoints = rasa.cli.utils.get_validated_path(
         args.endpoints, "endpoints", DEFAULT_ENDPOINTS_PATH, True
     )
-    endpoints = AvailableEndpoints.read_endpoints(args.endpoints)
+    endpoints = AvailableEndpoints.get_instance(args.endpoints)
 
     # Ignore all endpoints apart from action server, model, nlu and nlg
     # to ensure InMemoryTrackerStore is being used instead of production

rasa/cli/evaluate.py

@@ -1,16 +1,16 @@
 import argparse
-from typing import List, Text, Optional
 from pathlib import Path
+from typing import List, Text, Optional
 
+import rasa.cli.arguments.evaluate as arguments
+import rasa.shared.utils.cli
 from rasa import telemetry
-from rasa.core.utils import AvailableEndpoints
-from rasa.core.tracker_store import TrackerStore
-from rasa.core.evaluation.marker_tracker_loader import MarkerTrackerLoader
+from rasa.cli import SubParsersAction
 from rasa.core.evaluation.marker_base import Marker, OperatorMarker
+from rasa.core.evaluation.marker_tracker_loader import MarkerTrackerLoader
+from rasa.core.tracker_store import TrackerStore
+from rasa.core.utils import AvailableEndpoints
 from rasa.shared.core.domain import Domain
-from rasa.cli import SubParsersAction
-import rasa.cli.arguments.evaluate as arguments
-import rasa.shared.utils.cli
 
 STATS_OVERALL_SUFFIX = "-overall.csv"
 STATS_SESSION_SUFFIX = "-per-session.csv"
@@ -217,6 +217,6 @@ def _create_tracker_loader(
         A MarkerTrackerLoader object configured with the specified strategy against
         the configured tracker store.
     """
-    endpoints = AvailableEndpoints.read_endpoints(endpoint_config)
+    endpoints = AvailableEndpoints.get_instance(endpoint_config)
     tracker_store = TrackerStore.create(endpoints.tracker_store, domain=domain)
     return MarkerTrackerLoader(tracker_store, strategy, count, seed)

rasa/cli/inspect.py

@@ -5,9 +5,9 @@ from typing import List, Text
 
 from sanic import Sanic
 
+from rasa import telemetry
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import shell as arguments
-from rasa.cli.arguments.default_arguments import add_skip_validation_flag
 from rasa.core import constants
 from rasa.utils.cli import remove_argument_from_parser
 
@@ -32,11 +32,12 @@ def add_subparser(
         ),
     )
     inspect_parser.set_defaults(func=inspect)
-
     arguments.set_shell_arguments(inspect_parser)
-    add_skip_validation_flag(inspect_parser)
 
-    inspect_parser.add_argument("--voice", help="Enable voice", action="store_true")
+    # additional argument for voice
+    inspect_parser.add_argument(
+        "--voice", help="Enable voice", action="store_true", default=False
+    )
 
     # it'd be confusing to expose those arguments to the user,
     # so we remove them
@@ -70,4 +71,5 @@ def inspect(args: argparse.Namespace) -> None:
     args.credentials = None
     args.server_listeners = [(after_start_hook_open_inspector, "after_server_start")]
 
+    telemetry.track_inspect_started(args.connector)
     rasa.cli.run.run(args)

rasa/cli/llm_fine_tuning.py

@@ -352,7 +352,7 @@ def get_valid_endpoints(endpoints_file: str) -> AvailableEndpoints:
     validated_endpoints_file = rasa.cli.utils.get_validated_path(
         endpoints_file, "endpoints", DEFAULT_ENDPOINTS_PATH, True
     )
-    endpoints = AvailableEndpoints.read_endpoints(validated_endpoints_file)
+    endpoints = AvailableEndpoints.get_instance(validated_endpoints_file)
 
     # Ignore all endpoints apart from action server, model, nlu and nlg
     # to ensure InMemoryTrackerStore is being used instead of production

rasa/cli/project_templates/calm/config.yml

@@ -1,12 +1,10 @@
 recipe: default.v1
 language: en
 pipeline:
-- name: SingleStepLLMCommandGenerator
-  llm:
-    model_name: gpt-4
-    request_timeout: 7
-    max_tokens: 256
+  - name: SingleStepLLMCommandGenerator
+    llm:
+      model_group: openai-gpt-4
 
 policies:
-- name: FlowPolicy
-- name: IntentlessPolicy
+  - name: FlowPolicy
+  - name: IntentlessPolicy

rasa/cli/project_templates/calm/endpoints.yml

@@ -48,3 +48,11 @@ action_endpoint:
 # To enable the rephraser, remove the comment symbols in the lines below.
 #nlg:
 #   type: rephrase
+
+model_groups:
+  - id: openai-gpt-4
+    models:
+      - provider: openai
+        model: openai/gpt-4
+        request_timeout: 7
+        max_tokens: 256

rasa/cli/project_templates/tutorial/config.yml

@@ -1,11 +1,14 @@
 recipe: default.v1
 language: en
 pipeline:
-  - name: SingleStepLLMCommandGenerator
-    llm:
-      model_name: gpt-4
+- name: SingleStepLLMCommandGenerator
+  llm:
+    provider: rasa
+    model: rasa/cmd_gen_codellama_13b_calm_demo
+    api_base: "https://tutorial-llm.rasa.ai"
+  flow_retrieval:
+    active: false
 
 policies:
   - name: FlowPolicy
-#  - name: EnterpriseSearchPolicy
-#  - name: RulePolicy
+#  - name: EnterpriseSearchPolicy

rasa/cli/project_templates/tutorial/data/flows.yml

@@ -1,6 +1,6 @@
 flows:
   transfer_money:
-    description: This flow lets users send money to friends and family.
+    description: Help users send money to friends and family.
     steps:
       - collect: recipient
       - collect: amount

rasa/cli/project_templates/tutorial/data/patterns.yml

@@ -4,3 +4,8 @@ flows:
     name: pattern chitchat
     steps:
       - action: utter_free_chitchat_response
+  pattern_search:
+    description: Flow for handling knowledge-based questions
+    name: pattern search
+    steps:
+      - action: utter_free_chitchat_response

rasa/cli/project_templates/tutorial/domain.yml

@@ -19,3 +19,17 @@ responses:
 
   utter_transfer_complete:
     - text: "All done. {amount} has been sent to {recipient}."
+
+  utter_free_chitchat_response:
+    - text: "placeholder"
+      metadata:
+        rephrase: True
+        rephrase_prompt: |
+          The following is a conversation with an AI assistant built with Rasa.
+          The assistant can help the user transfer money.
+          The assistant is helpful, creative, clever, and very friendly.
+          The user is making small talk, and the assistant should respond, keeping things light.
+          Context / previous conversation with the user:
+          {{history}}
+          {{current_input}}
+          Suggested AI Response:

rasa/cli/project_templates/tutorial/endpoints.yml

@@ -41,10 +41,10 @@ action_endpoint:
 #  password: password
 #  queue: queue
 
-# The lines below activate contextual rephrasing, using the default OpenAI language model.
-# Ensure the OPENAI_API_KEY is set to prevent any missing API key errors.
-# For more details, refer to the documentation:
-# https://rasa.com/docs/rasa-pro/concepts/contextual-response-rephraser
-# To enable the rephraser, remove the comment symbols in the lines below.
-#nlg:
-#   type: rephrase
+# Allow rephrasing of responses using a Rasa-hosted model
+nlg:
+  type: rephrase
+  llm:
+    provider: rasa
+    model: rasa/cmd_gen_codellama_13b_calm_demo
+    api_base: "https://tutorial-llm.rasa.ai"

rasa/cli/run.py

@@ -113,7 +113,7 @@ def run(args: argparse.Namespace) -> None:
         return
 
     # start server if model server is configured
-    endpoints = AvailableEndpoints.read_endpoints(args.endpoints)
+    endpoints = AvailableEndpoints.get_instance(args.endpoints)
     model_server = endpoints.model if endpoints and endpoints.model else None
     if model_server is not None:
         rasa_run(**vars(args))

rasa/cli/scaffold.py

@@ -128,20 +128,22 @@ def print_run_or_instructions(args: argparse.Namespace) -> None:
             setattr(args, a, None)
 
         args.port = constants.DEFAULT_SERVER_PORT
+        args.voice = False
+        args.skip_yaml_validation = ["domain"]
 
         inspect(args)
     else:
         if args.no_prompt:
             print(
                 "If you want to speak to the assistant, "
-                "run 'rasa shell' at any time inside "
+                "run 'rasa inspect' at any time inside "
                 "the project directory."
             )
         else:
             print_success(
                 "Ok 👍🏼. "
                 "If you want to speak to the assistant, "
-                "run 'rasa shell' at any time inside "
+                "run 'rasa inspect' at any time inside "
                 "the project directory."
             )
 

rasa/cli/studio/studio.py

@@ -1,5 +1,5 @@
 import argparse
-from typing import List, Optional
+from typing import List, Optional, Tuple
 from urllib.parse import ParseResult, urlparse
 
 import questionary
@@ -149,7 +149,7 @@ def _configure_studio_url() -> Optional[str]:
     return studio_url
 
 
-def _get_advanced_config(studio_url: str) -> tuple:
+def _get_advanced_config(studio_url: str) -> Tuple:
     """Get the advanced configuration values for Rasa Studio."""
     keycloak_url = questionary.text(
         "Please provide your Rasa Studio Keycloak URL",
@@ -167,7 +167,7 @@ def _get_advanced_config(studio_url: str) -> tuple:
     return keycloak_url, realm_name, client_id
 
 
-def _get_default_config(studio_url: str) -> tuple:
+def _get_default_config(studio_url: str) -> Tuple:
     """Get the default configuration values for Rasa Studio."""
     keycloak_url = studio_url + "auth/"
     realm_name = DEFAULT_REALM_NAME
@@ -178,6 +178,7 @@ def _get_default_config(studio_url: str) -> tuple:
         f"Keycloak URL: {keycloak_url}, "
         f"Realm Name: '{realm_name}', "
         f"Client ID: '{client_id}'. "
+        f"SSL verification is enabled."
         f"You can use '--advanced' to configure these settings."
     )
 
@@ -185,7 +186,11 @@ def _get_default_config(studio_url: str) -> tuple:
 
 
 def _create_studio_config(
-    studio_url: str, keycloak_url: str, realm_name: str, client_id: str
+    studio_url: str,
+    keycloak_url: str,
+    realm_name: str,
+    client_id: str,
+    disable_verify: bool = False,
 ) -> StudioConfig:
     """Create a StudioConfig object with the provided parameters."""
     return StudioConfig(
@@ -193,6 +198,7 @@ def _create_studio_config(
         studio_url=studio_url + "api/graphql/",
         client_id=client_id,
         realm_name=realm_name,
+        disable_verify=disable_verify,
     )
 
 
@@ -227,19 +233,23 @@ def _configure_studio_config(args: argparse.Namespace) -> StudioConfig:
 
     # create a configuration and auth object to try to reach the studio
     studio_config = _create_studio_config(
-        studio_url, keycloak_url, realm_name, client_id
+        studio_url,
+        keycloak_url,
+        realm_name,
+        client_id,
+        disable_verify=args.disable_verify,
     )
 
-    if args.disable_verify:
+    if studio_config.disable_verify:
         rasa.shared.utils.cli.print_info(
             "Disabling SSL verification for the Rasa Studio authentication server."
         )
-        studio_auth = StudioAuth(studio_config, verify=False)
     else:
         rasa.shared.utils.cli.print_info(
             "Enabling SSL verification for the Rasa Studio authentication server."
         )
-        studio_auth = StudioAuth(studio_config, verify=True)
+
+    studio_auth = StudioAuth(studio_config)
 
     if _check_studio_auth(studio_auth):
         return studio_config

rasa/cli/utils.py

@@ -477,3 +477,8 @@ def get_e2e_results_file_name(
         file_name = parent / f"{stem}_{result_type}.yml"
 
     return str(file_name)
+
+
+def is_skip_validation_flag_set() -> bool:
+    """Checks if the skip validation flag is set."""
+    return "--skip-validation" in sys.argv

rasa/cli/x.py

@@ -1,25 +1,25 @@
 import argparse
 import asyncio
 import logging
-from pathlib import Path
 import signal
+from pathlib import Path
 from typing import Iterable, List, Optional, Text, Tuple, Union
 
 import aiohttp
 import ruamel.yaml as yaml
 
+import rasa.cli.utils
+import rasa.shared.utils.cli
+import rasa.shared.utils.io
+import rasa.utils.common
+import rasa.utils.io
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import x as arguments
-import rasa.cli.utils
+from rasa.core.utils import AvailableEndpoints
 from rasa.shared.constants import (
     DEFAULT_CREDENTIALS_PATH,
     DEFAULT_ENDPOINTS_PATH,
 )
-from rasa.core.utils import AvailableEndpoints
-import rasa.shared.utils.cli
-import rasa.shared.utils.io
-import rasa.utils.common
-import rasa.utils.io
 from rasa.shared.utils.yaml import read_config_file
 
 logger = logging.getLogger(__name__)
@@ -179,7 +179,7 @@ def run_in_enterprise_connection_mode(args: argparse.Namespace) -> None:
     print_success("Starting a Rasa server in Rasa Enterprise connection mode... 🚀")
 
     credentials_path, endpoints_path = _get_credentials_and_endpoints_paths(args)
-    endpoints = AvailableEndpoints.read_endpoints(endpoints_path)
+    endpoints = AvailableEndpoints.get_instance(endpoints_path)
 
     _rasa_service(args, endpoints, None, credentials_path)
 

rasa/constants.py

@@ -18,7 +18,7 @@ CONFIG_TELEMETRY_ID = "rasa_user_id"
 CONFIG_TELEMETRY_ENABLED = "enabled"
 CONFIG_TELEMETRY_DATE = "date"
 
-MINIMUM_COMPATIBLE_VERSION = "3.10.0rc1"
+MINIMUM_COMPATIBLE_VERSION = "3.11.0rc1"
 
 GLOBAL_USER_CONFIG_PATH = os.path.expanduser("~/.config/rasa/global.yml")
 

rasa/core/actions/action_repeat_bot_messages.py

@@ -3,6 +3,15 @@ from typing import Optional, Dict, Any, List
 from rasa.core.actions.action import Action
 from rasa.core.channels import OutputChannel
 from rasa.core.nlg import NaturalLanguageGenerator
+from rasa.dialogue_understanding.patterns.collect_information import (
+    CollectInformationPatternFlowStackFrame,
+)
+from rasa.dialogue_understanding.patterns.repeat import (
+    RepeatBotMessagesPatternFlowStackFrame,
+)
+from rasa.dialogue_understanding.patterns.user_silence import (
+    UserSilencePatternFlowStackFrame,
+)
 from rasa.shared.core.constants import ACTION_REPEAT_BOT_MESSAGES
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.events import Event, BotUttered, UserUttered
@@ -39,6 +48,14 @@ class ActionRepeatBotMessages(Action):
             The elif condition doesn't break when it sees User3 event.
             But it does at User2 event.
         """
+        # Skip action if we are in a collect information step whose
+        # default behavior is to repeat anyways
+        top_frame = tracker.stack.top(
+            lambda frame: isinstance(frame, RepeatBotMessagesPatternFlowStackFrame)
+            or isinstance(frame, UserSilencePatternFlowStackFrame)
+        )
+        if isinstance(top_frame, CollectInformationPatternFlowStackFrame):
+            return []
         # filter user and bot events
         filtered = [
             e for e in tracker.events if isinstance(e, (BotUttered, UserUttered))

rasa/core/channels/channel.py

@@ -227,6 +227,9 @@ class OutputChannel:
     for text only output channels.
     """
 
+    def __init__(self) -> None:
+        self.tracker_state: Optional[Dict[str, Any]] = None
+
     @classmethod
     def name(cls) -> Text:
         """Every output channel needs a name to identify it."""
@@ -310,6 +313,23 @@ class OutputChannel:
             button_msg = cli_utils.button_to_string(button, idx)
             await self.send_text_message(recipient_id, button_msg)
 
+    async def send_text_with_buttons_concise(
+        self,
+        recipient_id: str,
+        text: str,
+        buttons: List[Dict[str, Any]],
+        **kwargs: Any,
+    ) -> None:
+        """Sends buttons in a concise format, useful for voice channels."""
+        if text.strip()[-1] not in {".", "!", "?", ":"}:
+            text += "."
+        text += " "
+        for idx, button in enumerate(buttons):
+            text += button["title"]
+            if idx != len(buttons) - 1:
+                text += ", "
+        await self.send_text_message(recipient_id, text)
+
     async def send_quick_replies(
         self,
         recipient_id: Text,

rasa/core/channels/inspector/dist/assets/{arc-6852c607.js → arc-bc141fb2.js}

@@ -1 +1 @@
-import{w as ln,c as W}from"./path-53f90ab3.js";import{aW as an,aX as $,aY as w,aZ as rn,a_ as y,V as on,a$ as B,b0 as _,b1 as un,b2 as t,b3 as sn,b4 as tn,b5 as fn}from"./index-efdd30c1.js";function cn(l){return l.innerRadius}function yn(l){return l.outerRadius}function gn(l){return l.startAngle}function mn(l){return l.endAngle}function pn(l){return l&&l.padAngle}function dn(l,h,E,q,v,A,X,a){var I=E-l,i=q-h,n=X-v,m=a-A,r=m*I-n*i;if(!(r*r<y))return r=(n*(h-A)-m*(l-v))/r,[l+r*I,h+r*i]}function K(l,h,E,q,v,A,X){var a=l-E,I=h-q,i=(X?A:-A)/B(a*a+I*I),n=i*I,m=-i*a,r=l+n,s=h+m,f=E+n,c=q+m,Y=(r+f)/2,o=(s+c)/2,p=f-r,g=c-s,R=p*p+g*g,T=v-A,b=r*c-f*s,O=(g<0?-1:1)*B(fn(0,T*T*R-b*b)),S=(b*g-p*O)/R,V=(-b*p-g*O)/R,P=(b*g+p*O)/R,d=(-b*p+g*O)/R,x=S-Y,e=V-o,u=P-Y,Z=d-o;return x*x+e*e>u*u+Z*Z&&(S=P,V=d),{cx:S,cy:V,x01:-n,y01:-m,x11:S*(v/T-1),y11:V*(v/T-1)}}function vn(){var l=cn,h=yn,E=W(0),q=null,v=gn,A=mn,X=pn,a=null,I=ln(i);function i(){var n,m,r=+l.apply(this,arguments),s=+h.apply(this,arguments),f=v.apply(this,arguments)-rn,c=A.apply(this,arguments)-rn,Y=un(c-f),o=c>f;if(a||(a=n=I()),s<r&&(m=s,s=r,r=m),!(s>y))a.moveTo(0,0);else if(Y>on-y)a.moveTo(s*$(f),s*w(f)),a.arc(0,0,s,f,c,!o),r>y&&(a.moveTo(r*$(c),r*w(c)),a.arc(0,0,r,c,f,o));else{var p=f,g=c,R=f,T=c,b=Y,O=Y,S=X.apply(this,arguments)/2,V=S>y&&(q?+q.apply(this,arguments):B(r*r+s*s)),P=_(un(s-r)/2,+E.apply(this,arguments)),d=P,x=P,e,u;if(V>y){var Z=sn(V/r*w(S)),C=sn(V/s*w(S));(b-=Z*2)>y?(Z*=o?1:-1,R+=Z,T-=Z):(b=0,R=T=(f+c)/2),(O-=C*2)>y?(C*=o?1:-1,p+=C,g-=C):(O=0,p=g=(f+c)/2)}var j=s*$(p),z=s*w(p),F=r*$(T),G=r*w(T);if(P>y){var H=s*$(g),J=s*w(g),L=r*$(R),M=r*w(R),D;if(Y<an)if(D=dn(j,z,L,M,H,J,F,G)){var N=j-D[0],Q=z-D[1],U=H-D[0],k=J-D[1],nn=1/w(tn((N*U+Q*k)/(B(N*N+Q*Q)*B(U*U+k*k)))/2),en=B(D[0]*D[0]+D[1]*D[1]);d=_(P,(r-en)/(nn-1)),x=_(P,(s-en)/(nn+1))}else d=x=0}O>y?x>y?(e=K(L,M,j,z,s,x,o),u=K(H,J,F,G,s,x,o),a.moveTo(e.cx+e.x01,e.cy+e.y01),x<P?a.arc(e.cx,e.cy,x,t(e.y01,e.x01),t(u.y01,u.x01),!o):(a.arc(e.cx,e.cy,x,t(e.y01,e.x01),t(e.y11,e.x11),!o),a.arc(0,0,s,t(e.cy+e.y11,e.cx+e.x11),t(u.cy+u.y11,u.cx+u.x11),!o),a.arc(u.cx,u.cy,x,t(u.y11,u.x11),t(u.y01,u.x01),!o))):(a.moveTo(j,z),a.arc(0,0,s,p,g,!o)):a.moveTo(j,z),!(r>y)||!(b>y)?a.lineTo(F,G):d>y?(e=K(F,G,H,J,r,-d,o),u=K(j,z,L,M,r,-d,o),a.lineTo(e.cx+e.x01,e.cy+e.y01),d<P?a.arc(e.cx,e.cy,d,t(e.y01,e.x01),t(u.y01,u.x01),!o):(a.arc(e.cx,e.cy,d,t(e.y01,e.x01),t(e.y11,e.x11),!o),a.arc(0,0,r,t(e.cy+e.y11,e.cx+e.x11),t(u.cy+u.y11,u.cx+u.x11),o),a.arc(u.cx,u.cy,d,t(u.y11,u.x11),t(u.y01,u.x01),!o))):a.arc(0,0,r,T,R,o)}if(a.closePath(),n)return a=null,n+""||null}return i.centroid=function(){var n=(+l.apply(this,arguments)+ +h.apply(this,arguments))/2,m=(+v.apply(this,arguments)+ +A.apply(this,arguments))/2-an/2;return[$(m)*n,w(m)*n]},i.innerRadius=function(n){return arguments.length?(l=typeof n=="function"?n:W(+n),i):l},i.outerRadius=function(n){return arguments.length?(h=typeof n=="function"?n:W(+n),i):h},i.cornerRadius=function(n){return arguments.length?(E=typeof n=="function"?n:W(+n),i):E},i.padRadius=function(n){return arguments.length?(q=n==null?null:typeof n=="function"?n:W(+n),i):q},i.startAngle=function(n){return arguments.length?(v=typeof n=="function"?n:W(+n),i):v},i.endAngle=function(n){return arguments.length?(A=typeof n=="function"?n:W(+n),i):A},i.padAngle=function(n){return arguments.length?(X=typeof n=="function"?n:W(+n),i):X},i.context=function(n){return arguments.length?(a=n??null,i):a},i}export{vn as a};
+import{w as ln,c as W}from"./path-53f90ab3.js";import{aW as an,aX as $,aY as w,aZ as rn,a_ as y,V as on,a$ as B,b0 as _,b1 as un,b2 as t,b3 as sn,b4 as tn,b5 as fn}from"./index-e7cef9de.js";function cn(l){return l.innerRadius}function yn(l){return l.outerRadius}function gn(l){return l.startAngle}function mn(l){return l.endAngle}function pn(l){return l&&l.padAngle}function dn(l,h,E,q,v,A,X,a){var I=E-l,i=q-h,n=X-v,m=a-A,r=m*I-n*i;if(!(r*r<y))return r=(n*(h-A)-m*(l-v))/r,[l+r*I,h+r*i]}function K(l,h,E,q,v,A,X){var a=l-E,I=h-q,i=(X?A:-A)/B(a*a+I*I),n=i*I,m=-i*a,r=l+n,s=h+m,f=E+n,c=q+m,Y=(r+f)/2,o=(s+c)/2,p=f-r,g=c-s,R=p*p+g*g,T=v-A,b=r*c-f*s,O=(g<0?-1:1)*B(fn(0,T*T*R-b*b)),S=(b*g-p*O)/R,V=(-b*p-g*O)/R,P=(b*g+p*O)/R,d=(-b*p+g*O)/R,x=S-Y,e=V-o,u=P-Y,Z=d-o;return x*x+e*e>u*u+Z*Z&&(S=P,V=d),{cx:S,cy:V,x01:-n,y01:-m,x11:S*(v/T-1),y11:V*(v/T-1)}}function vn(){var l=cn,h=yn,E=W(0),q=null,v=gn,A=mn,X=pn,a=null,I=ln(i);function i(){var n,m,r=+l.apply(this,arguments),s=+h.apply(this,arguments),f=v.apply(this,arguments)-rn,c=A.apply(this,arguments)-rn,Y=un(c-f),o=c>f;if(a||(a=n=I()),s<r&&(m=s,s=r,r=m),!(s>y))a.moveTo(0,0);else if(Y>on-y)a.moveTo(s*$(f),s*w(f)),a.arc(0,0,s,f,c,!o),r>y&&(a.moveTo(r*$(c),r*w(c)),a.arc(0,0,r,c,f,o));else{var p=f,g=c,R=f,T=c,b=Y,O=Y,S=X.apply(this,arguments)/2,V=S>y&&(q?+q.apply(this,arguments):B(r*r+s*s)),P=_(un(s-r)/2,+E.apply(this,arguments)),d=P,x=P,e,u;if(V>y){var Z=sn(V/r*w(S)),C=sn(V/s*w(S));(b-=Z*2)>y?(Z*=o?1:-1,R+=Z,T-=Z):(b=0,R=T=(f+c)/2),(O-=C*2)>y?(C*=o?1:-1,p+=C,g-=C):(O=0,p=g=(f+c)/2)}var j=s*$(p),z=s*w(p),F=r*$(T),G=r*w(T);if(P>y){var H=s*$(g),J=s*w(g),L=r*$(R),M=r*w(R),D;if(Y<an)if(D=dn(j,z,L,M,H,J,F,G)){var N=j-D[0],Q=z-D[1],U=H-D[0],k=J-D[1],nn=1/w(tn((N*U+Q*k)/(B(N*N+Q*Q)*B(U*U+k*k)))/2),en=B(D[0]*D[0]+D[1]*D[1]);d=_(P,(r-en)/(nn-1)),x=_(P,(s-en)/(nn+1))}else d=x=0}O>y?x>y?(e=K(L,M,j,z,s,x,o),u=K(H,J,F,G,s,x,o),a.moveTo(e.cx+e.x01,e.cy+e.y01),x<P?a.arc(e.cx,e.cy,x,t(e.y01,e.x01),t(u.y01,u.x01),!o):(a.arc(e.cx,e.cy,x,t(e.y01,e.x01),t(e.y11,e.x11),!o),a.arc(0,0,s,t(e.cy+e.y11,e.cx+e.x11),t(u.cy+u.y11,u.cx+u.x11),!o),a.arc(u.cx,u.cy,x,t(u.y11,u.x11),t(u.y01,u.x01),!o))):(a.moveTo(j,z),a.arc(0,0,s,p,g,!o)):a.moveTo(j,z),!(r>y)||!(b>y)?a.lineTo(F,G):d>y?(e=K(F,G,H,J,r,-d,o),u=K(j,z,L,M,r,-d,o),a.lineTo(e.cx+e.x01,e.cy+e.y01),d<P?a.arc(e.cx,e.cy,d,t(e.y01,e.x01),t(u.y01,u.x01),!o):(a.arc(e.cx,e.cy,d,t(e.y01,e.x01),t(e.y11,e.x11),!o),a.arc(0,0,r,t(e.cy+e.y11,e.cx+e.x11),t(u.cy+u.y11,u.cx+u.x11),o),a.arc(u.cx,u.cy,d,t(u.y11,u.x11),t(u.y01,u.x01),!o))):a.arc(0,0,r,T,R,o)}if(a.closePath(),n)return a=null,n+""||null}return i.centroid=function(){var n=(+l.apply(this,arguments)+ +h.apply(this,arguments))/2,m=(+v.apply(this,arguments)+ +A.apply(this,arguments))/2-an/2;return[$(m)*n,w(m)*n]},i.innerRadius=function(n){return arguments.length?(l=typeof n=="function"?n:W(+n),i):l},i.outerRadius=function(n){return arguments.length?(h=typeof n=="function"?n:W(+n),i):h},i.cornerRadius=function(n){return arguments.length?(E=typeof n=="function"?n:W(+n),i):E},i.padRadius=function(n){return arguments.length?(q=n==null?null:typeof n=="function"?n:W(+n),i):q},i.startAngle=function(n){return arguments.length?(v=typeof n=="function"?n:W(+n),i):v},i.endAngle=function(n){return arguments.length?(A=typeof n=="function"?n:W(+n),i):A},i.padAngle=function(n){return arguments.length?(X=typeof n=="function"?n:W(+n),i):X},i.context=function(n){return arguments.length?(a=n??null,i):a},i}export{vn as a};