chore: Move to v1 from v1beta (#97)

ruuushhh · web-flow · commit 01e31d30072a · 2025-04-16T23:37:20.000+05:30
* chore: Move to v1 from v1beta

* fix tests

* fix-tests

* Fix tests

* Fix tests

* Fix tests

* log cliend id

* Fix tests

* Fix tests

* fix tests

* upgrade version
diff --git a/README.md b/README.md
@@ -29,10 +29,10 @@ fyle = Platform(
 )
 ```
 
-*  You can access the V1beta version of the APIs as follows:
+*  You can access the V1 version of the APIs as follows:
 ```python
 """
-USAGE: <Platform INSTANCE>.<VERSION: eg. v1beta>.<FYLE ROLE: eg. admin>.<API_NAME: eg. expenses>.<API_METHOD: eg. get>(<PARAMETERS>)
+USAGE: <Platform INSTANCE>.<VERSION: eg. v1>.<FYLE ROLE: eg. admin>.<API_NAME: eg. expenses>.<API_METHOD: eg. get>(<PARAMETERS>)
 """
 
 # Get a list of all Expenses in a paginated manner and add to a list
@@ -42,7 +42,7 @@ query_params = {
     'order': 'created_at.desc'
 }
 
-expenses_generator = fyle.v1beta.admin.expenses.list_all(query_params=query_params)
+expenses_generator = fyle.v1.admin.expenses.list_all(query_params=query_params)
 
 for response in expenses_generator:
     if response.get('data'):
diff --git a/fyle/platform/apis/__init__.py b/fyle/platform/apis/__init__.py
@@ -1,7 +1,6 @@
 """
     Defining API Versions
 """
+from . import v1
 
-from . import v1beta
-
-__all__ = [v1beta]
+__all__ = [v1]
diff --git a/fyle/platform/apis/v1/__init__.py b/fyle/platform/apis/v1/__init__.py
@@ -3,4 +3,4 @@
 __all__ = [
     admin, approver, spender, common, accountant
 ]
-version = 'v1beta'
+version = 'v1'
diff --git a/fyle/platform/apis/v1/accountant/__init__.py b/fyle/platform/apis/v1/accountant/__init__.py
diff --git a/fyle/platform/apis/v1/accountant/orgs.py b/fyle/platform/apis/v1/accountant/orgs.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Accountant Orgs
+V1 Accountant Orgs
 """
 
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/admin/__init__.py b/fyle/platform/apis/v1/admin/__init__.py
diff --git a/fyle/platform/apis/v1/admin/accounting_exports.py b/fyle/platform/apis/v1/admin/accounting_exports.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Accounting Exports
+V1 Admin Accounting Exports
 """
 from ....internals.get_resources import GetResources
 from ....internals.list_all_resources import ListAllResources
diff --git a/fyle/platform/apis/v1/admin/advance_requests.py b/fyle/platform/apis/v1/admin/advance_requests.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Advance Requests
+V1 Admin Advance Requests
 """
 
 from ....internals.get_resources import GetResources
diff --git a/fyle/platform/apis/v1/admin/categories.py b/fyle/platform/apis/v1/admin/categories.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Categories
+V1 Admin Categories
 """
 
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/admin/corporate_card_transactions.py b/fyle/platform/apis/v1/admin/corporate_card_transactions.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Corporate Card Transactions
+V1 Admin Corporate Card Transactions
 """
 
 from ....internals.get_resources import GetResources
diff --git a/fyle/platform/apis/v1/admin/corporate_cards.py b/fyle/platform/apis/v1/admin/corporate_cards.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Corporate Cards
+V1 Admin Corporate Cards
 """
 
 from ....internals.list_all_resources import ListAllResources
diff --git a/fyle/platform/apis/v1/admin/cost_centers.py b/fyle/platform/apis/v1/admin/cost_centers.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Cost Center
+V1 Admin Cost Center
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/admin/departments.py b/fyle/platform/apis/v1/admin/departments.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Departments
+V1 Admin Departments
 """
 
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/admin/dependent_expense_field_values.py b/fyle/platform/apis/v1/admin/dependent_expense_field_values.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Expense Fields
+V1 Admin Expense Fields
 """
 from typing import Iterable
 from ....internals.list_all_resources import ListAllResources
diff --git a/fyle/platform/apis/v1/admin/employees.py b/fyle/platform/apis/v1/admin/employees.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Employees
+V1 Admin Employees
 """
 
 from ....internals.get_resources import GetResources
diff --git a/fyle/platform/apis/v1/admin/expense_fields.py b/fyle/platform/apis/v1/admin/expense_fields.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Expense Fields
+V1 Admin Expense Fields
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/admin/expenses.py b/fyle/platform/apis/v1/admin/expenses.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Expenses
+V1 Admin Expenses
 """
 from typing import Dict
 
diff --git a/fyle/platform/apis/v1/admin/files.py b/fyle/platform/apis/v1/admin/files.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Files
+V1 Admin Files
 """
 import base64
 
diff --git a/fyle/platform/apis/v1/admin/projects.py b/fyle/platform/apis/v1/admin/projects.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Projects
+V1 Admin Projects
 """
 
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/admin/reimbursements.py b/fyle/platform/apis/v1/admin/reimbursements.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Reimbursements
+V1 Admin Reimbursements
 """
 
 from ....internals.get_resources import GetResources
diff --git a/fyle/platform/apis/v1/admin/reports.py b/fyle/platform/apis/v1/admin/reports.py
diff --git a/fyle/platform/apis/v1/admin/scheduled_callbacks.py b/fyle/platform/apis/v1/admin/scheduled_callbacks.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Scheduled Callbacks
+V1 Admin Scheduled Callbacks
 """
 
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/admin/subscriptions.py b/fyle/platform/apis/v1/admin/subscriptions.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Subscriptions
+V1 Admin Subscriptions
 """
 
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/admin/tax_groups.py b/fyle/platform/apis/v1/admin/tax_groups.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Admin Tax Groups
+V1 Admin Tax Groups
 """
 
 from typing import Dict, List
diff --git a/fyle/platform/apis/v1/approver/__init__.py b/fyle/platform/apis/v1/approver/__init__.py
diff --git a/fyle/platform/apis/v1/approver/categories.py b/fyle/platform/apis/v1/approver/categories.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Categories
+V1 Approver Categories
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/approver/expenses.py b/fyle/platform/apis/v1/approver/expenses.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Approver Expenses
+V1 Approver Expenses
 """
 
 from ....internals.get_resources import GetResources
diff --git a/fyle/platform/apis/v1/approver/projects.py b/fyle/platform/apis/v1/approver/projects.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Projects
+V1 Approver Projects
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/approver/reports.py b/fyle/platform/apis/v1/approver/reports.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Approver Reports
+V1 Approver Reports
 """
 
 from ....internals.get_resources import GetResources
diff --git a/fyle/platform/apis/v1/common/__init__.py b/fyle/platform/apis/v1/common/__init__.py
diff --git a/fyle/platform/apis/v1/common/currencies.py b/fyle/platform/apis/v1/common/currencies.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Common Currencies
+V1 Common Currencies
 """
 
 from typing import Dict
diff --git a/fyle/platform/apis/v1/common/expense_extract.py b/fyle/platform/apis/v1/common/expense_extract.py
@@ -1,7 +1,7 @@
 # Currently not used by any client and thr are some changes WRT to the contract of extraction.x
 
 # """
-# V1 Beta Common Expense Extract
+# V1 Common Expense Extract
 # """
 #
 # from fyle.platform import exceptions
diff --git a/fyle/platform/apis/v1/common/places.py b/fyle/platform/apis/v1/common/places.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Common Places
+V1 Common Places
 """
 
 from typing import Dict
diff --git a/fyle/platform/apis/v1/spender/__init__.py b/fyle/platform/apis/v1/spender/__init__.py
diff --git a/fyle/platform/apis/v1/spender/accounts.py b/fyle/platform/apis/v1/spender/accounts.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Accounts
+V1 Spender Accounts
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/spender/categories.py b/fyle/platform/apis/v1/spender/categories.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Approver Categories
+V1 Spender Categories
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/spender/corporate_cards.py b/fyle/platform/apis/v1/spender/corporate_cards.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Corporate Cards
+V1 Spender Corporate Cards
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/spender/cost_centers.py b/fyle/platform/apis/v1/spender/cost_centers.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Cost Centers
+V1 Spender Cost Centers
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/spender/employees.py b/fyle/platform/apis/v1/spender/employees.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Employees
+V1 Spender Employees
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/spender/expense_fields.py b/fyle/platform/apis/v1/spender/expense_fields.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Expense Fields
+V1 Spender Expense Fields
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/spender/expenses.py b/fyle/platform/apis/v1/spender/expenses.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Expenses
+V1 Spender Expenses
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/spender/files.py b/fyle/platform/apis/v1/spender/files.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Files
+V1 Spender Files
 """
 import base64
 
diff --git a/fyle/platform/apis/v1/spender/merchants.py b/fyle/platform/apis/v1/spender/merchants.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Merchants
+V1 Spender Merchants
 """
 from ....internals.post_bulk_resources import PostBulkResources
 from ....internals.list_all_resources import ListAllResources
diff --git a/fyle/platform/apis/v1/spender/my_profile.py b/fyle/platform/apis/v1/spender/my_profile.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender My Profile
+V1 Spender My Profile
 """
 from typing import Dict
 
diff --git a/fyle/platform/apis/v1/spender/projects.py b/fyle/platform/apis/v1/spender/projects.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Approver Projects
+V1 Spender Projects
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/spender/reports.py b/fyle/platform/apis/v1/spender/reports.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Reports
+V1 Spender Reports
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/spender/tax_groups.py b/fyle/platform/apis/v1/spender/tax_groups.py
@@ -1,5 +1,5 @@
 """
-V1 Beta Spender Tax Groups
+V1 Spender Tax Groups
 """
 from ....internals.list_all_resources import ListAllResources
 from ....internals.list_resources import ListResources
diff --git a/fyle/platform/apis/v1/version.py b/fyle/platform/apis/v1/version.py
diff --git a/fyle/platform/platform.py b/fyle/platform/platform.py
@@ -2,7 +2,7 @@
     Fyle Platform SDK Class
 """
 
-from .apis import v1beta
+from .apis import v1
 from .globals.config import config
 from .internals.auth import Auth
 
@@ -27,7 +27,7 @@ def __init__(self, server_url, token_url, client_id, client_secret, refresh_toke
         self.__client_secret = client_secret
         self.__refresh_token = refresh_token
 
-        self.v1beta = v1beta
+        self.v1 = v1
 
         # get the access token
         self.set_server_url()
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='fyle',
-    version='v0.37.3',
+    version='1.0.0',
     author='Siva Narayanan',
     author_email='siva@fyle.in',
     description='Python SDK for accessing Fyle Platform APIs',
diff --git a/test/common/utilities.py b/test/common/utilities.py
@@ -41,13 +41,15 @@ def fyle_connect():
     FYLE connector
     :param: db connection
   """
+
   connection = Platform(
     server_url=os.environ.get('SERVER_URL'),
     token_url=os.environ.get('TOKEN_URL'),
     refresh_token=os.environ.get('REFRESH_TOKEN'),
     client_id=os.environ.get('CLIENT_ID'),
     client_secret=os.environ.get('CLIENT_SECRET')
   )
+
   return connection
 
 
diff --git a/test/integration/accountant/test_accountant_apis.py b/test/integration/accountant/test_accountant_apis.py
@@ -16,14 +16,14 @@ def test_list_all_orgs(fyle, mock_data):
     'order': 'created_at.desc'
   }
 
