Address feedback

Author: k-raina

.semaphore/semaphore.yml

@@ -9,6 +9,7 @@ global_job_config:
   env_vars:
     - name: LIBRDKAFKA_VERSION
       value: v2.13.2
+    # TODO KIP-932: Remove LIBRDKAFKA_BRANCH once LIBRDKAFKA_VERSION includes share consumer support
     - name: LIBRDKAFKA_BRANCH
       value: dev_kip-932_queues-for-kafka
   prologue:
@@ -35,6 +36,7 @@ blocks:
           commands:
             - sem-version python 3.11
             - pip install uv
+            # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse 2.16.2
             - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse
             - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
@@ -61,6 +63,7 @@ blocks:
           commands:
             - sem-version python 3.13
             - pip install uv
+            # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-macOS-${ARCH}-py313-plus.tgz wheelhouse
             - artifact push workflow wheelhouse-macOS-${ARCH}-py313-plus.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}-py313-plus.tgz/
@@ -85,6 +88,7 @@ blocks:
           commands:
             - sem-version python 3.11
             - pip install uv
+            # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse 2.16.2
             - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse
             - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
@@ -113,6 +117,7 @@ blocks:
           commands:
             - sem-version python 3.13
             - pip install uv
+            # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-macOS-${ARCH}-py313-plus.tgz wheelhouse
             - artifact push workflow wheelhouse-macOS-${ARCH}-py313-plus.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}-py313-plus.tgz/
@@ -135,6 +140,7 @@ blocks:
           commands:
             - sem-version python 3.13
             - pip install uv
+            # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
             - ./tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse
             - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
@@ -157,6 +163,7 @@ blocks:
           commands:
             - sem-version python 3.11
             - pip install uv
+            # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
             - ./tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse
             - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
@@ -189,6 +196,7 @@ blocks:
           commands:
             - sem-version python 3.11.9
             - bash tools/mingw-w64/semaphore_commands.sh
+            # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
             - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest
             - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse
             - tar -czf wheelhouse-windows-${Env:ARCH}.tgz wheelhouse
@@ -332,11 +340,11 @@ blocks:
             # Install existing test requirements
             - uv pip install -r requirements/requirements-tests-install.txt
 
+            # TODO KIP-932: Remove LIBRDKAFKA_BRANCH fallback once LIBRDKAFKA_VERSION includes share consumer support
             # Build and install confluent-kafka from source
             - lib_dir=dest/runtimes/$OS_NAME-$ARCH/native
             - |
               if [[ -n $LIBRDKAFKA_BRANCH ]]; then
-                sudo apt-get install -y -qq libssl-dev libsasl2-dev liblz4-dev libzstd-dev
                 tools/wheels/build-librdkafka-branch.sh "$LIBRDKAFKA_BRANCH" dest
               else
                 tools/wheels/install-librdkafka.sh "${LIBRDKAFKA_VERSION#v}" dest

src/confluent_kafka/__init__.py

@@ -37,9 +37,9 @@
     TIMESTAMP_LOG_APPEND_TIME,
     TIMESTAMP_NOT_AVAILABLE,
     Consumer,
+    ShareConsumer,
     Message,
     Producer,
-    ShareConsumer,
     TopicPartition,
     Uuid,
     consistent,
@@ -57,6 +57,7 @@
     "Consumer",
     "ShareConsumer",
     "aio",
+
     "KafkaError",
     "KafkaException",
     "kafkatest",

src/confluent_kafka/cimpl.pyi

@@ -554,7 +554,12 @@ class Consumer:
 
 class ShareConsumer:
     """Share Consumer for queue-like message consumption (KIP-932)."""
-    def __init__(self, config: Dict[str, Union[str, int, float, bool]]) -> None: ...
+    @overload
+    def __init__(self, config: Dict[str, Any]) -> None: ...
+    @overload
+    def __init__(self, config: Dict[str, Any], /, **kwargs: Any) -> None: ...
+    @overload
+    def __init__(self, **config: Any) -> None: ...
     def subscribe(self, topics: List[str]) -> None: ...
     def unsubscribe(self) -> None: ...
     def subscription(self) -> List[str]: ...

src/confluent_kafka/src/Admin.c

@@ -99,12 +99,12 @@ struct Admin_options {
  * Make sure this is kept up to date with Admin_options above. */
 #define Admin_options_INITIALIZER                                              \
         {                                                                      \
-                Admin_options_def_int, Admin_options_def_float,                \
-                    Admin_options_def_float, Admin_options_def_int,            \
-                    Admin_options_def_int, Admin_options_def_int,              \
-                    Admin_options_def_int, Admin_options_def_ptr,              \
-                    Admin_options_def_cnt, Admin_options_def_ptr,              \
-                    Admin_options_def_cnt,                                     \
+            Admin_options_def_int,   Admin_options_def_float,                  \
+            Admin_options_def_float, Admin_options_def_int,                    \
+            Admin_options_def_int,   Admin_options_def_int,                    \
+            Admin_options_def_int,   Admin_options_def_ptr,                    \
+            Admin_options_def_cnt,   Admin_options_def_ptr,                    \
+            Admin_options_def_cnt,                                             \
         }
 
 #define Admin_options_is_set_int(v)   ((v) != Admin_options_def_int)