pre-commit; backup calculator

Author: thejcfactor

.gitignore

@@ -180,3 +180,6 @@ CouchbaseMock*.jar
 gocaves*
 .pytest_cache/
 test_scripts/
+
+# rff
+.ruff_cache/

.pre-commit-config.yaml

@@ -0,0 +1,38 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+        args: [--allow-multiple-documents]
+      - id: check-added-large-files
+      - id: check-toml
+      - id: check-merge-conflict
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.12.1
+    hooks:
+      # Run the linter.
+      - id: ruff-check
+        types_or: [ python, pyi ]
+      # Run the formatter.
+      # - id: ruff-format
+      #   types_or: [ python, pyi ]
+      # Compile requirements
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    # uv version.
+    rev: 0.7.19
+    hooks:
+      # Compile requirements
+      - id: pip-compile
+        name: pip-compile requirements.in
+        args: [requirements.in, --python-version, '3.9', --universal, -o, requirements.txt]
+      - id: pip-compile
+        name: pip-compile requirements-dev.in
+        args: [requirements-dev.in, --python-version, '3.9', --universal, -o, requirements-dev.txt]
+        files: ^requirements-dev\.(in|txt)$
+      - id: pip-compile
+        name: pip-compile requirements-sphinx.in
+        args: [requirements-sphinx.in, --python-version, '3.9', --universal, -o, requirements-sphinx.txt]
+        files: ^requirements-sphinx\.(in|txt)$

MANIFEST.in