-  orgs_generator = fyle.v1beta.accountant.orgs.list_all(query_params=query_params)
+  orgs_generator = fyle.v1.accountant.orgs.list_all(query_params=query_params)
   mock_orgs = mock_data.orgs.list_all()
 
   for response in orgs_generator:
     if response.get('data'):
       orgs.extend(response['data'])
   if orgs:
-    assert dict_compare_keys(orgs[0], mock_orgs[0]) == [], 'fyle.v1beta.accountant.orgs.list_all() has stuff that mock_data doesnt'
+    assert dict_compare_keys(orgs[0], mock_orgs[0]) == [], 'fyle.v1.accountant.orgs.list_all() has stuff that mock_data doesnt'
     assert dict_compare_keys(mock_orgs[0], orgs[0]) == [], 'mock_data.orgs.list_all() has stuff that fyle doesnt'
 
 def test_list_orgs(fyle, mock_data):
@@ -33,9 +33,9 @@ def test_list_orgs(fyle, mock_data):
     'order': 'created_at.desc'
   }
 
-  orgs = fyle.v1beta.accountant.orgs.list(query_params=query_params)
+  orgs = fyle.v1.accountant.orgs.list(query_params=query_params)
   mock_orgs = mock_data.orgs.list()
 
   if orgs["data"]:
