Fix async helpers import cycle (#311)

* Import async helpers through public interface in tests

Signed-off-by: Roger Aiudi <aiudirog@gmail.com>

* Removed unused import of AsyncOpenSearch in async helpers that was causing an import cycle (fixes #310)

Signed-off-by: Roger Aiudi <aiudirog@gmail.com>

* Update CHANGELOG.md

Signed-off-by: Roger Aiudi <aiudirog@gmail.com>

* Change 2.2.1 in the changelog to Unreleased

Signed-off-by: Roger Aiudi <aiudirog@gmail.com>

* Separated changelog entries for 2.2.0 from 2.1.1

Signed-off-by: Roger Aiudi <aiudirog@gmail.com>

---------

Signed-off-by: Roger Aiudi <aiudirog@gmail.com>

CHANGELOG.md

@@ -1,18 +1,31 @@
 # CHANGELOG
 Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
-## [2.1.1]
+## [Unreleased]
+### Fixed
+- Fixed import cycle when importing async helpers ([#311](https://github.com/opensearch-project/opensearch-py/pull/311))
+
+## [2.2.0]
 ### Added
 - Merging opensearch-dsl-py into opensearch-py ([#287](https://github.com/opensearch-project/opensearch-py/pull/287))
 - Added upgrading.md file and updated it for opensearch-py 2.2.0 release ([#293](https://github.com/opensearch-project/opensearch-py/pull/293))
 ### Changed
 ### Deprecated
 ### Removed
 - Removed 'out/opensearchpy' folder which was produced while generating pyi files for plugins ([#288](https://github.com/opensearch-project/opensearch-py/pull/288))
+- Removed low-level and high-level client terminology from guides ([#298](https://github.com/opensearch-project/opensearch-py/pull/298))
+### Fixed
+- Fixed CVE - issue 86 mentioned in opensearch-dsl-py repo ([#295](https://github.com/opensearch-project/opensearch-py/pull/295))
+### Security
+
+## [2.1.1]
+### Added
+### Changed
+### Deprecated
+### Removed
 ### Fixed
 - Fixed SigV4 Signing for Managed Service ([#279](https://github.com/opensearch-project/opensearch-py/pull/279))
 - Fixed SigV4 Signing for Async Requests with QueryStrings ([#272](https://github.com/opensearch-project/opensearch-py/pull/279))
-- Fixed CVE - issue 86 mentioned in opensearch-dsl-py repo ([#295](https://github.com/opensearch-project/opensearch-py/pull/295))
 ### Security
 
 ## [2.1.0]

opensearchpy/_async/helpers.py

@@ -41,7 +41,6 @@
     expand_action,
 )
 from ..helpers.errors import ScanError
-from .client import AsyncOpenSearch  # noqa
 
 logger = logging.getLogger("opensearchpy.helpers")
 

test_opensearchpy/test_async/test_server/test_helpers.py

@@ -34,8 +34,7 @@
 import pytest
 from mock import MagicMock, patch
 
-from opensearchpy import TransportError
-from opensearchpy._async import helpers
+from opensearchpy import TransportError, helpers
 from opensearchpy.helpers import BulkIndexError, ScanError
 
 pytestmark = pytest.mark.asyncio