Skip to content

Commit ca42e95

Browse files
katyalmohitkatyalmohit
committed
Fix error messages
1 parent 42fa025 commit ca42e95

5 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎src/dataplatform/toolbox/location.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import streamlit as st
44
import json
55
from dp_sdk.ocf import dp
6-
import grpc
6+
from grpclib.exceptions import GRPCError
77

88

99
async def locations_section(data_client):
@@ -51,9 +51,9 @@ async def locations_section(data_client):
5151
else:
5252
try:
5353
request = dp.ListLocationsRequest()
54-
if energy_source_filter != "All":
54+
if energy_source_filter != "UNSPECIFIED":
5555
request.energy_source_filter = ENERGY_SOURCES[energy_source_filter]
56-
if location_type_filter != "All":
56+
if location_type_filter != "UNSPECIFIED":
5757
request.location_type_filter = LOCATION_TYPES[location_type_filter]
5858
if user_filter:
5959
request.user_oauth_id_filter = user_filter
@@ -67,9 +67,9 @@ async def locations_section(data_client):
6767
st.write(loc_dicts)
6868
else:
6969
st.info("No locations found with the specified filters")
70-
except grpc.RpcError as e:
70+
except GRPCError as e:
7171
st.error(
72-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
72+
f"❌ gRPC Error: {e.message}"
7373
)
7474
except Exception as e:
7575
st.error(f"❌ Error listing locations: {str(e)}")
@@ -94,16 +94,16 @@ async def locations_section(data_client):
9494
response = await data_client.get_location(
9595
dp.GetLocationRequest(
9696
location_uuid=loc_uuid,
97-
energy_source=ENERGY_SOURCES.get(loc_energy, 1),
97+
energy_source=ENERGY_SOURCES[loc_energy],
9898
include_geometry=include_geometry,
9999
)
100100
)
101101
response_dict = response.to_dict()
102102
st.success(f"✅ Found location: {loc_uuid}")
103103
st.write(response_dict)
104-
except grpc.RpcError as e:
104+
except GRPCError as e:
105105
st.error(
106-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
106+
f"❌ gRPC Error: {e.message}"
107107
)
108108
except Exception as e:
109109
st.error(f"❌ Error fetching location: {str(e)}")
@@ -167,9 +167,9 @@ async def locations_section(data_client):
167167

168168
except json.JSONDecodeError:
169169
st.error("❌ Invalid JSON in metadata field")
170-
except grpc.RpcError as e:
170+
except GRPCError as e:
171171
st.error(
172-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
172+
f"❌ gRPC Error: {e.message}"
173173
)
174174
except Exception as e:
175175
st.error(f"❌ Error creating location: {str(e)}")

‎src/dataplatform/toolbox/organisation.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import streamlit as st
44
import json
55
from dp_sdk.ocf import dp
6-
import grpc
6+
from grpclib.exceptions import GRPCError
77

88

99
async def organisation_section(admin_client):
@@ -29,9 +29,9 @@ async def organisation_section(admin_client):
2929
st.success(f"✅ Found organisation: {org_name}")
3030
st.write(response_dict)
3131

32-
except grpc.RpcError as e:
32+
except GRPCError as e:
3333
st.error(
34-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
34+
f"❌ gRPC Error: {e.message}"
3535
)
3636
except Exception as e:
3737
st.error(f"❌ Error fetching organisation: {str(e)}")
@@ -74,9 +74,9 @@ async def organisation_section(admin_client):
7474

7575
except json.JSONDecodeError:
7676
st.error("❌ Invalid JSON in metadata field")
77-
except grpc.RpcError as e:
77+
except GRPCError as e:
7878
st.error(
79-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
79+
f"❌ gRPC Error: {e.message}"
8080
)
8181
except Exception as e:
8282
st.error(f"❌ Error creating organisation: {str(e)}")
@@ -111,9 +111,9 @@ async def organisation_section(admin_client):
111111
f"✅ Organisation '{del_org_name}' deleted successfully!"
112112
)
113113

114-
except grpc.RpcError as e:
114+
except GRPCError as e:
115115
st.error(
116-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
116+
f"❌ gRPC Error: {e.message}"
117117
)
118118
except Exception as e:
119119
st.error(f"❌ Error deleting organisation: {str(e)}")