-    assert dict_compare_keys(orgs["data"][0], mock_orgs[0]) == [], 'fyle.v1beta.accountant.orgs.list() has stuff that mock_data doesnt'
+    assert dict_compare_keys(orgs["data"][0], mock_orgs[0]) == [], 'fyle.v1.accountant.orgs.list() has stuff that mock_data doesnt'
     assert dict_compare_keys(mock_orgs[0], orgs["data"][0]) == [], 'mock_data.orgs.list() has stuff that fyle doesnt'
diff --git a/test/integration/admin/fixtures/mock_admin_data.json b/test/integration/admin/fixtures/mock_admin_data.json
diff --git a/test/integration/admin/test_admin_apis.py b/test/integration/admin/test_admin_apis.py
diff --git a/test/integration/approver/fixtures/mock_approver_data.json b/test/integration/approver/fixtures/mock_approver_data.json
diff --git a/test/integration/approver/test_approver_apis.py b/test/integration/approver/test_approver_apis.py
diff --git a/test/integration/common/conftest.py b/test/integration/common/conftest.py
diff --git a/test/integration/common/fixtures/mock_common_data.json b/test/integration/common/fixtures/mock_common_data.json
diff --git a/test/integration/common/test_common_apis.py b/test/integration/common/test_common_apis.py
diff --git a/test/integration/spender/fixtures/mock_spender_data.json b/test/integration/spender/fixtures/mock_spender_data.json
diff --git a/test/integration/spender/test_spender_apis.py b/test/integration/spender/test_spender_apis.py

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@`
`3`	`3`	`__all__ = [`
`4`	`4`	`admin, approver, spender, common, accountant`
`5`	`5`	`]`
`6`		`-version = 'v1beta'`
	`6`	`+version = 'v1'`