@@ -7,4 +7,4 @@ exclude couchbase_analytics/tests/*.py
 recursive-include acouchbase_analytics *.py
 exclude acouchbase_analytics/tests/*.py
 global-exclude *.py[cod] *.DS_Store
-exclude .git .gitignore .gitmodules gocaves* *.jar .clang* .cmake* .pre* .flake* MANIFEST.in
+exclude .git .gitignore .gitmodules gocaves* *.jar .clang* .cmake* .pre* .flake* MANIFEST.in

README.md

@@ -1,2 +1,2 @@
 # Couchbase Python Analytics Client
-Python client for [Couchbase](https://couchbase.com) Analytics.
+Python client for [Couchbase](https://couchbase.com) Analytics.

acouchbase_analytics/cluster.pyi

@@ -113,4 +113,3 @@ class AsyncCluster:
                         credential: Credential,
                         options: ClusterOptions,
                         **kwargs: Unpack[ClusterOptionsKwargs]) -> AsyncCluster: ...
-

acouchbase_analytics/protocol/_core/anyio_utils.py

@@ -47,7 +47,7 @@ def current_async_library() -> Optional[AsyncBackend]:
         import sniffio
     except ImportError:
         async_lib = 'asyncio'
-    
+
     # TODO: This helps make tests work.
     #       Should we work through the scenario when sniffio cannot find the async library?
     try:
@@ -62,4 +62,4 @@ def current_async_library() -> Optional[AsyncBackend]:
     if async_lib == 'trio':
         raise RuntimeError('trio currently not supported')
 
-    return AsyncBackend(async_lib)
+    return AsyncBackend(async_lib)

acouchbase_analytics/protocol/_core/async_json_stream.py

@@ -60,7 +60,7 @@ def has_results_or_errors(self) -> Event:
         **INTERNAL**
         """
         return self._has_results_or_errors_evt
-    
+
     @property
     def results_or_errors_type(self) -> ParsedResultType:
         """
@@ -74,7 +74,7 @@ def token_stream_exhausted(self) -> bool:
         **INTERNAL**
         """
         return self._token_stream_exhausted
-    
+
     def _continue_processing(self) -> bool:
         """
         **INTERNAL**
@@ -108,7 +108,7 @@ async def _handle_json_result(self, row: bytes) -> None:
     def _handle_notification(self, result_type: Optional[ParsedResultType]=None) -> None:
         if self._has_results_or_errors_evt.is_set():
             return
-        
+
         if result_type is None:
             self._results_or_errors_type = ParsedResultType.END
             self._has_results_or_errors_evt.set()
@@ -140,14 +140,14 @@ async def _process_token_stream(self) -> None:
             result_type = ParsedResultType.ERROR if self._json_token_parser.has_errors else ParsedResultType.END
             await self._send_to_stream(ParsedResult(self._json_token_parser.get_result(), result_type), close=True)
             self._handle_notification(result_type)
-    
+
     async def read(self, size: Optional[int]=-1) -> bytes:
         """
         **INTERNAL**
         """
         if size is None or size == 0 or self._http_stream_exhausted:
             return b''
-        
+
         while not self._http_stream_exhausted:
             if size >= 0 and len(self._http_response_buffer) > size:
                 break
@@ -181,4 +181,4 @@ async def start_parsing(self) -> None:
 
     async def continue_parsing(self) -> None:
         # TODO: error is _json_stream_parser is None?
-        await self._process_token_stream()
+        await self._process_token_stream()

acouchbase_analytics/protocol/_core/async_json_token_parser.py

@@ -40,7 +40,7 @@ async def _handle_obj_emit(self, obj: str) -> bool:
             await self._results_handler(bytes(obj, 'utf-8'))
             return True
         return False
-    
+
     async def _handle_pop_event(self, token_type: TokenType) -> None:
         matching_token = self._get_matching_token(token_type)
         obj_pairs: List[str] = []
@@ -53,16 +53,16 @@ async def _handle_pop_event(self, token_type: TokenType) -> None:
                     obj = f'[{",".join(reversed(obj_pairs))}]'
                 else:
                     obj = f'{{{",".join(reversed(obj_pairs))}}}'
-            
+
                 if should_emit:
                     object_emitted = await self._handle_obj_emit(obj)
                     if object_emitted:
                         break # this means we emiited the result/error, so stop processing the stack
 
                 if len(self._stack) > 0 and self._stack[-1].type == TokenType.MAP_KEY:
                     map_key = self._pop()
-                    # If we are emitting rows and/or errors, 
-                    # we don't keep them in the stack and therefore don't need to return the results           
+                    # If we are emitting rows and/or errors,
+                    # we don't keep them in the stack and therefore don't need to return the results
                     if self._should_push_pair(next_token):
                         self._push(TokenType.PAIR, f'{map_key.value}:{obj}')
                 else:
@@ -88,4 +88,4 @@ async def parse_token(self, token: str, value: str) -> None:
             await self._handle_pop_event(token_type)
         else:
             # TODO: custom exception
-            raise ValueError(f'Invalid token type: {token_type}; {value=}')
+            raise ValueError(f'Invalid token type: {token_type}; {value=}')

acouchbase_analytics/protocol/_core/client_adapter.py

@@ -57,15 +57,15 @@ def analytics_path(self) -> str:
         """
             **INTERNAL**
         """
-        return self._ANALYTICS_PATH 
-    
+        return self._ANALYTICS_PATH
+
     @property
     def client(self) -> AsyncClient:
         """
             **INTERNAL**
         """
         return self._client
-    
+
     @property
     def client_id(self) -> str:
         """
@@ -86,7 +86,7 @@ def default_deserializer(self) -> Deserializer:
             **INTERNAL**
         """
         return self._conn_details.default_deserializer
-    
+
     @property
     def has_client(self) -> bool:
         """
@@ -137,7 +137,7 @@ async def send_request(self, request: QueryRequest) -> Response:
         """
         if not hasattr(self, '_client'):
             raise RuntimeError('Client not created yet')
-        
+
         # if request.url is None:
         #     raise ValueError('Request URL cannot be None')
 
@@ -161,4 +161,3 @@ def reset_client(self) -> None:
         """
         if hasattr(self, '_client'):
             del self._client
-

acouchbase_analytics/protocol/_core/net_utils.py

@@ -54,4 +54,4 @@ async def get_request_ip_async(host: str,
         ip_str = str(ip) if not isinstance(ip, str) else ip
         ip = None if ip_str in previous_ips else ip_str
 
-    return ip
+    return ip