‎src/dataplatform/toolbox/policy.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Policy management section for the Data Platform Toolbox."""
22

33
import streamlit as st
4-
import grpc
4+
from grpclib.exceptions import GRPCError
55
from dp_sdk.ocf import dp
66

77

@@ -41,9 +41,9 @@ async def policies_section(admin_client, data_client):
4141
response_dict = response.to_dict()
4242
st.success(f"✅ Policy Group '{new_policy_group_name}' created!")
4343
st.write(response_dict)
44-
except grpc.RpcError as e:
44+
except GRPCError as e:
4545
st.error(
46-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
46+
f"❌ gRPC Error: {e.message}"
4747
)
4848
except Exception as e:
4949
st.error(f"❌ Error creating policy group: {str(e)}")
@@ -70,9 +70,9 @@ async def policies_section(admin_client, data_client):
7070
st.success(f"✅ Found policy group: {policy_group_name}")
7171
st.write(response_dict)
7272

73-
except grpc.RpcError as e:
73+
except GRPCError as e:
7474
st.error(
75-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
75+
f"❌ gRPC Error: {e.message}"
7676
)
7777
except Exception as e:
7878
st.error(f"❌ Error fetching policy group: {str(e)}")
@@ -137,9 +137,9 @@ async def policies_section(admin_client, data_client):
137137
)
138138
)
139139
st.success(f"✅ Policy added to group '{add_policy_group}'!")
140-
except grpc.RpcError as e:
140+
except GRPCError as e:
141141
st.error(
142-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
142+
f"❌ gRPC Error: {e.message}"
143143
)
144144
except Exception as e:
145145
st.error(f"❌ Error adding policy: {str(e)}")
@@ -207,9 +207,9 @@ async def policies_section(admin_client, data_client):
207207
)
208208
)
209209
st.success(f"✅ Policy removed from group '{remove_policy_group}'!")
210-
except grpc.RpcError as e:
210+
except GRPCError as e:
211211
st.error(
212-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
212+
f"❌ gRPC Error: {e.message}"
213213
)
214214
except Exception as e:
215215
st.error(f"❌ Error removing policy: {str(e)}")
@@ -236,9 +236,9 @@ async def policies_section(admin_client, data_client):
236236
st.success(
237237
f"✅ Policy group '{add_pg_name}' added to organisation '{add_pg_org}'!"
238238
)
239-
except grpc.RpcError as e:
239+
except GRPCError as e:
240240
st.error(
241-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
241+
f"❌ gRPC Error: {e.message}"
242242
)
243243
except Exception as e:
244244
st.error(f"❌ Error adding policy group to organisation: {str(e)}")
@@ -273,9 +273,9 @@ async def policies_section(admin_client, data_client):
273273
st.success(
274274
f"✅ Policy group '{remove_policy_group_name}' removed from organisation '{remove_policy_group_org}'!"
275275
)
276-
except grpc.RpcError as e:
276+
except GRPCError as e:
277277
st.error(
278-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
278+
f"❌ gRPC Error: {e.message}"
279279
)
280280
except Exception as e:
281281
st.error(f"❌ Error removing policy group from organisation: {str(e)}")

‎src/dataplatform/toolbox/user_organisation.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import streamlit as st
44
from dp_sdk.ocf import dp
5-
import grpc
5+
from grpclib.exceptions import GRPCError
66

77

88
async def user_organisation_section(admin_client):
@@ -31,9 +31,9 @@ async def user_organisation_section(admin_client):
3131
f"✅ User '{add_user_oauth}' added to organisation '{add_org}'!"
3232
)
3333

34-
except grpc.RpcError as e:
34+
except GRPCError as e:
3535
st.error(
36-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
36+
f"❌ gRPC Error: {e.message}"
3737
)
3838
except Exception as e:
3939
st.error(f"❌ Error adding user to organisation: {str(e)}")
@@ -61,9 +61,9 @@ async def user_organisation_section(admin_client):
6161
f"✅ User '{remove_user_oauth}' removed from organisation '{remove_org}'!"
6262
)
6363

64-
except grpc.RpcError as e:
64+
except GRPCError as e:
6565
st.error(
66-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
66+
f"❌ gRPC Error: {e.message}"
6767
)
6868
except Exception as e:
6969
st.error(f"❌ Error removing user from organisation: {str(e)}")

‎src/dataplatform/toolbox/users.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import streamlit as st
44
import json
55
from dp_sdk.ocf import dp
6-
import grpc
6+
from grpclib.exceptions import GRPCError
77

88

99
async def users_section(admin_client):
@@ -29,9 +29,9 @@ async def users_section(admin_client):
2929
st.success(f"✅ Found user: {oauth_id}")
3030
st.write(response_dict)
3131

32-
except grpc.RpcError as e:
32+
except GRPCError as e:
3333
st.error(
34-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
34+
f"❌ gRPC Error: {e.message}"
3535
)
3636
except Exception as e:
3737
st.error(f"❌ Error fetching user: {str(e)}")
@@ -80,9 +80,9 @@ async def users_section(admin_client):
8080

8181
except json.JSONDecodeError:
8282
st.error("❌ Invalid JSON in metadata field")
83-
except grpc.RpcError as e:
83+
except GRPCError as e:
8484
st.error(
85-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
85+
f"❌ gRPC Error: {e.message}"
8686
)
8787
except Exception as e:
8888
st.error(f"❌ Error creating user: {str(e)}")
@@ -118,9 +118,9 @@ async def users_section(admin_client):
118118
)
119119
st.success(f"✅ User '{del_user_id}' deleted successfully!")
120120

121-
except grpc.RpcError as e:
121+
except GRPCError as e:
122122
st.error(
123-
f"❌ gRPC Error: {e.details() if hasattr(e, 'details') else str(e)}"
123+
f"❌ gRPC Error: {e.message}"
124124
)
125125
except Exception as e:
126126
st.error(f"❌ Error deleting user: {str(e)}")

0 commit comments

Comments
 (0)